X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=sim%2Fv850%2Fsim-main.h;h=e7276a68f8f6728afd4f487c2162f1754bfd578d;hb=3d34df0aa78ad01e5104ad1294364ef754a37cfa;hp=505b19ea5fd6d6f1a5a50d7f5be2ded80f88407e;hpb=a3976a7c56ec803f6ba141576cc56afe02663a8a;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/v850/sim-main.h b/sim/v850/sim-main.h
index 505b19ea5f..e7276a68f8 100644
--- a/sim/v850/sim-main.h
+++ b/sim/v850/sim-main.h
@@ -1,13 +1,6 @@
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-/* General config options */
-
-#define WITH_CORE
-#define WITH_MODULO_MEMORY 1
-#define WITH_WATCHPOINTS 1
-
-
 /* The v850 has 32bit words, numbered 31 (MSB) to 0 (LSB) */
 
 #define WITH_TARGET_WORD_MSB 31
@@ -16,9 +9,6 @@
 #include "sim-basics.h"
 #include "sim-signal.h"
 #include "sim-fpu.h"
-
-typedef address_word sim_cia;
-
 #include "sim-base.h"
 
 #include "simops.h"
@@ -59,16 +49,8 @@ struct _sim_cpu
   sim_cpu_base base;
 };
 
-#define CIA_GET(CPU) ((CPU)->reg.pc + 0)
-#define CIA_SET(CPU,VAL) ((CPU)->reg.pc = (VAL))
-
 struct sim_state {
-  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
+  sim_cpu *cpu[MAX_NR_PROCESSORS];
 #if 0
   SIM_ADDR rom_size;
   SIM_ADDR low_end;