54c54,57
< memState->stackBase = 0xbf000000L;
---
> // Set up break point (Top of Heap)
> Addr brk_point = objFile->dataBase() + objFile->dataSize() +
> objFile->bssSize();
> brk_point = roundUp(brk_point, PageBytes);
56,57c59
< // Set pointer for next thread stack. Reserve 8M for main stack.
< memState->nextThreadStackBase = memState->stackBase - (8 * 1024 * 1024);
---
> Addr stack_base = 0xbf000000L;
59,62c61
< // Set up break point (Top of Heap)
< memState->brkPoint = objFile->dataBase() + objFile->dataSize() +
< objFile->bssSize();
< memState->brkPoint = roundUp(memState->brkPoint, PageBytes);
---
> Addr max_stack_size = 8 * 1024 * 1024;
63a63,65
> // Set pointer for next thread stack. Reserve 8M for main stack.
> Addr next_thread_stack_base = stack_base - max_stack_size;
>
65c67,70
< memState->mmapEnd = 0x70000000L;
---
> Addr mmap_end = 0x70000000L;
>
> memState = make_shared<MemState>(brk_point, stack_base, max_stack_size,
> next_thread_stack_base, mmap_end);
189,191c194,195
< memState->stackMin = memState->stackBase - space_needed;
< memState->stackMin = roundDown(memState->stackMin, align);
< memState->stackSize = memState->stackBase - memState->stackMin;
---
> Addr stack_min = memState->getStackBase() - space_needed;
> stack_min = roundDown(stack_min, align);
192a197,198
> memState->setStackSize(memState->getStackBase() - stack_min);
>
194,195c200,201
< allocateMem(roundDown(memState->stackMin, pageSize),
< roundUp(memState->stackSize, pageSize));
---
> allocateMem(roundDown(stack_min, pageSize),
> roundUp(memState->getStackSize(), pageSize));
198c204
< uint32_t sentry_base = memState->stackBase - sentry_size;
---
> uint32_t sentry_base = memState->getStackBase() - sentry_size;
217c223
< DPRINTF(Stack, "0x%x - stack min\n", memState->stackMin);
---
> DPRINTF(Stack, "0x%x - stack min\n", stack_min);
262c268
< tc->setIntReg(StackPointerReg, memState->stackMin);
---
> tc->setIntReg(StackPointerReg, stack_min);
267c273
< memState->stackMin = roundDown(memState->stackMin, pageSize);
---
> memState->setStackMin(roundDown(stack_min, pageSize));