1 files changed, 20 insertions, 19 deletions

diff --git a/sim/common/cgen-trace.h b/sim/common/cgen-trace.h
index ba62f6c..5cc08ae 100644
--- a/sim/common/cgen-trace.h
+++ b/sim/common/cgen-trace.h
@@ -20,46 +20,47 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef CGEN_TRACE_H
 #define CGEN_TRACE_H
 
-void trace_insn_init (SIM_CPU *, int);
-void trace_insn_fini (SIM_CPU *, const struct argbuf *, int);
-void trace_insn (SIM_CPU *, const struct cgen_insn *,
-		 const struct argbuf *, IADDR);
-void trace_extract (SIM_CPU *, IADDR, char *, ...);
-void trace_result (SIM_CPU *, char *, int, ...);
+void cgen_trace_insn_init (SIM_CPU *, int);
+void cgen_trace_insn_fini (SIM_CPU *, const struct argbuf *, int);
+void cgen_trace_insn (SIM_CPU *, const struct cgen_insn *,
+		      const struct argbuf *, IADDR);
+void cgen_trace_extract (SIM_CPU *, IADDR, char *, ...);
+void cgen_trace_result (SIM_CPU *, char *, int, ...);
 void cgen_trace_printf (SIM_CPU *, char *fmt, ...);
 
 /* Trace instruction results.  */
-#define TRACE_RESULT_P(cpu, abuf) (TRACE_INSN_P (cpu) && ARGBUF_TRACE_P (abuf))
+#define CGEN_TRACE_RESULT_P(cpu, abuf) \
+  (TRACE_INSN_P (cpu) && ARGBUF_TRACE_P (abuf))
 
-#define TRACE_INSN_INIT(cpu, abuf, first_p) \
+#define CGEN_TRACE_INSN_INIT(cpu, abuf, first_p) \
 do { \
   if (TRACE_INSN_P (cpu)) \
-    trace_insn_init ((cpu), (first_p)); \
+    cgen_trace_insn_init ((cpu), (first_p)); \
 } while (0)
-#define TRACE_INSN_FINI(cpu, abuf, last_p) \
+#define CGEN_TRACE_INSN_FINI(cpu, abuf, last_p) \
 do { \
   if (TRACE_INSN_P (cpu)) \
-    trace_insn_fini ((cpu), (abuf), (last_p)); \
+    cgen_trace_insn_fini ((cpu), (abuf), (last_p)); \
 } while (0)
-#define TRACE_PRINTF(cpu, what, args) \
+#define CGEN_TRACE_PRINTF(cpu, what, args) \
 do { \
   if (TRACE_P ((cpu), (what))) \
     cgen_trace_printf args ; \
 } while (0)
-#define TRACE_INSN(cpu, insn, abuf, pc) \
+#define CGEN_TRACE_INSN(cpu, insn, abuf, pc) \
 do { \
   if (TRACE_INSN_P (cpu) && ARGBUF_TRACE_P (abuf)) \
-    trace_insn ((cpu), (insn), (abuf), (pc)) ; \
+    cgen_trace_insn ((cpu), (insn), (abuf), (pc)) ; \
 } while (0)
-#define TRACE_EXTRACT(cpu, abuf, args) \
+#define CGEN_TRACE_EXTRACT(cpu, abuf, args) \
 do { \
   if (TRACE_EXTRACT_P (cpu)) \
-    trace_extract args ; \
+    cgen_trace_extract args ; \
 } while (0)
-#define TRACE_RESULT(cpu, abuf, name, type, val) \
+#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) \
 do { \
-  if (TRACE_RESULT_P ((cpu), (abuf))) \
-    trace_result ((cpu), (name), (type), (val)) ; \
+  if (CGEN_TRACE_RESULT_P ((cpu), (abuf))) \
+    cgen_trace_result ((cpu), (name), (type), (val)) ; \
 } while (0)
 
 /* Disassembly support.  */