diff options
| author | Jason Lowe-Power <jason@lowepower.com> | 2017-12-13 10:19:04 -0800 |
|---|---|---|
| committer | Jason Lowe-Power <jason@lowepower.com> | 2017-12-14 00:27:59 +0000 |
| commit | 5c41076bd7610d03431fd0dd89bd0fdc7f30d6bd (patch) | |
| tree | ee24cdf5ea368fb808d0b6029313a163c375898b /src/cpu/kvm | |
| parent | f07d5069d86e31ecf195664850f79fb00c445bd3 (diff) | |
| download | gem5-5c41076bd7610d03431fd0dd89bd0fdc7f30d6bd.tar.xz | |
misc: Updates for gcc7.2 for x86
GCC 7.2 is much stricter than previous GCC versions. The following changes
are needed:
* There is now a warning if there is an implicit fallthrough between two
case statments. C++17 adds the [[fallthrough]]; declaration. However,
to support non C++17 standards (i.e., C++11), we use M5_FALLTHROUGH.
M5_FALLTHROUGH checks for [[fallthrough]] compliant C++17 compiler and
if that doesn't exist, it defaults to nothing (no older compilers
generate warnings).
* The above resulted in a couple of bugs that were found. This is noted
in the review request on gerrit.
* throw() for dynamic exception specification is deprecated
* There were a couple of new uninitialized variable warnings
* Can no longer perform bitwise operations on a bool.
* Must now include <functional> for std::function
* Compiler bug for void* lambda. Changed to auto as work around. See
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82878
Change-Id: I5d4c782a4e133fa4cdb119e35d9aff68c6e2958e
Signed-off-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-on: https://gem5-review.googlesource.com/5802
Reviewed-by: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/cpu/kvm')
| -rw-r--r-- | src/cpu/kvm/base.cc | 2 | ||||
| -rw-r--r-- | src/cpu/kvm/x86_cpu.cc | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/cpu/kvm/base.cc b/src/cpu/kvm/base.cc index ab83e5d2f..3df0fddda 100644 --- a/src/cpu/kvm/base.cc +++ b/src/cpu/kvm/base.cc @@ -383,7 +383,7 @@ BaseKvmCPU::drain() deschedule(tickEvent); _status = Idle; - /** FALLTHROUGH */ + M5_FALLTHROUGH; case Idle: // Idle, no need to drain assert(!tickEvent.scheduled()); diff --git a/src/cpu/kvm/x86_cpu.cc b/src/cpu/kvm/x86_cpu.cc index 467e1baaf..1a23b6717 100644 --- a/src/cpu/kvm/x86_cpu.cc +++ b/src/cpu/kvm/x86_cpu.cc @@ -396,6 +396,7 @@ checkSeg(const char *name, const int idx, const struct kvm_segment &seg, case MISCREG_ES: if (seg.unusable) break; + M5_FALLTHROUGH; case MISCREG_CS: if (seg.base & 0xffffffff00000000ULL) warn("Illegal %s base: 0x%x\n", name, seg.base); @@ -433,7 +434,7 @@ checkSeg(const char *name, const int idx, const struct kvm_segment &seg, case 3: if (sregs.cs.type == 3 && seg.dpl != 0) warn("CS type is 3, but SS DPL is != 0.\n"); - /* FALLTHROUGH */ + M5_FALLTHROUGH; case 7: if (!(sregs.cr0 & 1) && seg.dpl != 0) warn("SS DPL is %i, but CR0 PE is 0\n", seg.dpl); @@ -477,6 +478,7 @@ checkSeg(const char *name, const int idx, const struct kvm_segment &seg, case MISCREG_GS: if (seg.unusable) break; + M5_FALLTHROUGH; case MISCREG_CS: if (!seg.s) warn("%s: S flag not set\n", name); @@ -485,6 +487,7 @@ checkSeg(const char *name, const int idx, const struct kvm_segment &seg, case MISCREG_TSL: if (seg.unusable) break; + M5_FALLTHROUGH; case MISCREG_TR: if (seg.s) warn("%s: S flag is set\n", name); @@ -500,6 +503,7 @@ checkSeg(const char *name, const int idx, const struct kvm_segment &seg, case MISCREG_TSL: if (seg.unusable) break; + M5_FALLTHROUGH; case MISCREG_TR: case MISCREG_CS: if (!seg.present) |