diff options
author | Nilay Vaish <nilay@cs.wisc.edu> | 2011-10-28 13:04:33 -0500 |
---|---|---|
committer | Nilay Vaish <nilay@cs.wisc.edu> | 2011-10-28 13:04:33 -0500 |
commit | 706323fa21de674d8064c95a3c0036f0342430ee (patch) | |
tree | 40bcf3249c0d9d9b21a70f65f0e56ca9020017f7 /src/sim/system.cc | |
parent | cbaebb3b5ebe709689f481ad395034335bea2152 (diff) | |
parent | 6f9d294e8685f49d91af48065736ac1d67e53718 (diff) | |
download | gem5-706323fa21de674d8064c95a3c0036f0342430ee.tar.xz |
Merged with recent changes.
Diffstat (limited to 'src/sim/system.cc')
-rw-r--r-- | src/sim/system.cc | 4 |
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; |