56c56
< stack_base = 0x7FFFFFFF;
---
> memState->stackBase = 0x7FFFFFFF;
59c59
< next_thread_stack_base = stack_base - (8 * 1024 * 1024);
---
> memState->nextThreadStackBase = memState->stackBase - (8 * 1024 * 1024);
62,63c62,64
< 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);
66c67
< mmap_end = brk_point + 0x40000000L;
---
> memState->mmapEnd = memState->brkPoint + 0x40000000L;
143c144
< stack_min = stack_base - space_needed;
---
> memState->stackMin = memState->stackBase - space_needed;
145,146c146,147
< stack_min = roundDown(stack_min, pageSize);
< stack_size = stack_base - stack_min;
---
> memState->stackMin = roundDown(memState->stackMin, pageSize);
> memState->stackSize = memState->stackBase - memState->stackMin;
148c149
< allocateMem(stack_min, roundUp(stack_size, pageSize));
---
> allocateMem(memState->stackMin, roundUp(memState->stackSize, pageSize));
151c152
< IntType argv_array_base = stack_min + intSize; // room for argc
---
> IntType argv_array_base = memState->stackMin + intSize; // room for argc
162c163
< initVirtMem.writeBlob(stack_min, (uint8_t*)&argc, intSize);
---
> initVirtMem.writeBlob(memState->stackMin, (uint8_t*)&argc, intSize);
187c188
< tc->setIntReg(StackPointerReg, stack_min);
---
> tc->setIntReg(StackPointerReg, memState->stackMin);