sim: unify SIM_CPU definition

[deliverable/binutils-gdb.git] / sim / lm32 / sim-main.h

diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h
index a4e44237377fef17d9da14f1d773c2f525438625..9a6ba1adf478470a91a2c68137f6dba05ffafce4 100644 (file)
--- a/sim/lm32/sim-main.h
+++ b/sim/lm32/sim-main.h
@@ -25,9 +25,6 @@
 
 #define USING_SIM_BASE_H       /* FIXME: quick hack */
 
-struct _sim_cpu;               /* FIXME: should be in sim-basics.h */
-typedef struct _sim_cpu SIM_CPU;
-
 #include "symcat.h"
 #include "sim-basics.h"
 #include "cgen-types.h"
@@ -35,12 +32,6 @@ typedef struct _sim_cpu SIM_CPU;
 #include "lm32-opc.h"
 #include "arch.h"
 
-/* These must be defined before sim-base.h.  */
-typedef USI sim_cia;
-
-#define CIA_GET(cpu)     CPU_PC_GET (cpu)
-#define CIA_SET(cpu,val) CPU_PC_SET ((cpu), (val))
-
 #define SIM_ENGINE_HALT_HOOK(sd, cpu, cia) \
 do { \
   if (cpu) /* null if ctrl-c */ \
@@ -83,8 +74,7 @@ struct _sim_cpu
 
 struct sim_state
 {
-  sim_cpu *cpu;
-#define STATE_CPU(sd, n) (/*&*/ (sd)->cpu)
+  sim_cpu *cpu[MAX_NR_PROCESSORS];
 
   CGEN_STATE cgen_state;