summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/arch/arm/isa/formats/aarch64.isa3
-rwxr-xr-xsrc/arch/isa_parser.py6
2 files changed, 7 insertions, 2 deletions
diff --git a/src/arch/arm/isa/formats/aarch64.isa b/src/arch/arm/isa/formats/aarch64.isa
index 1b9a86cad..7752ba08f 100644
--- a/src/arch/arm/isa/formats/aarch64.isa
+++ b/src/arch/arm/isa/formats/aarch64.isa
@@ -1897,6 +1897,7 @@ namespace Aarch64
return new Unknown64(machInst);
}
}
+ M5_UNREACHABLE;
case 0x1:
{
if (bits(machInst, 31) ||
@@ -2005,7 +2006,7 @@ namespace Aarch64
M5_UNREACHABLE;
}
}
- return new FailUnimplemented("Unhandled Case4", machInst);
+ M5_UNREACHABLE;
}
}
}};
diff --git a/src/arch/isa_parser.py b/src/arch/isa_parser.py
index 681734985..a65149fe0 100755
--- a/src/arch/isa_parser.py
+++ b/src/arch/isa_parser.py
@@ -1565,6 +1565,9 @@ class ISAParser(Grammar):
# decoder method - cannot be split
file = 'decoder.cc'
with self.open(file) as f:
+ fn = 'base/compiler.hh'
+ f.write('#include "%s"\n' % fn)
+
fn = 'decoder-g.cc.inc'
assert(fn in self.files)
f.write('#include "%s"\n' % fn)
@@ -2206,7 +2209,8 @@ StaticInstPtr
codeObj = t[3]
# 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))
+ codeObj.wrap_decode_block('\n%s\n' % ''.join(case_list),
+ 'M5_UNREACHABLE;\n')
codeObj.has_decode_default = (case_list == ['default:'])
t[0] = codeObj