derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Interrupts: Make the IO APIC go get the local APICs.

Browse Source 
This is so they don't have to declare themselves to the IO APIC and don't have
to have a pointer to the platform object.
This commit is contained in:
Gabe Black
2011-10-09 04:44:02 -07:00
parent f338d60930
commit 48b40cff65
5 changed files with 7 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/dev/x86/i82094aa.cc
View File

@@ -30,11 +30,9 @@
#include "config/full_system.hh"
#if FULL_SYSTEM
#include "arch/x86/interrupts.hh"
#endif
#include "arch/x86/intmessage.hh"
#include "cpu/base.hh"
#include "debug/I82094AA.hh"
#include "dev/x86/i82094aa.hh"
#include "dev/x86/i8259.hh"
@@ -172,7 +170,6 @@ X86ISA::I82094AA::signalInterrupt(int line)
DPRINTF(I82094AA, "Entry was masked.\n");
return;
} else {
#if FULL_SYSTEM //XXX No interrupt controller in SE mode.
TriggerIntMessage message = 0;
message.destination = entry.dest;
if (entry.deliveryMode == DeliveryMode::ExtInt) {
@@ -202,13 +199,11 @@ X86ISA::I82094AA::signalInterrupt(int line)
}
} else {
for (int i = 0; i < numContexts; i++) {
std::map<int, Interrupts *>::iterator localApicIt =
localApics.find(i);
assert(localApicIt != localApics.end());
Interrupts *localApic = localApicIt->second;
Interrupts *localApic = sys->getThreadContext(i)->
getCpuPtr()->getInterruptController();
if ((localApic->readReg(APIC_LOGICAL_DESTINATION) >> 24) &
message.destination) {
apics.push_back(localApicIt->first);
apics.push_back(localApic->getInitialApicId());
}
}
if (message.deliveryMode == DeliveryMode::LowestPriority &&
@@ -231,7 +226,6 @@ X86ISA::I82094AA::signalInterrupt(int line)
}
intPort->sendMessage(apics, message,
sys->getMemoryMode() == Enums::timing);
#endif
}
}
@@ -251,13 +245,6 @@ X86ISA::I82094AA::lowerInterruptPin(int number)
pinStates[number] = false;
}
void
X86ISA::I82094AA::registerLocalApic(int initialId, Interrupts *localApic)
{
assert(localApic);
localApics[initialId] = localApic;
}
void
X86ISA::I82094AA::serialize(std::ostream &os)
{

3
src/dev/x86/i82094aa.hh
View File

@@ -70,8 +70,6 @@ class I82094AA : public PioDevice, public IntDev
I8259 * extIntPic;
std::map<int, Interrupts *> localApics;
uint8_t regSel;
uint8_t initialApicId;
uint8_t id;
@@ -131,7 +129,6 @@ class I82094AA : public PioDevice, public IntDev
void signalInterrupt(int line);
void raiseInterruptPin(int number);
void lowerInterruptPin(int number);
void registerLocalApic(int id, Interrupts *localApic);
virtual void serialize(std::ostream &os);
virtual void unserialize(Checkpoint *cp, const std::string &section);