arch,base,cpu,dev: Get rid of the M5_DUMMY_RETURN macro.

This macro probably would have been defined to "return" in some cases,
to be put after a call to a function that doesn't return so that the
compiler wouldn't think control would reach the end of a non-void
function. It was only ever defined to expand to nothing, and now that
[[noreturn]] is a standard attribute, it should never be needed going
forward.

Change-Id: I37625eab72deeaede77f9347116b9fddd75febf7
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/35217
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/src/arch/arm/utility.cc b/src/arch/arm/utility.cc
index a189c4aa954d61fcb18174819e5a863ca6462a63..4d866d09c92d1ebaccc4a6fd379bee774ca78e5b 100644 (file)
--- a/src/arch/arm/utility.cc
+++ b/src/arch/arm/utility.cc
@@ -56,13 +56,10 @@ namespace ArmISA
 uint64_t
 getArgument(ThreadContext *tc, int &number, uint16_t size, bool fp)
 {
-    if (!FullSystem) {
-        panic("getArgument() only implemented for full system mode.\n");
-        M5_DUMMY_RETURN
-    }
+    panic_if(!FullSystem,
+            "getArgument() only implemented for full system mode.");
 
-    if (fp)
-        panic("getArgument(): Floating point arguments not implemented\n");
+    panic_if(fp, "getArgument(): Floating point arguments not implemented");
 
     if (inAArch64(tc)) {
         if (size == (uint16_t)(-1))

diff --git a/src/arch/mips/utility.cc b/src/arch/mips/utility.cc
index 7e797b57fda66720ca90b6931739fa48e4b25254..930c36bcf7df04bb74d42717564e41956e9820a3 100644 (file)
--- a/src/arch/mips/utility.cc
+++ b/src/arch/mips/utility.cc
@@ -47,7 +47,6 @@ uint64_t
 getArgument(ThreadContext *tc, int &number, uint16_t size, bool fp)
 {
     panic("getArgument() not implemented\n");
-    M5_DUMMY_RETURN
 }
 
 uint64_t

diff --git a/src/arch/sparc/utility.cc b/src/arch/sparc/utility.cc
index 21fbf939d55441c8615886abaa49de9329a45a1d..66fabd1b87f3c06f69a5647b8719b2bd619c4cf8 100644 (file)
--- a/src/arch/sparc/utility.cc
+++ b/src/arch/sparc/utility.cc
@@ -43,10 +43,7 @@ namespace SparcISA {
 uint64_t
 getArgument(ThreadContext *tc, int &number, uint16_t size, bool fp)
 {
-    if (!FullSystem) {
-        panic("getArgument() only implemented for full system\n");
-        M5_DUMMY_RETURN
-    }
+    panic_if(!FullSystem, "getArgument() only implemented for full system");
 
     const int NumArgumentRegs = 6;
     if (number < NumArgumentRegs) {

diff --git a/src/base/compiler.hh b/src/base/compiler.hh
index e2e777f9ba16f4b10a2fe503dc6a3bd9f879f93f..c3b2510a989562e12bc3cfaf654416b349abda8b 100644 (file)
--- a/src/base/compiler.hh
+++ b/src/base/compiler.hh
@@ -47,7 +47,6 @@
 
 #if defined(__GNUC__) // clang or gcc
 #  define M5_ATTR_NORETURN  __attribute__((noreturn))
-#  define M5_DUMMY_RETURN
 #  define M5_VAR_USED __attribute__((unused))
 #  define M5_ATTR_PACKED __attribute__ ((__packed__))
 #  define M5_NO_INLINE __attribute__ ((__noinline__))

diff --git a/src/cpu/static_inst.cc b/src/cpu/static_inst.cc
index f21d41bbca70548eb444b759641bf6e47e4e8907..7c6b0bfdc96680f586d4a38846b5c0197402ae33 100644 (file)
--- a/src/cpu/static_inst.cc
+++ b/src/cpu/static_inst.cc
@@ -106,7 +106,6 @@ StaticInst::branchTarget(const TheISA::PCState &pc) const
 {
     panic("StaticInst::branchTarget() called on instruction "
           "that is not a PC-relative branch.");
-    M5_DUMMY_RETURN;
 }
 
 TheISA::PCState
@@ -114,7 +113,6 @@ StaticInst::branchTarget(ThreadContext *tc) const
 {
     panic("StaticInst::branchTarget() called on instruction "
           "that is not an indirect branch.");
-    M5_DUMMY_RETURN;
 }
 
 const string &

diff --git a/src/dev/baddev.cc b/src/dev/baddev.cc
index 9e28d3b4ae659ff98ff8b81e53a02198d8073006..48cdff3fac5101eb96381d1ab989ea5b48f1341e 100644 (file)
--- a/src/dev/baddev.cc
+++ b/src/dev/baddev.cc
@@ -49,14 +49,12 @@ Tick
 BadDevice::read(PacketPtr pkt)
 {
     panic("Device %s not imlpmented\n", devname);
-    M5_DUMMY_RETURN
 }
 
 Tick
 BadDevice::write(PacketPtr pkt)
 {
     panic("Device %s not imlpmented\n", devname);
-    M5_DUMMY_RETURN
 }
 
 BadDevice *

diff --git a/src/dev/mips/malta.hh b/src/dev/mips/malta.hh
index d2bf584b9c1df382f50c5dd1b702994f0fdfa917..d424dafa5ce92546690740089c74cfdb4d7c9504 100644 (file)
--- a/src/dev/mips/malta.hh
+++ b/src/dev/mips/malta.hh
@@ -108,21 +108,18 @@ class Malta : public Platform
     calcPciConfigAddr(int bus, int dev, int func)
     {
         panic("Need implementation\n");
-        M5_DUMMY_RETURN
     }
 
     Addr
     calcPciIOAddr(Addr addr)
     {
         panic("Need implementation\n");
-        M5_DUMMY_RETURN
     }
 
     Addr
     calcPciMemAddr(Addr addr)
     {
         panic("Need implementation\n");
-        M5_DUMMY_RETURN
     }
 
     void serialize(CheckpointOut &cp) const override;

diff --git a/src/dev/sparc/t1000.cc b/src/dev/sparc/t1000.cc
index 36a1666ecd4dc65a2d398df2761538dd36ca6fa3..6cf716a055eaaaa85a0348f792104d3f54bbccd2 100644 (file)
--- a/src/dev/sparc/t1000.cc
+++ b/src/dev/sparc/t1000.cc
@@ -75,7 +75,6 @@ Addr
 T1000::pciToDma(Addr pciAddr) const
 {
     panic("Need implementation\n");
-    M5_DUMMY_RETURN
 }
 
 
@@ -83,21 +82,18 @@ Addr
 T1000::calcPciConfigAddr(int bus, int dev, int func)
 {
     panic("Need implementation\n");
-    M5_DUMMY_RETURN
 }
 
 Addr
 T1000::calcPciIOAddr(Addr addr)
 {
     panic("Need implementation\n");
-    M5_DUMMY_RETURN
 }
 
 Addr
 T1000::calcPciMemAddr(Addr addr)
 {
     panic("Need implementation\n");
-    M5_DUMMY_RETURN
 }
 
 T1000 *