Enable tracing

I've reverted the way we trace from SSX_TRACE to the P8 way
More useful way of compiling for Simics vs HW

RTC: 133155

Change-Id: I7ac3ce9ad71e36de0cf0050f14ff3d2423c9f75f
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20113
Tested-by: William A. Bryan <wilbryan@us.ibm.com>
Reviewed-by: Wael Elessawy <welessa@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>

3 files changed, 23 insertions, 25 deletions

diff --git a/src/occ_405/trac/trac.h b/src/occ_405/trac/trac.h
index ea9961c..d5154d4 100755
--- a/src/occ_405/trac/trac.h
+++ b/src/occ_405/trac/trac.h
@@ -25,21 +25,21 @@
 
 #ifndef _trac_h
 #define _trac_h
-//*************************************************************************
+//*************************************************************************/
 // Includes
-//*************************************************************************
+//*************************************************************************/
 #include <trac_interface.h>
-//*************************************************************************
+//*************************************************************************/
 // Externs
-//*************************************************************************
+//*************************************************************************/
 
-//*************************************************************************
+//*************************************************************************/
 // Macros
-//*************************************************************************
+//*************************************************************************/
 
-//*************************************************************************
+//*************************************************************************/
 // Defines/Enums
-//*************************************************************************
+//*************************************************************************/
 #ifndef NO_TRAC_STRINGS
 
 #define ERR_MRK         "ERR: "
@@ -75,7 +75,7 @@ extern void dumpHexString(const void *i_data, const unsigned int len, const char
 
 #else  //TRAC_TO_SIMICS
 
-/*
+
 #define TRAC_ERR(frmt,args...)  \
         TRACE(g_trac_err,ERR_MRK frmt,##args)
 #define TRAC_INFO(frmt,args...)  \
@@ -86,14 +86,8 @@ extern void dumpHexString(const void *i_data, const unsigned int len, const char
         TRACE(g_trac_inf,DBG_MRK fmt,##args)
 #define DEBUG_HEXDUMP(data, len, string)  \
         TRACEBIN(g_trac_inf, string, data,len)
-*/
-#define TRAC_ERR SSX_TRACE
-#define TRAC_INFO SSX_TRACE
-#define TRAC_IMP SSX_TRACE
-#define DBG_PRINT SSX_TRACE
-#define DEBUG_HEXDUMP SSX_TRACE_BIN
-#endif  //TRAC_TO_SIMICS
 
+#endif  //TRAC_TO_SIMICS
 
 #ifdef MAIN_DEBUG
   #define MAIN_DBG(frmt,args...)  \
diff --git a/src/occ_405/trac/trac_interface.c b/src/occ_405/trac/trac_interface.c
index c524d79..a49cbba 100755
--- a/src/occ_405/trac/trac_interface.c
+++ b/src/occ_405/trac/trac_interface.c
@@ -56,13 +56,13 @@
 #define TRAC_TIME_200MHZ 2
 #define TRAC_TIME_167MHZ 3 // 166666667Hz
 
-//*************************************************************************
+//*************************************************************************/
 // Structures
-//*************************************************************************
+//*************************************************************************/
 
-//*************************************************************************
+//*************************************************************************/
 // Globals
-//*************************************************************************
+//*************************************************************************/
 
 /// Instantiate the buffers for the traces.
 ///
@@ -74,6 +74,13 @@ uint8_t g_trac_inf_buffer[TRACE_BUFFER_SIZE];
 uint8_t g_trac_err_buffer[TRACE_BUFFER_SIZE];
 uint8_t g_trac_imp_buffer[TRACE_BUFFER_SIZE];
 
+#if SIMICS_ENVIRONMENT
+// Necessary for use in Simics (to get address)
+uint8_t* g_trac_inf_buffer_ptr = g_trac_inf_buffer;
+uint8_t* g_trac_err_buffer_ptr = g_trac_err_buffer;
+uint8_t* g_trac_imp_buffer_ptr = g_trac_imp_buffer;
+#endif
+
 // Need to modify the addTraceToErrl() function in errl.c when new trace buffer is added/removed
 tracDesc_t g_trac_inf = (tracDesc_t) &g_trac_inf_buffer;
 tracDesc_t g_trac_err = (tracDesc_t) &g_trac_err_buffer;
diff --git a/src/occ_405/trac/trac_interface.h b/src/occ_405/trac/trac_interface.h
index f573899..c5f21bd 100755
--- a/src/occ_405/trac/trac_interface.h
+++ b/src/occ_405/trac/trac_interface.h
@@ -43,13 +43,10 @@
 
 
 #define TRACE(i_td,i_string,args...)                  \
-                  SSX_TRACE(i_string, args...)
-//                trace_adal_write_all(i_td,trace_adal_hash(i_string,-1),__LINE__,0,##args)
+                trace_adal_write_all(i_td,trace_adal_hash(i_string,-1),__LINE__,0,##args)
 
 #define TRACEBIN(i_td,i_string,i_ptr,i_size)          \
-                  SSX_TRACE_BIN(i_string, i_ptr, i_size)
-//                trac_write_bin(i_td,trace_adal_hash(i_string,0),__LINE__,i_ptr,i_size)
-
+                trac_write_bin(i_td,trace_adal_hash(i_string,0),__LINE__,i_ptr,i_size)
 
 #ifndef NO_TRAC_STRINGS