53,54c53,55
< 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);
58c59
< stack_base = objFile->textBase() - (409600+4096);
---
> memState->stackBase = objFile->textBase() - (409600+4096);
62c63
< mmap_end = 0x10000;
---
> memState->mmapEnd = 0x10000;
65c66
< next_thread_stack_base = stack_base - (8 * 1024 * 1024);
---
> memState->nextThreadStackBase = memState->stackBase - (8 * 1024 * 1024);
133c134
< stack_min = stack_base - space_needed;
---
> memState->stackMin = memState->stackBase - space_needed;
135,136c136,137
< stack_min = roundDown(stack_min, pageSize);
< stack_size = stack_base - stack_min;
---
> memState->stackMin = roundDown(memState->stackMin, pageSize);
> memState->stackSize = memState->stackBase - memState->stackMin;
138c139
< allocateMem(stack_min, roundUp(stack_size, pageSize));
---
> allocateMem(memState->stackMin, roundUp(memState->stackSize, pageSize));
141c142
< Addr argv_array_base = stack_min + intSize; // room for argc
---
> Addr argv_array_base = memState->stackMin + intSize; // room for argc
156c157
< initVirtMem.writeBlob(stack_min, (uint8_t*)&argc, intSize);
---
> initVirtMem.writeBlob(memState->stackMin, (uint8_t*)&argc, intSize);
173c174
< tc->setIntReg(StackPointerReg, stack_min);
---
> tc->setIntReg(StackPointerReg, memState->stackMin);