summaryrefslogtreecommitdiff
path: root/src/arch/x86/miscregfile.hh
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2008-10-12 09:09:56 -0700
committerGabe Black <gblack@eecs.umich.edu>2008-10-12 09:09:56 -0700
commitd9f9c967fbe651e09d444e460a9b1c5a450b1cd2 (patch)
treeba705f0a9f18e5c96fbec3b4f3691761235be7e2 /src/arch/x86/miscregfile.hh
parentc4f1cc3b482311f878be44259125c9a5b90c0569 (diff)
downloadgem5-d9f9c967fbe651e09d444e460a9b1c5a450b1cd2.tar.xz
Turn Interrupts objects into SimObjects. Also, move local APIC state into x86's Interrupts object.
Diffstat (limited to 'src/arch/x86/miscregfile.hh')
-rw-r--r--src/arch/x86/miscregfile.hh21
1 files changed, 4 insertions, 17 deletions
diff --git a/src/arch/x86/miscregfile.hh b/src/arch/x86/miscregfile.hh
index 21caf3aa1..e59b8d3b1 100644
--- a/src/arch/x86/miscregfile.hh
+++ b/src/arch/x86/miscregfile.hh
@@ -91,7 +91,6 @@
#include "arch/x86/faults.hh"
#include "arch/x86/miscregs.hh"
#include "arch/x86/types.hh"
-#include "sim/eventq.hh"
#include "sim/host.hh"
#include <string>
@@ -112,18 +111,6 @@ namespace X86ISA
protected:
MiscReg regVal[NumMiscRegs];
- class ApicTimerEvent : public Event
- {
- public:
- void
- process()
- {
- warn("Local APIC timer event doesn't do anything!\n");
- }
- };
-
- ApicTimerEvent apicTimerEvent;
-
public:
void clear();
@@ -132,13 +119,13 @@ namespace X86ISA
clear();
}
- MiscReg readRegNoEffect(int miscReg);
+ MiscReg readRegNoEffect(MiscRegIndex miscReg);
- MiscReg readReg(int miscReg, ThreadContext *tc);
+ MiscReg readReg(MiscRegIndex miscReg, ThreadContext *tc);
- void setRegNoEffect(int miscReg, const MiscReg &val);
+ void setRegNoEffect(MiscRegIndex miscReg, const MiscReg &val);
- void setReg(int miscReg,
+ void setReg(MiscRegIndex miscReg,
const MiscReg &val, ThreadContext *tc);
void serialize(std::ostream & os);