From: Alec Roelke <ar4jc@virginia.edu>
Date: Tue, 16 May 2017 21:00:02 +0000 (-0400)
Subject: arch-riscv: Fix bad stack initialization
X-Git-Tag: v19.0.0.0~2780
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=76692f360c243401a850ea74cf123d4d006113ec;p=gem5.git

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 <jason@lowepower.com>
Reviewed-by: Brandon Potter <Brandon.Potter@amd.com>
Maintainer: Alec Roelke <ar4jc@virginia.edu>
---

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<Addr> argPointers;
     for (const string& arg: argv) {