summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorChun-Chen Hsu <chunchenhsu@google.com>2018-03-13 17:44:52 +0800
committerChun-Chen TK Hsu <chunchenhsu@google.com>2018-03-20 20:17:00 +0000
commitfe187de9bd1aa479ab6cd198522bfd118d0d50ec (patch)
treebeb10d2550241e5f88e1bd7e153fc7b54da6ef1f /src/arch
parent212649b01e90b28df6e1a66c1b98a944af5b05a9 (diff)
downloadgem5-fe187de9bd1aa479ab6cd198522bfd118d0d50ec.tar.xz
arch, arm: Fix implicit-fallthrough GCC warnings
GCC 7 generates spurious fallthrough warnings in nested switch blocks where the inner switch block return. There is already a GCC fix [1] submitted for review but, until it is merged into GCC trunk, GEM5 will not build with GCC 7 due to these fallthrough warnings. This patch silences the spurious fallthrough warnings by appending a M5_UNREACHABLE statement in the outer switch cases. Note there is another GEM5 patch [2] to fix other fallthrough warnings. [1] https://gcc.gnu.org/ml/gcc-patches/2018-02/msg01105.html [2] https://gem5-review.googlesource.com/c/public/gem5/+/8541 Change-Id: I97cd8bfa90a88e93cee60cf27a8c93611d11a242 Signed-off-by: Chun-Chen Hsu <chunchenhsu@google.com> Reviewed-on: https://gem5-review.googlesource.com/9101 Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Diffstat (limited to 'src/arch')
-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