summaryrefslogtreecommitdiff
path: root/src/mem
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-07-10 15:41:35 -0400
committerKevin Lim <ktlim@umich.edu>2006-07-10 15:41:35 -0400
commit5dbd7a3f766dcf7bbfb29ede45655c01994b1425 (patch)
treed2c8358ef670eea00b4bb9e128f6da6de68db693 /src/mem
parentf60d8217e3c9fd7c4ea75ab0c89dbbd63db75ffd (diff)
parent5584e2b26eccb5d2bf445b8b0b2040449d0b0a77 (diff)
downloadgem5-5dbd7a3f766dcf7bbfb29ede45655c01994b1425.tar.xz
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge --HG-- extra : convert_revision : 0e4c7684879b8552908e0b64a00b4824de807244
Diffstat (limited to 'src/mem')
-rw-r--r--src/mem/packet.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/packet.hh b/src/mem/packet.hh
index 1325dfc5b..534db0077 100644
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@ -247,7 +247,7 @@ class Packet
Addr getAddr() const { assert(addrSizeValid); return addr; }
int getSize() const { assert(addrSizeValid); return size; }
- Addr getOffset(int blkSize) const { return req->getPaddr() & (Addr)(blkSize - 1); }
+ Addr getOffset(int blkSize) const { return addr & (Addr)(blkSize - 1); }
void addrOverride(Addr newAddr) { assert(addrSizeValid); addr = newAddr; }
void cmdOverride(Command newCmd) { cmd = newCmd; }