Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/45238 )
Change subject: misc: Replace M5_UNREACHABLE with GEM5_UNREACHABLE.
......................................................................
misc: Replace M5_UNREACHABLE with GEM5_UNREACHABLE.
Change-Id: Id4cbdb8ae58c1077411e01579ac3a2d72b3b7465
---
M src/arch/arm/isa/formats/aarch64.isa
M src/arch/arm/isa/formats/data.isa
M src/arch/arm/isa/formats/fp.isa
M src/arch/arm/isa/formats/mem.isa
M src/arch/arm/isa/formats/mult.isa
M src/arch/arm/isa/formats/neon64.isa
M src/arch/arm/regs/misc.cc
M src/arch/isa_parser/isa_parser.py
M src/base/cprintf.cc
M src/dev/arm/gic_v3_distributor.cc
M src/dev/arm/gic_v3_redistributor.cc
11 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/src/arch/arm/isa/formats/aarch64.isa
b/src/arch/arm/isa/formats/aarch64.isa
index a4c7082..ad5238a 100644
--- a/src/arch/arm/isa/formats/aarch64.isa
+++ b/src/arch/arm/isa/formats/aarch64.isa
@@ -108,7 +108,7 @@
case 0x3:
return new SubXImmCc(machInst, rdzr, rnsp, imm);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
case 0x4:
@@ -152,7 +152,7 @@
case 0x3:
return new AndXImmCc(machInst, rdzr, rn, imm);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
case 0x5:
@@ -171,7 +171,7 @@
case 0x3:
return new Movk(machInst, rdzr, imm16, hw * 16);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
case 0x6:
@@ -187,7 +187,7 @@
case 0x3:
return new Unknown64(machInst);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x7:
{
@@ -520,7 +520,7 @@
}
break;
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
} else if (bits(machInst, 25) == 0x1) {
uint8_t opc = bits(machInst, 24, 21);
@@ -720,7 +720,7 @@
else
return new LDADDLA64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x1:
switch(size_ar){
@@ -781,7 +781,7 @@
case 0xf:
return new LDCLRLA64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x2:
switch(size_ar){
@@ -842,7 +842,7 @@
case 0xf:
return new LDEORLA64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x3:
switch(size_ar){
@@ -903,7 +903,7 @@
case 0xf:
return new LDSETLA64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x4:
switch(size_ar){
@@ -964,7 +964,7 @@
case 0xf:
return new LDSMAXLA64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x5:
switch(size_ar){
@@ -1025,7 +1025,7 @@
case 0xf:
return new LDSMINLA64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x6:
switch(size_ar){
@@ -1086,7 +1086,7 @@
case 0xf:
return new LDUMAXLA64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x7:
switch(size_ar){
@@ -1147,7 +1147,7 @@
case 0xf:
return new LDUMINLA64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
default:
return new Unknown64(machInst);
@@ -1190,7 +1190,7 @@
case 0x3:
return new STXRX64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x1:
switch (size) {
@@ -1203,7 +1203,7 @@
case 0x3:
return new STLXRX64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x2:
switch (size) {
@@ -1216,7 +1216,7 @@
case 0x3:
return new STXPX64(machInst, rs, rt, rt2, rnsp);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x3:
@@ -1230,7 +1230,7 @@
case 0x3:
return new STLXPX64(machInst, rs, rt, rt2, rnsp);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x4:
@@ -1244,7 +1244,7 @@
case 0x3:
return new LDXRX64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x5:
switch (size) {
@@ -1257,7 +1257,7 @@
case 0x3:
return new LDAXRX64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x6:
switch (size) {
@@ -1270,7 +1270,7 @@
case 0x3:
return new LDXPX64(machInst, rt, rt2, rnsp);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x7:
switch (size) {
@@ -1283,7 +1283,7 @@
case 0x3:
return new LDAXPX64(machInst, rt, rt2, rnsp);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x9:
switch (size) {
@@ -1296,7 +1296,7 @@
case 0x3:
return new STLRX64(machInst, rt, rnsp);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0xa:
switch (size) {
@@ -1309,7 +1309,7 @@
case 0x3:
return new CAS64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0xb:
switch (size) {
@@ -1322,7 +1322,7 @@
case 0x3:
return new CASL64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0xd:
switch (size) {
@@ -1335,7 +1335,7 @@
case 0x3:
return new LDARX64(machInst, rt, rnsp);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0xe:
switch (size) {
@@ -1348,7 +1348,7 @@
case 0x3:
return new CASA64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0xf:
switch (size) {
@@ -1361,7 +1361,7 @@
case 0x3:
return new CASAL64(machInst, rt, rnsp, rs);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
default:
return new Unknown64(machInst);
@@ -1543,7 +1543,7 @@
case 0x3:
return new LDAPRX64(machInst, rt, rnsp);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
} else {
return decodeAtomicArithOp(machInst);
@@ -1575,7 +1575,7 @@
return new LDRAB_PRE(machInst, rt,
makeSP(rn), imm10);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
case 0x2:
@@ -1902,12 +1902,12 @@
}
}
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
}
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
return new FailUnimplemented("Unhandled Case1", machInst);
}
@@ -1955,7 +1955,7 @@
case 0x7:
return new BicXSRegCc(machInst, rdzr, rn, rm, imm6, type);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
case 0x1:
@@ -1983,7 +1983,7 @@
case 0x3:
return new SubXSRegCc(machInst, rdzr, rn, rm, imm6,
type);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
} else {
if (bits(machInst, 23, 22) != 0 || bits(machInst, 12, 10)
0x4)
@@ -2008,7 +2008,7 @@
case 0x3:
return new SubXERegCc(machInst, rdzr, rnsp, rm, type,
imm3);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
}
@@ -2036,7 +2036,7 @@
case 0x3:
return new SbcXSRegCc(machInst, rdzr, rn, rm, 0, LSL);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
case 0x1:
@@ -2091,7 +2091,7 @@
case 0x3:
return new Csneg64(machInst, rdzr, rn, rm, cond);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
case 0x3:
@@ -2247,7 +2247,7 @@
}
}
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
case 0x3:
@@ -2289,7 +2289,7 @@
}
}
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
return new FailUnimplemented("Unhandled Case2", machInst);
}
@@ -2835,7 +2835,7 @@
return new Unknown64(machInst);
}
}
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
case 0x1:
{
if (bits(machInst, 31) ||
@@ -2941,10 +2941,10 @@
return new Unknown64(machInst);
}
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
}};
diff --git a/src/arch/arm/isa/formats/data.isa
b/src/arch/arm/isa/formats/data.isa
index 60d2db9..b107ed9 100644
--- a/src/arch/arm/isa/formats/data.isa
+++ b/src/arch/arm/isa/formats/data.isa
@@ -605,7 +605,7 @@
return new MovRegRegCc(machInst, rd,
INTREG_ZERO, rn, rm, ROR);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
} else if (bits(op2, 3) == 0) {
return new Unknown(machInst);
@@ -921,7 +921,7 @@
return new SubImmCc(machInst, rd, rn, imm3, true);
}
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x4:
if (machInst.itstateMask) {
@@ -944,7 +944,7 @@
return new SubImmCc(machInst, rd8, rd8, imm8, true);
}
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
'''
@@ -1049,7 +1049,7 @@
return new MvnRegCc(machInst, rdn, INTREG_ZERO, rm, 0,
LSL);
}
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
'''
@@ -1080,7 +1080,7 @@
COND_UC);
}
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
'''
@@ -1198,7 +1198,7 @@
case 0x3:
return new Uxtb(machInst, rd, 0, rm);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
case 0x1:
diff --git a/src/arch/arm/isa/formats/fp.isa
b/src/arch/arm/isa/formats/fp.isa
index 967f343..2ed5c26 100644
--- a/src/arch/arm/isa/formats/fp.isa
+++ b/src/arch/arm/isa/formats/fp.isa
@@ -483,7 +483,7 @@
return new VbifD<uint64_t>(machInst, vd, vn,
vm);
}
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
} else {
switch (size) {
@@ -526,7 +526,7 @@
machInst, vd, vn, vm);
}
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
}
@@ -702,7 +702,7 @@
case 0x3:
return new Unknown(machInst);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
} else {
switch (size) {
@@ -715,7 +715,7 @@
case 0x3:
return new SHA1SU0(machInst, vd, vn, vm);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
}
@@ -2093,7 +2093,7 @@
return new VLdmStm(machInst, rn, vd, single,
true, true, true, offset);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
case 0x2:
diff --git a/src/arch/arm/isa/formats/mem.isa
b/src/arch/arm/isa/formats/mem.isa
index 1212872..7976902 100644
--- a/src/arch/arm/isa/formats/mem.isa
+++ b/src/arch/arm/isa/formats/mem.isa
@@ -608,7 +608,7 @@
case 7:
return new %(imm_puw)s(machInst, RT, RN, true,
imm);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
'''
@@ -1074,7 +1074,7 @@
case 0x7:
return new %(ldrsh)s(machInst, rt, rn, true, 0, LSL, rm);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
'''
diff --git a/src/arch/arm/isa/formats/mult.isa
b/src/arch/arm/isa/formats/mult.isa
index 7c0b694..dc91da3 100644
--- a/src/arch/arm/isa/formats/mult.isa
+++ b/src/arch/arm/isa/formats/mult.isa
@@ -86,7 +86,7 @@
return new Smlal(machInst, ra, rd, rn, rm);
}
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
'''
@@ -113,7 +113,7 @@
case 0x3:
return new SmlattCc(machInst, rd, rn, rm, ra);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x1:
if (op) {
@@ -140,7 +140,7 @@
case 0x3:
return new Smlaltt(machInst, ra, rd, rn, rm);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x3:
switch (bits(machInst, 6, 5)) {
@@ -153,10 +153,10 @@
case 0x3:
return new Smultt(machInst, rd, rn, rm);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
'''
@@ -209,7 +209,7 @@
return new SmlattCc(machInst, rd, rn, rm, ra);
}
}
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
case 0x2:
if (ra == 0xf) {
if (bits(machInst, 4)) {
@@ -281,7 +281,7 @@
return new Usada8(machInst, rd, rn, rm, ra);
}
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
}
'''
diff --git a/src/arch/arm/isa/formats/neon64.isa
b/src/arch/arm/isa/formats/neon64.isa
index 835909a..1948a34 100644
--- a/src/arch/arm/isa/formats/neon64.isa
+++ b/src/arch/arm/isa/formats/neon64.isa
@@ -184,7 +184,7 @@
return new OrnDX<uint64_t>(machInst, vd, vn, vm);
}
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x04:
if (size == 0x3)
@@ -2242,7 +2242,7 @@
case 0x3:
return new Unknown64(machInst);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x1a:
if (size < 0x2)
@@ -2322,7 +2322,7 @@
case 0x3:
return new Unknown64(machInst);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x34:
switch (size) {
@@ -2335,7 +2335,7 @@
case 0x3:
return new Unknown64(machInst);
default:
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
case 0x36:
if (size != 0x1) {
diff --git a/src/arch/arm/regs/misc.cc b/src/arch/arm/regs/misc.cc
index 20b303c..433c5ec 100644
--- a/src/arch/arm/regs/misc.cc
+++ b/src/arch/arm/regs/misc.cc
@@ -2870,7 +2870,7 @@
// S3_<op1>_11_<Cm>_<op2>
return MISCREG_IMPDEF_UNIMPL;
}
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
case 12:
switch (op1) {
case 0:
diff --git a/src/arch/isa_parser/isa_parser.py
b/src/arch/isa_parser/isa_parser.py
index 1e94a20..bfe9c91 100755
--- a/src/arch/isa_parser/isa_parser.py
+++ b/src/arch/isa_parser/isa_parser.py
@@ -1257,7 +1257,7 @@
# just wrap the decoding code from the block as a case in the
# outer switch statement.
codeObj.wrap_decode_block('\n%s\n' % ''.join(case_list),
- 'M5_UNREACHABLE;\n')
+ 'GEM5_UNREACHABLE;\n')
codeObj.has_decode_default = (case_list == ['default:'])
t[0] = codeObj
diff --git a/src/base/cprintf.cc b/src/base/cprintf.cc
index 8e4e02d..24a2d00 100644
--- a/src/base/cprintf.cc
+++ b/src/base/cprintf.cc
@@ -238,7 +238,7 @@
break;
case '%':
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
break;
default:
diff --git a/src/dev/arm/gic_v3_distributor.cc
b/src/dev/arm/gic_v3_distributor.cc
index 27fbe9c..9cf54b6 100644
--- a/src/dev/arm/gic_v3_distributor.cc
+++ b/src/dev/arm/gic_v3_distributor.cc
@@ -1155,7 +1155,7 @@
}
}
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
void
diff --git a/src/dev/arm/gic_v3_redistributor.cc
b/src/dev/arm/gic_v3_redistributor.cc
index 39a32e3..da5137b 100644
--- a/src/dev/arm/gic_v3_redistributor.cc
+++ b/src/dev/arm/gic_v3_redistributor.cc
@@ -988,7 +988,7 @@
}
}
- M5_UNREACHABLE;
+ GEM5_UNREACHABLE;
}
void
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45238
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: Id4cbdb8ae58c1077411e01579ac3a2d72b3b7465
Gerrit-Change-Number: 45238
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.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
