diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-06-15 20:35:37 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-06-16 01:06:28 -0400 |
| commit | b778e6b0799680e1d2b70d6b9d4bd3daa8898702 (patch) | |
| tree | 6620251b0861d4375bef99d84b6a92773d33d550 /sim | |
| parent | 597656964120f19c06737eee3a530baf7aa9323a (diff) | |
| download | fsf-binutils-gdb-b778e6b0799680e1d2b70d6b9d4bd3daa8898702.zip fsf-binutils-gdb-b778e6b0799680e1d2b70d6b9d4bd3daa8898702.tar.gz fsf-binutils-gdb-b778e6b0799680e1d2b70d6b9d4bd3daa8898702.tar.bz2 | |
sim: ppc: replace local CONCAT macros with common ones
Drop local copies of CONCAT macros that the common ansidecl.h provides.
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/ppc/ChangeLog | 8 | ||||
| -rw-r--r-- | sim/ppc/basics.h | 16 | ||||
| -rw-r--r-- | sim/ppc/corefile.c | 1 | ||||
| -rw-r--r-- | sim/ppc/idecode_fields.h | 1 | ||||
| -rw-r--r-- | sim/ppc/sim-endian.c | 1 | ||||
| -rw-r--r-- | sim/ppc/vm.c | 1 |
6 files changed, 12 insertions, 16 deletions
diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index d071945..3f4fd91 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,5 +1,13 @@ 2021-06-16 Mike Frysinger <vapier@gentoo.org> + * basics.h: Delete CONCAT* and XCONCAT* macros. + * corefile.c: Include symcat.h. + * idecode_fields.h: Likewise. + * sim-endian.c: Likewise. + * vm.c: Likewise. + +2021-06-16 Mike Frysinger <vapier@gentoo.org> + * device.h (device_add_boolean_property): Rename bool arg to boolean. 2021-06-16 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/ppc/basics.h b/sim/ppc/basics.h index 3eb7c61..d88bcef 100644 --- a/sim/ppc/basics.h +++ b/sim/ppc/basics.h @@ -24,22 +24,6 @@ /* This must come before any other includes. */ #include "defs.h" -/* from Michael Meissner, macro's to handle concating symbols better */ - -#if defined(__STDC__) || defined(ALMOST_STDC) -#define CONCAT2(a,b) a##b -#define CONCAT3(a,b,c) a##b##c -#define CONCAT4(a,b,c,d) a##b##c##d -#else -#define CONCAT2(a,b) a/**/b -#define CONCAT3(a,b,c) a/**/b/**/c -#define CONCAT4(a,b,c,d) a/**/b/**/c/**/d -#endif - -#define XCONCAT2(a,b) CONCAT2(a,b) -#define XCONCAT3(a,b,c) CONCAT3(a,b,c) -#define XCONCAT4(a,b,c,d) CONCAT4(a,b,c,d) - /* many things pass around the cpu and psim object with out knowing what it is */ diff --git a/sim/ppc/corefile.c b/sim/ppc/corefile.c index d784d64..ac8aa5d 100644 --- a/sim/ppc/corefile.c +++ b/sim/ppc/corefile.c @@ -24,6 +24,7 @@ #include "basics.h" #include "device_table.h" #include "corefile.h" +#include "symcat.h" typedef struct _core_mapping core_mapping; struct _core_mapping { diff --git a/sim/ppc/idecode_fields.h b/sim/ppc/idecode_fields.h index cf8826d..f5c29ad 100644 --- a/sim/ppc/idecode_fields.h +++ b/sim/ppc/idecode_fields.h @@ -26,6 +26,7 @@ In addition to the below, more will be found in the gen program's cache table */ +#include "symcat.h" /* map some statements and variables directly across */ diff --git a/sim/ppc/sim-endian.c b/sim/ppc/sim-endian.c index 0f76b23..29f51e5 100644 --- a/sim/ppc/sim-endian.c +++ b/sim/ppc/sim-endian.c @@ -25,6 +25,7 @@ #include "defs.h" #include "basics.h" +#include "symcat.h" #if !defined(_SWAP_1) diff --git a/sim/ppc/vm.c b/sim/ppc/vm.c index 9562fb6..304972e 100644 --- a/sim/ppc/vm.c +++ b/sim/ppc/vm.c @@ -32,6 +32,7 @@ #endif #include "cpu.h" +#include "symcat.h" /* OEA vs VEA |