Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/55689 )
Change subject: arch-x86: Get rid of the soft int Fault class.
......................................................................
arch-x86: Get rid of the soft int Fault class.
This was never instantiated, and not fully implemented.
Change-Id: I2011e49345e48e194ed9f1540446f0f5a699401d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/55689
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Gabe Black <gabe.bl...@gmail.com>
Maintainer: Gabe Black <gabe.bl...@gmail.com>
---
M src/arch/x86/faults.cc
M src/arch/x86/faults.hh
2 files changed, 16 insertions(+), 16 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/x86/faults.cc b/src/arch/x86/faults.cc
index 235f75a..2e9b2e5 100644
--- a/src/arch/x86/faults.cc
+++ b/src/arch/x86/faults.cc
@@ -71,8 +71,7 @@
HandyM5Reg m5reg = tc->readMiscRegNoEffect(MISCREG_M5_REG);
MicroPC entry;
if (m5reg.mode == LongMode) {
- entry = isSoft() ? extern_label_longModeSoftInterrupt :
- extern_label_longModeInterrupt;
+ entry = extern_label_longModeInterrupt;
} else {
if (m5reg.submode == RealMode)
entry = extern_label_realModeInterrupt;
@@ -88,9 +87,6 @@
panic("Legacy mode interrupts with error codes "
"aren't implemented.");
}
- // Software interrupts shouldn't have error codes. If one
- // does, there would need to be microcode to set it up.
- assert(!isSoft());
tc->setIntReg(INTREG_MICRO(15), errorCode);
}
pc.upc(romMicroPC(entry));
diff --git a/src/arch/x86/faults.hh b/src/arch/x86/faults.hh
index a8d19d9..a1ff1b0 100644
--- a/src/arch/x86/faults.hh
+++ b/src/arch/x86/faults.hh
@@ -70,7 +70,6 @@
const char *name() const override { return faultName; }
virtual bool isBenign() { return true; }
virtual const char *mnemonic() const { return mnem; }
- virtual bool isSoft() { return false; }
void invoke(ThreadContext *tc, const StaticInstPtr &inst=
nullStaticInstPtr) override;
@@ -369,16 +368,6 @@
nullStaticInstPtr) override;
};
-class SoftwareInterrupt : public X86Interrupt
-{
- public:
- SoftwareInterrupt(uint8_t _vector) :
- X86Interrupt("Software Interrupt", "#INTR", _vector)
- {}
-
- bool isSoft() override { return true; }
-};
-
} // namespace X86ISA
} // namespace gem5
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/55689
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: I2011e49345e48e194ed9f1540446f0f5a699401d
Gerrit-Change-Number: 55689
Gerrit-PatchSet: 13
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Bradford Beckmann <bradford.beckm...@gmail.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Matt Sinclair <mattdsincl...@gmail.com>
Gerrit-Reviewer: Matthew Poremba <matthew.pore...@amd.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
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
