summaryrefslogtreecommitdiffstats
path: root/pk
diff options
context:
space:
mode:
authorGlenn Miles <milesg@us.ibm.com>2015-05-01 12:50:06 -0500
committerThi N. Tran <thi@us.ibm.com>2015-05-13 14:14:40 -0500
commita51afa0f5ea1320c0d55b0258eac6cfd64cd41cc (patch)
treef79bcf2377b055d266d767242a0975bd61b9fb2c /pk
parent112940c6a761e1d3a1897bb4c07b924c3a3c8d21 (diff)
downloadtalos-sbe-a51afa0f5ea1320c0d55b0258eac6cfd64cd41cc.tar.gz
talos-sbe-a51afa0f5ea1320c0d55b0258eac6cfd64cd41cc.zip
ppetracepp tool: support coexisting with tracepp tool
Change-Id: Ia62df48af0e0722644cce8ce93c9b7473f747ae5 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/17562 Reviewed-by: Richard J. Knight <rjknight@us.ibm.com> Reviewed-by: Thi N. Tran <thi@us.ibm.com> Tested-by: Thi N. Tran <thi@us.ibm.com>
Diffstat (limited to 'pk')
-rw-r--r--pk/kernel/pk_api.h8
-rw-r--r--pk/trace/pk_trace_core.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/pk/kernel/pk_api.h b/pk/kernel/pk_api.h
index 7e1c9702..75515b8b 100644
--- a/pk/kernel/pk_api.h
+++ b/pk/kernel/pk_api.h
@@ -390,9 +390,9 @@
#define TINY_TRACE_ASM0() .error "format string required"
#define TINY_TRACE_ASM1(str) \
- .tiny_trace_asm1 trace_adal_hash(str, PK_TRACE_HASH_PREFIX)
+ .tiny_trace_asm1 trace_ppe_hash(str, PK_TRACE_HASH_PREFIX)
#define TINY_TRACE_ASM2(str, reg) \
- .tiny_trace_asm2 trace_adal_hash(str, PK_TRACE_HASH_PREFIX), reg
+ .tiny_trace_asm2 trace_ppe_hash(str, PK_TRACE_HASH_PREFIX), reg
#define TINY_TRACE_ASM3() .error "too many parameters"
#define TINY_TRACE_ASM4() .error "too many parameters"
#define TINY_TRACE_ASM5() .error "too many parameters"
@@ -483,12 +483,12 @@ typedef struct {
/// Trace macros for C functions
#define HASH_ARG_COMBO(str, arg) \
- ((((uint32_t)trace_adal_hash(str, PK_TRACE_HASH_PREFIX)) << 16) | ((uint32_t)(arg) & 0x0000ffff))
+ ((((uint32_t)trace_ppe_hash(str, PK_TRACE_HASH_PREFIX)) << 16) | ((uint32_t)(arg) & 0x0000ffff))
#define PKTRACE0(...) pk_trace_tiny() //will fail at compile time
#define PKTRACE1(str) \
- pk_trace_tiny((trace_adal_hash(str, PK_TRACE_HASH_PREFIX) << 16))
+ pk_trace_tiny((trace_ppe_hash(str, PK_TRACE_HASH_PREFIX) << 16))
#define PKTRACE2(str, parm0) \
((sizeof(parm0) <= 2)? \
diff --git a/pk/trace/pk_trace_core.c b/pk/trace/pk_trace_core.c
index b70f7ed3..93072bd8 100644
--- a/pk/trace/pk_trace_core.c
+++ b/pk/trace/pk_trace_core.c
@@ -35,7 +35,7 @@ PkTraceBuffer g_pk_trace_buf =
.version = PK_TRACE_VERSION,
.image_str = PPE_IMG_STRING,
.hash_prefix = PK_TRACE_HASH_PREFIX,
- .partial_trace_hash = trace_adal_hash("PARTIAL TRACE ENTRY. HASH_ID = %d", PK_TRACE_HASH_PREFIX),
+ .partial_trace_hash = trace_ppe_hash("PARTIAL TRACE ENTRY. HASH_ID = %d", PK_TRACE_HASH_PREFIX),
.size = PK_TRACE_SZ,
.max_time_change = PK_TRACE_MTBT,
.hz = 500000000, //default value. Actual value is set in pk_init.c
OpenPOWER on IntegriCloud