X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fmn10300%2Fsim-main.h;h=847506e4fe9157a1c5a66c3262f0b5a0891b7d6f;hb=926b1cd8cffbcd8cf2d37e779463a4e7e696f73b;hp=046aa17f596971eff7935c7e1e61eea38e5afb6b;hpb=64f14c970716647f0761e921141873c75071100f;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
index 046aa17f59..847506e4fe 100644
--- a/sim/mn10300/sim-main.h
+++ b/sim/mn10300/sim-main.h
@@ -42,13 +42,6 @@
 #include "itable.h"
 #include "idecode.h"
 
-typedef instruction_address sim_cia;
-typedef struct _sim_cpu SIM_CPU;
-
-/* FIXME: Perhaps igen should generate access macros for
-   `instruction_address' that we could use.  */
-/*#define CIA_ADDR(cia) ((cia).ip) doesn't work for mn10300*/
-
 #define WITH_WATCHPOINTS 1
 
 #define SIM_CORE_SIGNAL(SD,CPU,CIA,MAP,NR_BYTES,ADDR,TRANSFER,ERROR)  \
@@ -71,9 +64,6 @@ mn10300_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER),
 /* FIXME: For moment, save/restore PC value found in struct State.
    Struct State will one day go away, being placed in the sim_cpu
    state. */
-#define CIA_GET(CPU) ((PC) + 0)
-#define CIA_SET(CPU,VAL) ((CPU)->cia = (VAL), PC = (VAL))
-
 
 struct _sim_cpu {
   sim_event *pending_nmi;
@@ -86,11 +76,6 @@ struct sim_state {
 
   /* the processors proper */
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   /* The base class.  */
   sim_state_base base;