sim: cleanup obsolete NULL fallback

We require C11 which defines NULL, so drop the inconsistent set of
fallback defines in the codebase.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index b5b6db2f9a292d6c2d254d7c2a8b6c8094d21e80..2cc89c825ae2c1f724d4369330215cc95e04dbd3 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-09  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-basics.h (NULL): Delete.
+
 2021-06-09  Mike Frysinger  <vapier@gentoo.org>
 
        * nrun.c (main): Set default_callback.target_endian to

diff --git a/sim/common/sim-basics.h b/sim/common/sim-basics.h
index 25c1193dca44b0553e1d7f060f8e9acfc859b3af..ac63aef456ac9dfe90ffbd459ac0d5b627cf233c 100644 (file)
--- a/sim/common/sim-basics.h
+++ b/sim/common/sim-basics.h
@@ -36,11 +36,6 @@
 #include <setjmp.h>
 
 
-#ifndef NULL
-#define NULL 0
-#endif
-
-
 #ifndef min
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #endif

diff --git a/sim/igen/ChangeLog b/sim/igen/ChangeLog
index 7ef9e1deb25b509b615e2beddadedf43a43d8f71..22efdf3260ffbd1c9445d3ce55d14e5dca5c19ef 100644 (file)
--- a/sim/igen/ChangeLog
+++ b/sim/igen/ChangeLog
@@ -1,3 +1,10 @@
+2021-06-09  Mike Frysinger  <vapier@gentoo.org>
+
+       * gen-itable.c (NULL): Delete.
+       * gen-model.c (NULL): Likewise.
+       * ld-cache.c (NULL): Likewise.
+       * ld-decode.c (NULL): Likewise.
+
 2021-06-05  Mike Frysinger  <vapier@gentoo.org>
 
        * local.mk (all-recursive): Delete rule.

diff --git a/sim/igen/gen-itable.c b/sim/igen/gen-itable.c
index 3b50ab60f0a224020cd228941d941f4a946fc82e..eedef58fd9af0641421bcc1075ed582a00cdace6 100644 (file)
--- a/sim/igen/gen-itable.c
+++ b/sim/igen/gen-itable.c
@@ -34,11 +34,6 @@
 
 #include "gen-itable.h"
 
-#ifndef NULL
-#define NULL 0
-#endif
-
-
 
 typedef struct _itable_info
 {

diff --git a/sim/igen/gen-model.c b/sim/igen/gen-model.c
index f162446866a419b275e2727faed339674b9b7f24..054d7b96c6a1d4f398506e2de973169135fa9722 100644 (file)
--- a/sim/igen/gen-model.c
+++ b/sim/igen/gen-model.c
@@ -31,10 +31,6 @@
 
 #include "gen-model.h"
 
-#ifndef NULL
-#define NULL 0
-#endif
-
 
 void
 gen_model_h (lf *file, insn_table *table)

diff --git a/sim/igen/ld-cache.c b/sim/igen/ld-cache.c
index 24b622222e096f42f7029e7a7debd167194e1038..defe31d7d68d5dabf69a68b1a0b315623970111b 100644 (file)
--- a/sim/igen/ld-cache.c
+++ b/sim/igen/ld-cache.c
@@ -30,10 +30,6 @@
 #include "ld-insn.h"
 #include "ld-cache.h"
 
-#ifndef NULL
-#define NULL 0
-#endif
-
 
 enum
 {

diff --git a/sim/igen/ld-decode.c b/sim/igen/ld-decode.c
index 75f24279eb2ff84687cee5996fbcac3b8378246d..6736e6b6faf906743eaae4aae914e6d7f9605fe9 100644 (file)
--- a/sim/igen/ld-decode.c
+++ b/sim/igen/ld-decode.c
@@ -31,10 +31,6 @@
 
 #include "ld-decode.h"
 
-#ifndef NULL
-#define NULL 0
-#endif
-
 
 static const name_map decode_type_map[] = {
   {"normal", normal_decode_rule},

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index fcd74c64e4c104fecdef5c40b4a87557bf02e933..9289b8ed2a728bb567f3070ae3056eb473522c77 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,11 @@
+2021-06-09  Mike Frysinger  <vapier@gentoo.org>
+
+       * basics.h (NULL): Delete.
+       * gen-itable.c (NULL): Likewise.
+       * gen-model.c (NULL): Likewise.
+       * ld-cache.c (NULL): Likewise.
+       * ld-decode.c (NULL): Likewise.
+
 2021-05-29  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac (WERROR_CFLAGS): Add -Wno-format for mingw32 hosts.

diff --git a/sim/ppc/basics.h b/sim/ppc/basics.h
index 057cf1ab0e454055fb7e3aa5537ee8118e3e6545..3eb7c61ba9119185890ee1b94677680cb71c6528 100644 (file)
--- a/sim/ppc/basics.h
+++ b/sim/ppc/basics.h
@@ -103,10 +103,6 @@ typedef enum {
 #define NORETURN
 #endif
 
-#ifndef NULL
-#define NULL 0
-#endif
-
 #if !defined (__attribute__)
 #if (!defined(__GNUC__) \
      || (__GNUC__ < 2) \

diff --git a/sim/ppc/gen-itable.c b/sim/ppc/gen-itable.c
index 7f3139ed971f73c1a7cb22e3ca743fb9d536d36a..a0d1560027c1e45763086f4ef38f971ec9c7b26e 100644 (file)
--- a/sim/ppc/gen-itable.c
+++ b/sim/ppc/gen-itable.c
@@ -32,11 +32,6 @@
 #include "igen.h"
 #include "gen-itable.h"
 
-#ifndef NULL
-#define NULL 0
-#endif
-
-
 
 static void
 itable_h_insn(insn_table *entry,

diff --git a/sim/ppc/gen-model.c b/sim/ppc/gen-model.c
index a591d316e2ea7ffa260b54454b2ae5fb37252a47..1322391b25aedc75956ca770b34a98bba02a9668 100644 (file)
--- a/sim/ppc/gen-model.c
+++ b/sim/ppc/gen-model.c
@@ -30,10 +30,6 @@
 
 #include "gen-model.h"
 
-#ifndef NULL
-#define NULL 0
-#endif
-
 
 static void
 model_c_or_h_data(insn_table *table,

diff --git a/sim/ppc/ld-cache.c b/sim/ppc/ld-cache.c
index 29a70350508d64e17978035053339c3f5b42ea50..611ac7a0875450ab35c718d99f5a1ae719492c8d 100644 (file)
--- a/sim/ppc/ld-cache.c
+++ b/sim/ppc/ld-cache.c
@@ -23,10 +23,6 @@
 #include "table.h"
 #include "ld-cache.h"
 
-#ifndef NULL
-#define NULL 0
-#endif
-
 
 enum {
   ca_type,

diff --git a/sim/ppc/ld-decode.c b/sim/ppc/ld-decode.c
index 3b2e1a05c28089b8fa7011eceb6de54c348dc020..cee006fe6f1012cabc295b93c5b11c5e35db057c 100644 (file)
--- a/sim/ppc/ld-decode.c
+++ b/sim/ppc/ld-decode.c
@@ -24,9 +24,6 @@
 #include "table.h"
 #include "ld-decode.h"
 
-#ifndef NULL
-#define NULL 0
-#endif
 
 enum {
   op_options,