sim: replace CIA_{GET,SET} with CPU_PC_{GET,SET}

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

diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h
index d076e1520fe8eaddd64e79fc4a0353bc4432331c..661d9cf9e3abf112b962e1199b1427da98ed340d 100644 (file)
--- a/sim/m32r/sim-main.h
+++ b/sim/m32r/sim-main.h
@@ -18,9 +18,6 @@ typedef struct _sim_cpu SIM_CPU;
 /* 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 */ \
@@ -58,13 +55,17 @@ struct _sim_cpu {
 #if defined (WANT_CPU_M32RBF)
   M32RBF_CPU_DATA cpu_data;
 #endif
+#if defined (WANT_CPU_M32RXF)
+  M32RXF_CPU_DATA cpu_data;
+#elif defined (WANT_CPU_M32R2F)
+  M32R2F_CPU_DATA cpu_data;
+#endif
 };
 \f
 /* The sim_state struct.  */
 
 struct sim_state {
-  sim_cpu *cpu;
-#define STATE_CPU(sd, n) (/*&*/ (sd)->cpu)
+  sim_cpu *cpu[MAX_NR_PROCESSORS];
 
   CGEN_STATE cgen_state;
 
@@ -80,6 +81,10 @@ m32r_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), \
                  (TRANSFER), (ERROR))
 
 /* Default memory size.  */
+#ifdef M32R_LINUX
+#define M32R_DEFAULT_MEM_SIZE 0x2000000 /* 32M */
+#else
 #define M32R_DEFAULT_MEM_SIZE 0x800000 /* 8M */
+#endif
 
 #endif /* SIM_MAIN_H */