summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-10-07 14:49:10 -0400
committerAli Saidi <saidi@eecs.umich.edu>2006-10-07 14:49:10 -0400
commitabc27ae6911cb9994cc1e718cced6ea291dca32d (patch)
tree29b8d94476b64ee540257d09fae8e2936606ddc7
parent413a5379b86729d298d666f9ff2b51d2ed1d4463 (diff)
parentc60c61b19efd4383c9c93014c0e6fbe99fecb8a0 (diff)
downloadgem5-abc27ae6911cb9994cc1e718cced6ea291dca32d.tar.xz
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem.head --HG-- extra : convert_revision : acab791328d16daace6dfbdc667067ddc68fb6ca
-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