sim: ppc: replace local CONCAT macros with common ones

Drop local copies of CONCAT macros that the common ansidecl.h provides.

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index d0719450ce22e851a92d872a9217c4b99963003e..3f4fd91a86578536fee45097eb26b3552a7fa290 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,11 @@
+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.

diff --git a/sim/ppc/basics.h b/sim/ppc/basics.h
index 3eb7c61ba9119185890ee1b94677680cb71c6528..d88bcef7a753649b50270f72191389a6f91c90f2 100644 (file)
--- 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 d784d64f4650eb2922ef063b93c6b2f3954b016b..ac8aa5d7e22f2a04f45466d07e2e1b2fbfa640d1 100644 (file)
--- 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 cf8826deefb9440b1f2a57a2ccbcd8f67e26cf8a..f5c29ad57180cca7dfeba1ffaec904f35f848337 100644 (file)
--- 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 0f76b239256f4d8e2ba13254392e1d954960676d..29f51e5a8d0f86ea79c88e4b2af7f6ead784cdb3 100644 (file)
--- 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 9562fb6762c0059ac07ba1573b0cfd7b50c280c8..304972e4f00e339bde82833ebf13aa05f9229e6d 100644 (file)
--- a/sim/ppc/vm.c
+++ b/sim/ppc/vm.c
@@ -32,6 +32,7 @@
 #endif
 
 #include "cpu.h"
+#include "symcat.h"
 
 /* OEA vs VEA