From 76692f360c243401a850ea74cf123d4d006113ec Mon Sep 17 00:00:00 2001 From: Alec Roelke Date: Tue, 16 May 2017 17:00:02 -0400 Subject: [PATCH] arch-riscv: Fix bad stack initialization This patch fixes a problem with RISC-V initial stack setup in SE mode where the AT_RANDOM aux vector value contains an address that is too close to the top of the stack and doesn't fit the required 16 bytes. To fix this, the program header table was added to the top of the stack just like the RISC-V proxy kernel does. Change-Id: I814562e060ff041cd0d7a7c54c3685645bd325a3 Reviewed-on: https://gem5-review.googlesource.com/3401 Reviewed-by: Jason Lowe-Power Reviewed-by: Brandon Potter Maintainer: Alec Roelke --- src/arch/riscv/process.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/arch/riscv/process.cc b/src/arch/riscv/process.cc index 13038c17c..eeea5ee48 100644 --- a/src/arch/riscv/process.cc +++ b/src/arch/riscv/process.cc @@ -88,6 +88,7 @@ RiscvProcess::argsInit(int pageSize) // Determine stack size and populate auxv Addr stack_top = memState->getStackMin(); + stack_top -= elfObject->programHeaderSize(); for (const string& arg: argv) stack_top -= arg.size() + 1; for (const string& env: envp) @@ -113,6 +114,16 @@ RiscvProcess::argsInit(int pageSize) allocateMem(roundDown(stack_top, pageSize), roundUp(memState->getStackSize(), pageSize)); + // Copy program headers to stack + memState->setStackMin(memState->getStackMin() - + elfObject->programHeaderSize()); + uint8_t* phdr = new uint8_t[elfObject->programHeaderSize()]; + initVirtMem.readBlob(elfObject->programHeaderTable(), phdr, + elfObject->programHeaderSize()); + initVirtMem.writeBlob(memState->getStackMin(), phdr, + elfObject->programHeaderSize()); + delete phdr; + // Copy argv to stack vector argPointers; for (const string& arg: argv) { -- 2.30.2