summaryrefslogtreecommitdiff
path: root/src/mem
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-06-29 19:45:53 -0400
committerKevin Lim <ktlim@umich.edu>2006-06-29 19:45:53 -0400
commit77d0c0e28ac842e06e20a7861daf8a791680d797 (patch)
tree24a73d9f4da4f69cef702b7f8b06f03e61cff355 /src/mem
parent2416ba606aed95098ce8e43f813fa57dd9f91974 (diff)
parent833d80db2d3119d85038b77360f8e25222b1e3f2 (diff)
downloadgem5-77d0c0e28ac842e06e20a7861daf8a791680d797.tar.xz
Merge ktlim@zamp:/z/ktlim2/clean/newmem-merge
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem --HG-- extra : convert_revision : 9e21cdbb4fce8d9eb5f92780b720c42c44b6dd57
Diffstat (limited to 'src/mem')
-rw-r--r--src/mem/page_table.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/page_table.cc b/src/mem/page_table.cc
index b5cecc7da..7daf31900 100644
--- a/src/mem/page_table.cc
+++ b/src/mem/page_table.cc
@@ -130,7 +130,7 @@ PageTable::translate(RequestPtr &req)
assert(pageAlign(req->getVaddr() + req->getSize() - 1)
== pageAlign(req->getVaddr()));
if (!translate(req->getVaddr(), paddr)) {
- return genMachineCheckFault();
+ return genPageTableFault(req->getVaddr());
}
req->setPaddr(paddr);
return page_check(req->getPaddr(), req->getSize());