Index: rtl-c.scm
===================================================================
RCS file: /cvs/src/src/cgen/rtl-c.scm,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 rtl-c.scm
--- rtl-c.scm	19 May 2014 01:24:00 -0000	1.33
+++ rtl-c.scm	18 Jun 2015 18:12:49 -0000
@@ -544,7 +544,7 @@
  			(rtl-c-get estate mode src))))
  )

-; Same as rtl-c-set-quiet except also print TRACE_RESULT message.
+; Same as rtl-c-set-quiet except also print CGEN_TRACE_RESULT message.
  ; MODE is either a <mode> object or the mode name.
  ; ??? One possible change is to defer the (rtl-c-get src) call to dest's
  ; set handler.  Such sources would be marked accordingly and rtl-c-get
Index: sim-cpu.scm
===================================================================
RCS file: /cvs/src/src/cgen/sim-cpu.scm,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 sim-cpu.scm
--- sim-cpu.scm	23 Nov 2009 04:18:05 -0000	1.19
+++ sim-cpu.scm	18 Jun 2015 18:12:49 -0000
@@ -1090,8 +1090,8 @@ CGEN_ATTR_VALUE (NULL, abuf->idesc->attr
     FAST_P, when desired, is defined on the command line, -DFAST_P=1.  */
  #if FAST_P
  #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_semf_,fn)
-#undef TRACE_RESULT
-#define TRACE_RESULT(cpu, abuf, name, type, val)
+#undef CGEN_TRACE_RESULT
+#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val)
  #else
  #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_sem_,fn)
  #endif
@@ -1183,13 +1183,13 @@ CGEN_ATTR_VALUE (NULL, abuf->idesc->attr

  /* If hyper-fast [well not unnecessarily slow] execution is selected, turn
     off frills like tracing and profiling.  */
-/* FIXME: A better way would be to have TRACE_RESULT check for something
+/* FIXME: A better way would be to have CGEN_TRACE_RESULT check for  
something
     that can cause it to be optimized out.  Another way would be to emit
     special handlers into the instruction \"stream\".  */

  #if FAST_P
-#undef TRACE_RESULT
-#define TRACE_RESULT(cpu, abuf, name, type, val)
+#undef CGEN_TRACE_RESULT
+#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val)
  #endif

  #undef GET_ATTR
Index: sim-decode.scm
===================================================================
RCS file: /cvs/src/src/cgen/sim-decode.scm,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 sim-decode.scm
--- sim-decode.scm	13 Feb 2010 03:39:15 -0000	1.17
+++ sim-decode.scm	18 Jun 2015 18:12:49 -0000
@@ -241,7 +241,7 @@ void
  )

  ; gen-trace-extract method.
-; Return appropriate arguments for TRACE_EXTRACT.
+; Return appropriate arguments for CGEN_TRACE_EXTRACT.

  (method-make!
   <hardware-base> 'gen-trace-extract
@@ -266,7 +266,7 @@ void
         ""))
  )

-; Return appropriate arguments for TRACE_EXTRACT.
+; Return appropriate arguments for CGEN_TRACE_EXTRACT.

  (method-make!
   <hw-register> 'gen-trace-extract
@@ -294,7 +294,7 @@ void
  		  ";\n"))
  )

-; Return appropriate arguments for TRACE_EXTRACT.
+; Return appropriate arguments for CGEN_TRACE_EXTRACT.

  (method-make!
   <hw-address> 'gen-trace-extract
@@ -320,7 +320,7 @@ void
    (send (op:type op) 'gen-extract op sfmt local?)
  )

-; Return three of arguments to TRACE_EXTRACT:
+; Return three of arguments to CGEN_TRACE_EXTRACT:
  ; string argument to fprintf, character indicating type of third arg,  
value.
  ; The type is one of: x.

@@ -374,7 +374,7 @@ void
  		      iflds)
       (string-list-map (lambda (op) (/gen-op-extract op sfmt #f))
  		      operands)
-     "  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "
+     "  CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "
       "\"" (gen-sym sfmt) "\""
       (string-list-map (lambda (f) (/gen-trace-argbuf-ifld f sfmt))
  		      iflds)
Index: sim.scm
===================================================================
RCS file: /cvs/src/src/cgen/sim.scm,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 sim.scm
--- sim.scm	25 Jan 2010 00:40:29 -0000	1.32
+++ sim.scm	18 Jun 2015 18:12:49 -0000
@@ -1260,12 +1260,12 @@
         (send (op:type op) 'gen-set-quiet estate mode index selector
  	     (cx:make-with-atlist mode "opval" (cx:atlist newval))))
     (/op-gen-written-update op)
-; TRACE_RESULT_<MODE> (cpu, abuf, hwnum, opnum, value);
+; CGEN_TRACE_RESULT_<MODE> (cpu, abuf, hwnum, opnum, value);
  ; For each insn record array of operand numbers [or indices into
  ; operand instance table].
  ; Could just scan the operand table for the operand or hardware number,
  ; assuming the operand number is stored in `op'.
-   "    TRACE_RESULT (current_cpu, abuf"
+   "    CGEN_TRACE_RESULT (current_cpu, abuf"
     ", " (send op 'gen-pretty-name mode)
     ", " (mode:printf-type mode)
     ", opval);\n"
@@ -1287,12 +1287,12 @@
  	"    " /par-operand-macro " (" (gen-sym op) ")"
  	" = opval;\n"))
     (/op-gen-written-update op)
-; TRACE_RESULT_<MODE> (cpu, abuf, hwnum, opnum, value);
+; CGEN_TRACE_RESULT_<MODE> (cpu, abuf, hwnum, opnum, value);
  ; For each insn record array of operand numbers [or indices into
  ; operand instance table].
  ; Could just scan the operand table for the operand or hardware number,
  ; assuming the operand number is stored in `op'.
-   "    TRACE_RESULT (current_cpu, abuf"
+   "    CGEN_TRACE_RESULT (current_cpu, abuf"
     ", " (send op 'gen-pretty-name mode)
     ", " (mode:printf-type mode)
     ", opval);\n"
@@ -1323,7 +1323,8 @@
  	    (/op-gen-set-quiet self estate mode index selector newval)))))
  )

-; Return C code to set the value of an operand and print TRACE_RESULT  
message.
+; Return C code to set the value of an operand and print CGEN_TRACE_RESULT
+; message.
  ; NEWVAL is a <c-expr> object of the value to store.
  ; If INDEX is non-#f use it, otherwise use (op:index self).
