gas/arc: Use #define from include/opcode/arc.h

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

diff --git a/sim/h8300/sim-main.h b/sim/h8300/sim-main.h
index 964388ac56055cffd3c99e3a7d199c2ee25230ea..6dbc1ac1c2b2475af14999ed8a7827bdee9ca5c9 100644 (file)
--- a/sim/h8300/sim-main.h
+++ b/sim/h8300/sim-main.h
@@ -87,10 +87,6 @@ enum h8_typecodes {
 };
 
 #include "sim-basics.h"
-
-/* Define sim_cia.  */
-typedef unsigned32 sim_cia;
-
 #include "sim-base.h"
 
 /* Structure used to describe addressing */
@@ -138,7 +134,7 @@ struct _sim_cpu {
 
 /* The sim_state struct.  */
 struct sim_state {
-  struct _sim_cpu *cpu;
+  sim_cpu *cpu[MAX_NR_PROCESSORS];
   unsigned int sim_cache_size;
   decoded_inst *sim_cache;
   unsigned short *cache_idx;
@@ -153,9 +149,6 @@ struct sim_state {
 
 /* The current state of the processor; registers, memory, etc.  */
 
-#define CIA_GET(CPU)           (cpu_get_pc (CPU))
-#define CIA_SET(CPU, VAL)      (cpu_set_pc ((CPU), (VAL)))
-#define STATE_CPU(SD, N)       ((SD)->cpu)     /* Single Processor.  */
 #define cpu_set_pc(CPU, VAL)   (((CPU)->pc)  = (VAL))
 #define cpu_get_pc(CPU)                (((CPU)->pc))