summaryrefslogtreecommitdiff
path: root/src/sim/system.cc
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2011-10-28 13:04:33 -0500
committerNilay Vaish <nilay@cs.wisc.edu>2011-10-28 13:04:33 -0500
commit706323fa21de674d8064c95a3c0036f0342430ee (patch)
tree40bcf3249c0d9d9b21a70f65f0e56ca9020017f7 /src/sim/system.cc
parentcbaebb3b5ebe709689f481ad395034335bea2152 (diff)
parent6f9d294e8685f49d91af48065736ac1d67e53718 (diff)
downloadgem5-706323fa21de674d8064c95a3c0036f0342430ee.tar.xz
Merged with recent changes.
Diffstat (limited to 'src/sim/system.cc')
-rw-r--r--src/sim/system.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sim/system.cc b/src/sim/system.cc
index 81a8a0574..c58830c10 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -275,10 +275,10 @@ System::replaceThreadContext(ThreadContext *tc, int context_id)
#if !FULL_SYSTEM
Addr
-System::new_page()
+System::allocPhysPages(int npages)
{
Addr return_addr = pagePtr << LogVMPageSize;
- ++pagePtr;
+ pagePtr += npages;
if (return_addr >= physmem->size())
fatal("Out of memory, please increase size of physical memory.");
return return_addr;