summaryrefslogtreecommitdiff
path: root/src/arch/x86/mmapped_ipr.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/x86/mmapped_ipr.hh')
-rw-r--r--src/arch/x86/mmapped_ipr.hh13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/arch/x86/mmapped_ipr.hh b/src/arch/x86/mmapped_ipr.hh
index bd24d33da..93c16d33d 100644
--- a/src/arch/x86/mmapped_ipr.hh
+++ b/src/arch/x86/mmapped_ipr.hh
@@ -62,10 +62,10 @@ namespace X86ISA
} else {
Addr offset = pkt->getAddr() & mask(3);
MiscRegIndex index = (MiscRegIndex)(
- pkt->getAddr() / sizeof(MiscReg));
- MiscReg data = htog(xc->readMiscReg(index));
+ pkt->getAddr() / sizeof(RegVal));
+ RegVal data = htog(xc->readMiscReg(index));
// Make sure we don't trot off the end of data.
- assert(offset + pkt->getSize() <= sizeof(MiscReg));
+ assert(offset + pkt->getSize() <= sizeof(RegVal));
pkt->setData(((uint8_t *)&data) + offset);
return Cycles(1);
}
@@ -79,11 +79,10 @@ namespace X86ISA
} else {
Addr offset = pkt->getAddr() & mask(3);
MiscRegIndex index = (MiscRegIndex)(
- pkt->getAddr() / sizeof(MiscReg));
- MiscReg data;
- data = htog(xc->readMiscRegNoEffect(index));
+ pkt->getAddr() / sizeof(RegVal));
+ RegVal data = htog(xc->readMiscRegNoEffect(index));
// Make sure we don't trot off the end of data.
- assert(offset + pkt->getSize() <= sizeof(MiscReg));
+ assert(offset + pkt->getSize() <= sizeof(RegVal));
pkt->writeData(((uint8_t *)&data) + offset);
xc->setMiscReg(index, gtoh(data));
return Cycles(1);