59c59
< stack_base = 0x7FFFFFFF;
---
> memState->stackBase = (Addr)0x7FFFFFFF;
62c62
< next_thread_stack_base = stack_base - (8 * 1024 * 1024);
---
> memState->nextThreadStackBase = memState->stackBase - (8 * 1024 * 1024);
65c65
< brk_point = objFile->bssBase() + objFile->bssSize();
---
> memState->brkPoint = objFile->bssBase() + objFile->bssSize();
68c68
< mmap_end = brk_point + 0x40000000L;
---
> memState->mmapEnd = memState->brkPoint + 0x40000000L;
127,128c127,128
< stack_size = sizeof(IntType) + argv_array_size + 2 * sizeof(Addr) +
< arg_data_size + 2 * sizeof(Addr);
---
> memState->stackSize = sizeof(IntType) + argv_array_size + 2 *
> sizeof(Addr) + arg_data_size + 2 * sizeof(Addr);
130,131c130,131
< stack_size += 2 * sizeof(Addr) + envp_array_size + 2 * sizeof(Addr) +
< env_data_size;
---
> memState->stackSize += 2 * sizeof(Addr) + envp_array_size + 2 *
> sizeof(Addr) + env_data_size;
134,136c134,137
< stack_size += 2 * sizeof(Addr) + auxv_array_size;
< stack_min = roundDown(stack_base - stack_size, pageSize);
< allocateMem(stack_min, roundUp(stack_size, pageSize));
---
> memState->stackSize += 2 * sizeof(Addr) + auxv_array_size;
> memState->stackMin = roundDown(memState->stackBase - memState->stackSize,
> pageSize);
> allocateMem(memState->stackMin, roundUp(memState->stackSize, pageSize));
138c139
< Addr argv_array_base = stack_min + sizeof(IntType);
---
> Addr argv_array_base = memState->stackMin + sizeof(IntType);
163c164
< Addr sp = stack_min;
---
> Addr sp = memState->stackMin;
214c215
< tc->setIntReg(StackPointerReg, stack_min);
---
> tc->setIntReg(StackPointerReg, memState->stackMin);