summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-10-07 23:35:32 -0400
committerKevin Lim <ktlim@umich.edu>2006-10-07 23:35:32 -0400
commitc0e53b6d4c19bffc2ae9d960f5fffd7510a6ec42 (patch)
tree3f7c4ca1587427acbc27c9093296e42597dfe10b /src
parent3afc69df7753c33822d822012261603eb301b04e (diff)
parentabc27ae6911cb9994cc1e718cced6ea291dca32d (diff)
downloadgem5-c0e53b6d4c19bffc2ae9d960f5fffd7510a6ec42.tar.xz
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem --HG-- extra : convert_revision : 0309a453c0d65579cfa022888d1a2ab4f0171a9f
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