56c56
< memState->stackBase = 0x7FFFFFFF;
---
> Addr stack_base = 0x7FFFFFFF;
57a58,59
> Addr max_stack_size = 8 * 1024 * 1024;
>
59c61
< memState->nextThreadStackBase = memState->stackBase - (8 * 1024 * 1024);
---
> Addr next_thread_stack_base = stack_base - max_stack_size;
62,64c64,66
< memState->brkPoint = objFile->dataBase() + objFile->dataSize() +
< objFile->bssSize();
< memState->brkPoint = roundUp(memState->brkPoint, PageBytes);
---
> Addr brk_point = objFile->dataBase() + objFile->dataSize() +
> objFile->bssSize();
> brk_point = roundUp(brk_point, PageBytes);
67c69,72
< memState->mmapEnd = memState->brkPoint + 0x40000000L;
---
> Addr mmap_end = brk_point + 0x40000000L;
>
> memState = make_shared<MemState>(brk_point, stack_base, max_stack_size,
> next_thread_stack_base, mmap_end);
144c149
< memState->stackMin = memState->stackBase - space_needed;
---
> memState->setStackMin(memState->getStackBase() - space_needed);
146,147c151,152
< memState->stackMin = roundDown(memState->stackMin, pageSize);
< memState->stackSize = memState->stackBase - memState->stackMin;
---
> memState->setStackMin(roundDown(memState->getStackMin(), pageSize));
> memState->setStackSize(memState->getStackBase() - memState->getStackMin());
149c154,155
< allocateMem(memState->stackMin, roundUp(memState->stackSize, pageSize));
---
> allocateMem(memState->getStackMin(), roundUp(memState->getStackSize(),
> pageSize));
151,152c157,158
< // map out initial stack contents
< IntType argv_array_base = memState->stackMin + intSize; // room for argc
---
> // map out initial stack contents; leave room for argc
> IntType argv_array_base = memState->getStackMin() + intSize;
163c169
< initVirtMem.writeBlob(memState->stackMin, (uint8_t*)&argc, intSize);
---
> initVirtMem.writeBlob(memState->getStackMin(), (uint8_t*)&argc, intSize);
188c194
< tc->setIntReg(StackPointerReg, memState->stackMin);
---
> tc->setIntReg(StackPointerReg, memState->getStackMin());