summaryrefslogtreecommitdiff
path: root/src/cpu/base.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/cpu/base.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/cpu/base.hh')
-rw-r--r--src/cpu/base.hh6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpu/base.hh b/src/cpu/base.hh
index c99efa834..a12c98ab0 100644
--- a/src/cpu/base.hh
+++ b/src/cpu/base.hh
@@ -107,13 +107,13 @@ class BaseCPU : public MemObject
protected:
// uint64_t interrupts[TheISA::NumInterruptLevels];
// uint64_t intstatus;
- TheISA::Interrupts interrupts;
+ TheISA::Interrupts * interrupts;
public:
TheISA::Interrupts *
getInterruptController()
{
- return &interrupts;
+ return interrupts;
}
virtual void post_interrupt(int int_num, int index);
@@ -121,7 +121,7 @@ class BaseCPU : public MemObject
virtual void clear_interrupts();
bool check_interrupts(ThreadContext * tc) const
- { return interrupts.check_interrupts(tc); }
+ { return interrupts->check_interrupts(tc); }
class ProfileEvent : public Event
{