sim: msp430: delete unused trace macros

These macros were copied from the Blackfin port but never used, so delete
them as part of the trace unification work.

diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index c2205b5d7f0499dce10e56b9bd1ccff3d394d55c..3fc04b6ef8f09fddb8f4981806d4e97f086c2246 100644 (file)
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-11  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (MAYBE_TRACE, TRACE_INSN, TRACE_DECODE, TRACE_EXTRACT,
+       TRACE_SYSCALL, TRACE_CORE, TRACE_EVENTS, TRACE_BRANCH,
+       trace_register, TRACE_REGISTER, TRACE_REG): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_CPU): Delete.

diff --git a/sim/msp430/sim-main.h b/sim/msp430/sim-main.h
index f08f3e41222678c608735d96186c2733e5ea3763..19c8ccaf868469de7d60b7f51f153fb7cb494e37 100644 (file)
--- a/sim/msp430/sim-main.h
+++ b/sim/msp430/sim-main.h
@@ -54,52 +54,4 @@ struct sim_state
 #include "sim-engine.h"
 #include "sim-options.h"
 
-#define MAYBE_TRACE(type, cpu, fmt, ...)                               \
-  do                                                                   \
-    {                                                                  \
-      if (TRACE_##type##_P (cpu))                                      \
-       trace_generic (CPU_STATE (cpu), cpu, TRACE_##type##_IDX,        \
-                      fmt, ## __VA_ARGS__);                            \
-    }                                                                  \
-  while (0)
-
-#define TRACE_INSN(cpu, fmt, ...)    MAYBE_TRACE (INSN, cpu, fmt, ## __VA_ARGS__)
-#define TRACE_DECODE(cpu, fmt, ...)  MAYBE_TRACE (DECODE, cpu, fmt, ## __VA_ARGS__)
-#define TRACE_EXTRACT(cpu, fmt, ...) MAYBE_TRACE (EXTRACT, cpu, fmt, ## __VA_ARGS__)
-#define TRACE_SYSCALL(cpu, fmt, ...) MAYBE_TRACE (SYSCALL, cpu, fmt, ## __VA_ARGS__)
-
-#define TRACE_CORE(cpu, addr, size, map, val)                          \
-  do                                                                   \
-    {                                                                  \
-      MAYBE_TRACE (CORE, cpu, "%cBUS %s %i bytes @ 0x%08x: 0x%0*x",    \
-                  map == exec_map ? 'I' : 'D',                         \
-                  map == write_map ? "STORE" : "FETCH",                \
-                  size, addr, size * 2, val);                          \
-      PROFILE_COUNT_CORE (cpu, addr, size, map);                       \
-    }                                                                  \
-  while (0)
-
-#define TRACE_EVENTS(cpu, fmt, ...) MAYBE_TRACE (EVENTS, cpu, fmt, ## __VA_ARGS__)
-
-#define TRACE_BRANCH(cpu, oldpc, newpc, fmt, ...)                      \
-  do                                                                   \
-    {                                                                  \
-      MAYBE_TRACE (BRANCH, cpu, fmt " to %#x", ## __VA_ARGS__, newpc); \
-    }                                                                  \
-  while (0)
-
-extern void trace_register (SIM_DESC, sim_cpu *, const char *, ...)
-     __attribute__((format (printf, 3, 4)));
-
-#define TRACE_REGISTER(cpu, fmt, ...)                                  \
-  do                                                                   \
-    {                                                                  \
-      if (TRACE_CORE_P (cpu))                                          \
-       trace_register (CPU_STATE (cpu), cpu, fmt, ## __VA_ARGS__);     \
-    }                                                                  \
-  while (0)
-
-#define TRACE_REG(cpu, reg, val) \
-  TRACE_REGISTER (cpu, "wrote R%d = %#x", reg, val)
-
 #endif /* _MSP430_MAIN_SIM_H_ */