summaryrefslogtreecommitdiff
path: root/dev/sinic.cc
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-02-28 15:16:24 -0500
committerKevin Lim <ktlim@umich.edu>2006-02-28 15:16:24 -0500
commit34da58a698e4119876f04d13c337e9974970f49a (patch)
tree6dc9940bf89b04ec973ff4b433a015e13cb7f017 /dev/sinic.cc
parent3a362d04b7aed0fa728af9373bad175a096a7de8 (diff)
parent96fd6b5c4039c98a1b536ec184126ad75e7d2539 (diff)
downloadgem5-34da58a698e4119876f04d13c337e9974970f49a.tar.xz
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/clean/m5-clean arch/alpha/ev5.cc: cpu/o3/regfile.hh: Hand merge. --HG-- rename : arch/alpha/alpha_memory.cc => arch/alpha/tlb.cc extra : convert_revision : c941dd2198851398820b38a66471372ed8454891
Diffstat (limited to 'dev/sinic.cc')
-rw-r--r--dev/sinic.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/sinic.cc b/dev/sinic.cc
index 31d651249..34b4213e0 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;