summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-10-06 21:46:04 -0400
committerAli Saidi <saidi@eecs.umich.edu>2006-10-06 21:46:04 -0400
commitc60c61b19efd4383c9c93014c0e6fbe99fecb8a0 (patch)
treeda9f9992c87f70dee50b56bdc4798e4447b1cad6 /src
parent48e89a9d1eb186cce8bc0fab76c28730896b491a (diff)
parentb7832555d57ef47740124c46e7b21f6d10b08f26 (diff)
downloadgem5-c60c61b19efd4383c9c93014c0e6fbe99fecb8a0.tar.xz
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem.head --HG-- extra : convert_revision : 326605820dce7641058eb0cdc0ddb2cc9602f67e
Diffstat (limited to 'src')
-rw-r--r--src/sim/system.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/sim/system.cc b/src/sim/system.cc
index ad70b9b03..11ae492b9 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -219,6 +219,8 @@ System::new_page()
{
Addr return_addr = page_ptr << LogVMPageSize;
++page_ptr;
+ if (return_addr >= physmem->size())
+ fatal("Out of memory, please increase size of physical memory.");
return return_addr;
}
#endif