sim: cgen: namespace custom trace functions

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

diff --git a/sim/sh64/sim-main.h b/sim/sh64/sim-main.h
index 99f0406342f175bef2a2951511eb5ad6c65d11c8..7b24ab0e5ca86059a2ca5d186b4e1998322e1312 100644 (file)
--- a/sim/sh64/sim-main.h
+++ b/sim/sh64/sim-main.h
@@ -3,11 +3,6 @@
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define USING_SIM_BASE_H /* FIXME: quick hack */
-
-struct _sim_cpu; /* FIXME: should be in sim-basics.h */
-typedef struct _sim_cpu SIM_CPU;
-
 /* sim-basics.h includes config.h but cgen-types.h must be included before
    sim-basics.h and cgen-types.h needs config.h.  */
 #include "config.h"
@@ -21,6 +16,7 @@ typedef struct _sim_cpu SIM_CPU;
 
 /* These must be defined before sim-base.h.  */
 typedef UDI sim_cia;
+#define CIA_ADDR(cia) (cia)
 
 #include "sim-base.h"
 #include "cgen-sim.h"