summaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-02-27 12:09:08 -0500
committerKevin Lim <ktlim@umich.edu>2006-02-27 12:09:08 -0500
commit96fd6b5c4039c98a1b536ec184126ad75e7d2539 (patch)
treef48350603bf2d02cd1ea32bbe0012624c6a82a6f /dev
parent29f50d934549f10b073a5492bd0d441d71534ace (diff)
parent70b35bab5778799805fe9b6040b23eb1885dbfc3 (diff)
downloadgem5-96fd6b5c4039c98a1b536ec184126ad75e7d2539.tar.xz
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/clean/m5-clean --HG-- extra : convert_revision : 97c345f0715a347ce34f9cabd994485f30f2e171
Diffstat (limited to 'dev')
-rw-r--r--dev/sinic.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/sinic.cc b/dev/sinic.cc
index a9363954b..1b950c191 100644
--- a/dev/sinic.cc
+++ b/dev/sinic.cc
@@ -376,7 +376,7 @@ Device::read(MemReqPtr &req, uint8_t *data)
Fault
Device::readBar0(MemReqPtr &req, Addr daddr, uint8_t *data)
{
- int cpu = (req->xc->regs.ipr[TheISA::IPR_PALtemp16] >> 8) & 0xff;
+ int cpu = (req->xc->readMiscReg(TheISA::IPR_PALtemp16) >> 8) & 0xff;
Addr index = daddr >> Regs::VirtualShift;
Addr raddr = daddr & Regs::VirtualMask;
@@ -472,7 +472,7 @@ Device::write(MemReqPtr &req, const uint8_t *data)
Fault
Device::writeBar0(MemReqPtr &req, Addr daddr, const uint8_t *data)
{
- int cpu = (req->xc->regs.ipr[TheISA::IPR_PALtemp16] >> 8) & 0xff;
+ int cpu = (req->xc->readMiscReg(TheISA::IPR_PALtemp16) >> 8) & 0xff;
Addr index = daddr >> Regs::VirtualShift;
Addr raddr = daddr & Regs::VirtualMask;