From acebd9bf917df996d6e94f16d8ca7b45f4c200de Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 2 Feb 2012 23:54:25 -0800 Subject: [PATCH] System: Fix the check which detects running out of physical memory. The code that checks whether pages allocated by allocPhysPages only checks that the first page fits into physical memory, not that all of them do. This change makes the code check the last page which should work properly. This function used to only allocate one page at a time, so the first page and last page used to be the same thing. --- src/sim/system.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sim/system.cc b/src/sim/system.cc index 83610a102..47791beaa 100644 --- a/src/sim/system.cc +++ b/src/sim/system.cc @@ -296,7 +296,7 @@ System::allocPhysPages(int npages) { Addr return_addr = pagePtr << LogVMPageSize; pagePtr += npages; - if (return_addr >= physmem->size()) + if (return_addr + npages - 1 >= physmem->size()) fatal("Out of memory, please increase size of physical memory."); return return_addr; }