sim: rl78: rename open symbol to avoid collisions

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

diff --git a/sim/h8300/sim-main.h b/sim/h8300/sim-main.h
index e428d804532fbb778011a9894b95fc217444b375..a0aa9ef1929a1f5c1cf9d097db269ffcd136b396 100644 (file)
--- a/sim/h8300/sim-main.h
+++ b/sim/h8300/sim-main.h
@@ -1,6 +1,5 @@
 /* Main header for the Hitachi h8/300 architecture.  */
 
-#include "config.h"
 #include "bfd.h"
 
 #ifndef SIM_MAIN_H
@@ -87,12 +86,6 @@ enum h8_typecodes {
 };
 
 #include "sim-basics.h"
-
-/* Define sim_cia.  */
-typedef unsigned32 sim_cia;
-
-typedef struct _sim_cpu SIM_CPU;
-
 #include "sim-base.h"
 
 /* Structure used to describe addressing */
@@ -132,31 +125,21 @@ struct _sim_cpu {
   char **command_line;         /* Pointer to command line arguments.  */
 
   unsigned char *memory;
-  unsigned char *eightbit;
   int mask;
   
   sim_cpu_base base;
 };
 
-/* The sim_state struct.  */
-struct sim_state {
-  sim_cpu *cpu[MAX_NR_PROCESSORS];
-  unsigned int sim_cache_size;
-  decoded_inst *sim_cache;
-  unsigned short *cache_idx;
+struct h8300_sim_state {
   unsigned long memory_size;
-  int cache_top;
-  int compiles;
 #ifdef ADEBUG
   int stats[O_LAST];
 #endif
-  sim_state_base base;
 };
+#define H8300_SIM_STATE(sd) ((struct h8300_sim_state *) STATE_ARCH_DATA (sd))
 
 /* 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 cpu_set_pc(CPU, VAL)   (((CPU)->pc)  = (VAL))
 #define cpu_get_pc(CPU)                (((CPU)->pc))