sim: ppc: replace local CONCAT macros with common ones

Drop local copies of CONCAT macros that the common ansidecl.h provides.
This commit is contained in:
Mike Frysinger 2021-06-15 20:35:37 -04:00
parent 5976569641
commit b778e6b079
6 changed files with 12 additions and 16 deletions

View File

@ -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.

View File

@ -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 */

View File

@ -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 {

View File

@ -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 */

View File

@ -25,6 +25,7 @@
#include "defs.h"
#include "basics.h"
#include "symcat.h"
#if !defined(_SWAP_1)

View File

@ -32,6 +32,7 @@
#endif
#include "cpu.h"
#include "symcat.h"
/* OEA vs VEA