diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-06-26 17:50:58 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-06-26 17:50:58 -0400 |
| commit | a23f15641e44e55bbc4ff7350e5a7f812a941085 (patch) | |
| tree | 4ab159a962aeb86b42bc1b0d1fbb95c4203e31a1 /src/sim/process.cc | |
| parent | 63bdaeedfae71aa9eab4716a884fad9d7c4ece54 (diff) | |
| parent | 60454042aaf1c5b3380536c4a1d2255d8f648d7d (diff) | |
| download | gem5-a23f15641e44e55bbc4ff7350e5a7f812a941085.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : 39c99c8acadd43f3ec42ae7550289a5075d910e4
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 |