sim: moxie: use new common trace defines

Now that there's common helpers for printing trace data, switch to that
to restore the insn tracing support for this target.

diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index f27863b656be3a8d1aac5fc506ddea5a082ef720..b33ac06d5b7cdfe94a51dccf668e6af3723fb49e 100644 (file)
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (tracefile, tracing): Delete.
+       (MOXIE_TRACE_INSN): Call TRACE_INSN directly.
+
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
        * interp.c (TRACE): Rename to ...

diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c
index 0d068feb1bb0615c858a5295014d281464ae1cdf..35ee2a70a83f523506a64259241c48fa45e416b1 100644 (file)
--- a/sim/moxie/interp.c
+++ b/sim/moxie/interp.c
@@ -229,10 +229,15 @@ convert_target_flags (unsigned int tflags)
   return hflags;
 }
 
-/* TODO: Move to sim-trace.h.  */
-static FILE *tracefile;
-static const int tracing = 0;
-#define MOXIE_TRACE_INSN(str) if (tracing) fprintf(tracefile,"0x%08x, %s, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x\n", opc, str, cpu.asregs.regs[0], cpu.asregs.regs[1], cpu.asregs.regs[2], cpu.asregs.regs[3], cpu.asregs.regs[4], cpu.asregs.regs[5], cpu.asregs.regs[6], cpu.asregs.regs[7], cpu.asregs.regs[8], cpu.asregs.regs[9], cpu.asregs.regs[10], cpu.asregs.regs[11], cpu.asregs.regs[12], cpu.asregs.regs[13], cpu.asregs.regs[14], cpu.asregs.regs[15]);
+/* TODO: Split this up into finger trace levels than just insn.  */
+#define MOXIE_TRACE_INSN(str) \
+  TRACE_INSN (scpu, "0x%08x, %s, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x", \
+             opc, str, cpu.asregs.regs[0], cpu.asregs.regs[1], \
+             cpu.asregs.regs[2], cpu.asregs.regs[3], cpu.asregs.regs[4], \
+             cpu.asregs.regs[5], cpu.asregs.regs[6], cpu.asregs.regs[7], \
+             cpu.asregs.regs[8], cpu.asregs.regs[9], cpu.asregs.regs[10], \
+             cpu.asregs.regs[11], cpu.asregs.regs[12], cpu.asregs.regs[13], \
+             cpu.asregs.regs[14], cpu.asregs.regs[15])
 
 void
 sim_engine_run (SIM_DESC sd,