diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-06-29 19:45:53 -0400 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-06-29 19:45:53 -0400 |
commit | 77d0c0e28ac842e06e20a7861daf8a791680d797 (patch) | |
tree | 24a73d9f4da4f69cef702b7f8b06f03e61cff355 /src/sim/process.cc | |
parent | 2416ba606aed95098ce8e43f813fa57dd9f91974 (diff) | |
parent | 833d80db2d3119d85038b77360f8e25222b1e3f2 (diff) | |
download | gem5-77d0c0e28ac842e06e20a7861daf8a791680d797.tar.xz |
Merge ktlim@zamp:/z/ktlim2/clean/newmem-merge
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem
--HG--
extra : convert_revision : 9e21cdbb4fce8d9eb5f92780b720c42c44b6dd57
Diffstat (limited to 'src/sim/process.cc')
-rw-r--r-- | src/sim/process.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/sim/process.cc b/src/sim/process.cc index 5080c3ac1..9cdc5b9f5 100644 --- a/src/sim/process.cc +++ b/src/sim/process.cc @@ -326,11 +326,10 @@ LiveProcess::argsInit(int intSize, int pageSize) // set bottom of stack stack_min = stack_base - space_needed; // align it - stack_min &= ~(intSize-1); + stack_min = roundDown(stack_min, pageSize); stack_size = stack_base - stack_min; // map memory - pTable->allocate(roundDown(stack_min, pageSize), - roundUp(stack_size, pageSize)); + pTable->allocate(stack_min, roundUp(stack_size, pageSize)); // map out initial stack contents Addr argv_array_base = stack_min + intSize; // room for argc |