diff options
| author | Doug Evans <dje@google.com> | 1998-02-23 21:36:15 +0000 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 1998-02-23 21:36:15 +0000 |
| commit | 02310b01ca7f89c761ede50557c4ac3db9bebffb (patch) | |
| tree | d940fc72d405dab53a8cc0211520f35485b99576 /sim/m32r/decodex.c | |
| parent | 93f34464a36ecdbd03ac639b9053638198e86b32 (diff) | |
| download | gdb-02310b01ca7f89c761ede50557c4ac3db9bebffb.zip gdb-02310b01ca7f89c761ede50557c4ac3db9bebffb.tar.gz gdb-02310b01ca7f89c761ede50557c4ac3db9bebffb.tar.bz2 | |
* sim-main.h: #include symcat.h.
* m32r-sim.h (BRANCH_NEW_PC): Delete current_cpu arg.
(NEW_PC_{BASE,SKIP,2,4,BRANCH_P}): New macros.
* cpu.[ch],decode.[ch],extract.c,model.c: Regenerate.
* sem.c,sem-switch.c: Regenerate.
* m32r-sim.h (SEM_NEXT_PC): Modify to handle parallel exec.
* mloopx.in: Rewrite.
* cpux.[ch],decodex.[ch],readx.c,semx.c: Regenerate.
Diffstat (limited to 'sim/m32r/decodex.c')
| -rw-r--r-- | sim/m32r/decodex.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sim/m32r/decodex.c b/sim/m32r/decodex.c index 3883b28..75280a9 100644 --- a/sim/m32r/decodex.c +++ b/sim/m32r/decodex.c @@ -26,7 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #define WANT_CPU_M32RX #include "sim-main.h" -#include "sim-xcat.h" #include "cpu-sim.h" #include "cpu-opc.h" @@ -35,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc., around while the cache version is being developed. It may still be useful to allow two versions to exist though. */ #if WITH_SCACHE -#define EX(fn) XCONCAT3 (m32rx,_ex_,fn) +#define EX(fn) CONCAT3 (m32rx,_ex_,fn) #else #define EX(fn) 0 #endif @@ -44,7 +43,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifdef __GNUC__ #define READ(n) 0 #else -#define READ(n) XCONCAT3 (READ,_,n) +#define READ(n) CONCAT3 (READ,_,n) #endif #endif @@ -53,14 +52,14 @@ with this program; if not, write to the Free Software Foundation, Inc., #if WITH_SEM_SWITCH_FULL #define FULL(fn) 0 #else -#define FULL(fn) XCONCAT3 (m32rx,_sem_,fn) +#define FULL(fn) CONCAT3 (m32rx,_sem_,fn) #endif #if WITH_FAST #if WITH_SEM_SWITCH_FAST #define FAST(fn) 0 #else -#define FAST(fn) XCONCAT3 (m32rx,_semf_,fn) /* f for fast */ +#define FAST(fn) CONCAT3 (m32rx,_semf_,fn) /* f for fast */ #endif #else #define FAST(fn) 0 |