73c73
< stack_base = 0xbf000000L;
---
> memState->stackBase = 0xbf000000L;
76c76
< next_thread_stack_base = stack_base - (8 * 1024 * 1024);
---
> memState->nextThreadStackBase = memState->stackBase - (8 * 1024 * 1024);
79,80c79,81
< brk_point = objFile->dataBase() + objFile->dataSize() + objFile->bssSize();
< brk_point = roundUp(brk_point, PageBytes);
---
> memState->brkPoint = objFile->dataBase() + objFile->dataSize() +
> objFile->bssSize();
> memState->brkPoint = roundUp(memState->brkPoint, PageBytes);
83c84
< mmap_end = 0x40000000L;
---
> memState->mmapEnd = 0x40000000L;
90c91
< stack_base = 0x7fffff0000L;
---
> memState->stackBase = 0x7fffff0000L;
93c94
< next_thread_stack_base = stack_base - (8 * 1024 * 1024);
---
> memState->nextThreadStackBase = memState->stackBase - (8 * 1024 * 1024);
96,97c97,99
< brk_point = objFile->dataBase() + objFile->dataSize() + objFile->bssSize();
< brk_point = roundUp(brk_point, PageBytes);
---
> memState->brkPoint = objFile->dataBase() + objFile->dataSize() +
> objFile->bssSize();
> memState->brkPoint = roundUp(memState->brkPoint, PageBytes);
100c102
< mmap_end = 0x4000000000L;
---
> memState->mmapEnd = 0x4000000000L;
303,305c305,307
< stack_min = stack_base - space_needed;
< stack_min = roundDown(stack_min, align);
< stack_size = stack_base - stack_min;
---
> memState->stackMin = memState->stackBase - space_needed;
> memState->stackMin = roundDown(memState->stackMin, align);
> memState->stackSize = memState->stackBase - memState->stackMin;
308c310,311
< allocateMem(roundDown(stack_min, pageSize), roundUp(stack_size, pageSize));
---
> allocateMem(roundDown(memState->stackMin, pageSize),
> roundUp(memState->stackSize, pageSize));
311c314
< IntType sentry_base = stack_base - sentry_size;
---
> IntType sentry_base = memState->stackBase - sentry_size;
332c335
< DPRINTF(Stack, "0x%x - stack min\n", stack_min);
---
> DPRINTF(Stack, "0x%x - stack min\n", memState->stackMin);
378c381
< tc->setIntReg(spIndex, stack_min);
---
> tc->setIntReg(spIndex, memState->stackMin);
404,405c407,408
< //Align the "stack_min" to a page boundary.
< stack_min = roundDown(stack_min, pageSize);
---
> //Align the "stackMin" to a page boundary.
> memState->stackMin = roundDown(memState->stackMin, pageSize);