diff options
Diffstat (limited to 'src/cpu')
-rw-r--r-- | src/cpu/kvm/base.cc | 2 | ||||
-rw-r--r-- | src/cpu/kvm/x86_cpu.cc | 6 | ||||
-rw-r--r-- | src/cpu/minor/dyn_inst.cc | 1 |
3 files changed, 7 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) diff --git a/src/cpu/minor/dyn_inst.cc b/src/cpu/minor/dyn_inst.cc index 756b214bd..353163758 100644 --- a/src/cpu/minor/dyn_inst.cc +++ b/src/cpu/minor/dyn_inst.cc @@ -169,6 +169,7 @@ printRegName(std::ostream &os, const RegId& reg) break; case CCRegClass: os << 'c' << static_cast<unsigned int>(reg.index()); + break; default: panic("Unknown register class: %d", (int)reg.classValue()); } |