diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-06-29 21:38:16 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-06-29 21:38:16 -0400 |
| commit | 0fbecab797ffe7fc68e3a9af9fd0a21df37ec635 (patch) | |
| tree | 4983720f62cd4fc1ee57690678228e5aca75d531 /src/sim/process.cc | |
| parent | ad6788493c09aec456a1136f126abde7000696ab (diff) | |
| parent | de90be348239a0a58ebb659dfc6a2f2fe5909292 (diff) | |
| download | gem5-0fbecab797ffe7fc68e3a9af9fd0a21df37ec635.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
--HG--
extra : convert_revision : 0756f7f1f63fae472e0ef1d20e9eb38e56de78c8
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 |