diff options
| author | Doug Evans <dje@google.com> | 1998-12-05 08:09:18 +0000 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 1998-12-05 08:09:18 +0000 |
| commit | 0a18a6b8adb8e5d3ec215cf53e20dce1c600e201 (patch) | |
| tree | c5a29530d9b639ef4a6234319390becd47ea2ecd /sim/m32r/sim-main.h | |
| parent | b61e2e146a85a1d93d1ad78f923005c8e4e2d7e4 (diff) | |
| download | gdb-0a18a6b8adb8e5d3ec215cf53e20dce1c600e201.zip gdb-0a18a6b8adb8e5d3ec215cf53e20dce1c600e201.tar.gz gdb-0a18a6b8adb8e5d3ec215cf53e20dce1c600e201.tar.bz2 | |
* configure.in: Call SIM_AC_OPTION_INLINE.
* configure: Regenerate.
* sim-main.h: Protect against multiple inclusion.
Don't include cgen-scache.h,cgen-cpu.h,cgen-trace.h,cpuall.h.
Done by cgen-sim.h now.
* tconfig.in (SIM_HAVE_MODEL): Delete, moved to cgen-types.h.
* cpuall.h: Regenerate.
* cpu.h,decode.c,sem-switch.c,sem.c: Regenerate.
* mloop.in (extract16): Make static inline again.
Simplify with call to @cpu@_fill_argbuf,@cpu@_fill_argbuf_tp.
(extract32): Ditto.
Simplify with call to @cpu@_fill_argbuf,@cpu@_fill_argbuf_tp.
(execute): Test ARGBUF_PROFILE_P before profiling.
Update calls to TRACE_INSN_INIT,TRACE_INSN_FINI.
* cpux.h,decodex.c,modelx.c,semx-switch.c: Regenerate.
* mloopx.in: Rewrite.
Diffstat (limited to 'sim/m32r/sim-main.h')
| -rw-r--r-- | sim/m32r/sim-main.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h index 923465f..03f06b9 100644 --- a/sim/m32r/sim-main.h +++ b/sim/m32r/sim-main.h @@ -1,19 +1,19 @@ /* Main header for the m32r. */ +#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" - #include "ansidecl.h" #include "symcat.h" +#include "sim-basics.h" #include "cgen-types.h" +#include "cpu-opc.h" #include "arch.h" -#include "sim-basics.h" /* These must be defined before sim-base.h. */ typedef USI sim_cia; @@ -23,11 +23,7 @@ typedef USI sim_cia; #include "sim-base.h" #include "cgen-sim.h" -#include "cgen-scache.h" -#include "cgen-cpu.h" -#include "cgen-trace.h" #include "cpu-sim.h" -#include "cpuall.h" /* The _sim_cpu struct. */ @@ -78,3 +74,5 @@ m32r_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), \ /* Default memory size. */ #define M32R_DEFAULT_MEM_SIZE 0x800000 /* 8M */ + +#endif /* SIM_MAIN_H */ |