diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2008-10-12 09:09:56 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2008-10-12 09:09:56 -0700 |
| commit | d9f9c967fbe651e09d444e460a9b1c5a450b1cd2 (patch) | |
| tree | ba705f0a9f18e5c96fbec3b4f3691761235be7e2 /src/arch/x86/mmaped_ipr.hh | |
| parent | c4f1cc3b482311f878be44259125c9a5b90c0569 (diff) | |
| download | gem5-d9f9c967fbe651e09d444e460a9b1c5a450b1cd2.tar.xz | |
Turn Interrupts objects into SimObjects. Also, move local APIC state into x86's Interrupts object.
Diffstat (limited to 'src/arch/x86/mmaped_ipr.hh')
| -rw-r--r-- | src/arch/x86/mmaped_ipr.hh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/arch/x86/mmaped_ipr.hh b/src/arch/x86/mmaped_ipr.hh index cf3eba5e9..67a0b239e 100644 --- a/src/arch/x86/mmaped_ipr.hh +++ b/src/arch/x86/mmaped_ipr.hh @@ -96,7 +96,12 @@ namespace X86ISA #else Addr offset = pkt->getAddr() & mask(3); MiscRegIndex index = (MiscRegIndex)(pkt->getAddr() / sizeof(MiscReg)); - MiscReg data = htog(xc->readMiscRegNoEffect(index)); + MiscReg data; + if (isApicReg(index)) { + data = htog(xc->readMiscReg(index)); + } else { + data = htog(xc->readMiscRegNoEffect(index)); + } // Make sure we don't trot off the end of data. assert(offset + pkt->getSize() <= sizeof(MiscReg)); pkt->writeData(((uint8_t *)&data) + offset); |