X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fmsp430%2Fsim-main.h;h=350e9b299a5b8ee230a79419e56918a5ebd8ae78;hb=5fd104addfddb68844fb8df67be832ee98ad9888;hp=d71217e928ad8f6328867dd5071f57eb29b192b2;hpb=78e9aa70febc3985a2c88dbc0c7a87d214231c3d;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/msp430/sim-main.h b/sim/msp430/sim-main.h
index d71217e928..350e9b299a 100644
--- a/sim/msp430/sim-main.h
+++ b/sim/msp430/sim-main.h
@@ -1,6 +1,6 @@
 /* Simulator for TI MSP430 and MSP430X processors.
 
-   Copyright (C) 2012-2015 Free Software Foundation, Inc.
+   Copyright (C) 2012-2020 Free Software Foundation, Inc.
    Contributed by Red Hat, Inc.
 
    This file is part of simulators.
@@ -23,11 +23,6 @@
 
 #include "sim-basics.h"
 #include "sim-signal.h"
-
-typedef unsigned32 sim_cia;
-
-typedef struct _sim_cpu SIM_CPU;
-
 #include "msp430-sim.h"
 #include "sim-base.h"
 
@@ -42,11 +37,6 @@ struct sim_state
 {
   sim_cpu *cpu[MAX_NR_PROCESSORS];
 
-  asymbol **symbol_table;
-  long number_of_symbols;
-#define STATE_SYMBOL_TABLE(sd)   ((sd)->symbol_table)
-#define STATE_NUM_SYMBOLS(sd) ((sd)->number_of_symbols)
-  
   /* Simulator specific members.  */
   sim_state_base base;
 };
@@ -54,60 +44,9 @@ struct sim_state
 #define MSP430_CPU(sd)       (STATE_CPU ((sd), 0))
 #define MSP430_CPU_STATE(sd) (MSP430_CPU ((sd)->state))
 
-#define CIA_GET(CPU)     ((CPU)->state.regs[0] + 0)
-#define CIA_SET(CPU,VAL) ((CPU)->state.regs[0] = (VAL))
-
 #include "sim-config.h"
 #include "sim-types.h"
 #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_ */