Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/35217 )
Change subject: arch,base,cpu,dev: Get rid of the M5_DUMMY_RETURN macro.
......................................................................
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
---
M src/arch/arm/utility.cc
M src/arch/mips/utility.cc
M src/arch/sparc/utility.cc
M src/base/compiler.hh
M src/cpu/static_inst.cc
M src/dev/baddev.cc
M src/dev/mips/malta.hh
M src/dev/sparc/t1000.cc
8 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/src/arch/arm/utility.cc b/src/arch/arm/utility.cc
index a189c4a..4d866d0 100644
--- a/src/arch/arm/utility.cc
+++ b/src/arch/arm/utility.cc
@@ -56,13 +56,10 @@
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 7e797b5..930c36b 100644
--- a/src/arch/mips/utility.cc
+++ b/src/arch/mips/utility.cc
@@ -47,7 +47,6 @@
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 21fbf93..66fabd1 100644
--- a/src/arch/sparc/utility.cc
+++ b/src/arch/sparc/utility.cc
@@ -43,10 +43,7 @@
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 6ddf920..4562fa1 100644
--- 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 f21d41b..7c6b0bf 100644
--- a/src/cpu/static_inst.cc
+++ b/src/cpu/static_inst.cc
@@ -106,7 +106,6 @@
{
panic("StaticInst::branchTarget() called on instruction "
"that is not a PC-relative branch.");
- M5_DUMMY_RETURN;
}
TheISA::PCState
@@ -114,7 +113,6 @@
{
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 9e28d3b..48cdff3 100644
--- a/src/dev/baddev.cc
+++ b/src/dev/baddev.cc
@@ -49,14 +49,12 @@
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 d2bf584..d424daf 100644
--- a/src/dev/mips/malta.hh
+++ b/src/dev/mips/malta.hh
@@ -108,21 +108,18 @@
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 36a1666..6cf716a 100644
--- a/src/dev/sparc/t1000.cc
+++ b/src/dev/sparc/t1000.cc
@@ -75,7 +75,6 @@
T1000::pciToDma(Addr pciAddr) const
{
panic("Need implementation\n");
- M5_DUMMY_RETURN
}
@@ -83,21 +82,18 @@
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 *
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35217
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I37625eab72deeaede77f9347116b9fddd75febf7
Gerrit-Change-Number: 35217
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
