* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Gabe Black
- * Ali Saidi
- * Korey Sewell
- * Alec Roelke
*/
+
#include "arch/riscv/process.hh"
#include <algorithm>
#include "sim/syscall_return.hh"
#include "sim/system.hh"
-using namespace std;
using namespace RiscvISA;
-RiscvProcess::RiscvProcess(ProcessParams *params, ObjectFile *objFile) :
+RiscvProcess::RiscvProcess(const ProcessParams ¶ms,
+ ::Loader::ObjectFile *objFile) :
Process(params,
- new EmulationPageTable(params->name, params->pid, PageBytes),
+ new EmulationPageTable(params.name, params.pid, PageBytes),
objFile)
{
- fatal_if(params->useArchPT, "Arch page tables not implemented.");
+ fatal_if(params.useArchPT, "Arch page tables not implemented.");
}
-RiscvProcess64::RiscvProcess64(ProcessParams *params, ObjectFile *objFile) :
+RiscvProcess64::RiscvProcess64(const ProcessParams ¶ms,
+ ::Loader::ObjectFile *objFile) :
RiscvProcess(params, objFile)
{
const Addr stack_base = 0x7FFFFFFFFFFFFFFFL;
const Addr max_stack_size = 8 * 1024 * 1024;
const Addr next_thread_stack_base = stack_base - max_stack_size;
- const Addr brk_point = roundUp(objFile->bssBase() + objFile->bssSize(),
- PageBytes);
+ const Addr brk_point = roundUp(image.maxAddr(), PageBytes);
const Addr mmap_end = 0x4000000000000000L;
- memState = make_shared<MemState>(brk_point, stack_base, max_stack_size,
- next_thread_stack_base, mmap_end);
+ memState = std::make_shared<MemState>(this, brk_point, stack_base,
+ max_stack_size, next_thread_stack_base, mmap_end);
}
-RiscvProcess32::RiscvProcess32(ProcessParams *params, ObjectFile *objFile) :
+RiscvProcess32::RiscvProcess32(const ProcessParams ¶ms,
+ ::Loader::ObjectFile *objFile) :
RiscvProcess(params, objFile)
{
const Addr stack_base = 0x7FFFFFFF;
const Addr max_stack_size = 8 * 1024 * 1024;
const Addr next_thread_stack_base = stack_base - max_stack_size;
- const Addr brk_point = roundUp(objFile->bssBase() + objFile->bssSize(),
- PageBytes);
+ const Addr brk_point = roundUp(image.maxAddr(), PageBytes);
const Addr mmap_end = 0x40000000L;
- memState = make_shared<MemState>(brk_point, stack_base, max_stack_size,
- next_thread_stack_base, mmap_end);
+ memState = std::make_shared<MemState>(this, brk_point, stack_base,
+ max_stack_size, next_thread_stack_base, mmap_end);
}
void
argsInit<uint64_t>(PageBytes);
for (ContextID ctx: contextIds)
- system->getThreadContext(ctx)->setMiscRegNoEffect(MISCREG_PRV, PRV_U);
+ system->threads[ctx]->setMiscRegNoEffect(MISCREG_PRV, PRV_U);
}
void
argsInit<uint32_t>(PageBytes);
for (ContextID ctx: contextIds) {
- system->getThreadContext(ctx)->setMiscRegNoEffect(MISCREG_PRV, PRV_U);
- PCState pc = system->getThreadContext(ctx)->pcState();
+ auto *tc = system->threads[ctx];
+ tc->setMiscRegNoEffect(MISCREG_PRV, PRV_U);
+ PCState pc = tc->pcState();
pc.rv32(true);
- system->getThreadContext(ctx)->pcState(pc);
+ tc->pcState(pc);
}
}
const int RandomBytes = 16;
const int addrSize = sizeof(IntType);
- updateBias();
- objFile->loadSections(initVirtMem);
- ElfObject* elfObject = dynamic_cast<ElfObject*>(objFile);
+ auto *elfObject = dynamic_cast<::Loader::ElfObject*>(objFile);
memState->setStackMin(memState->getStackBase());
// Determine stack size and populate auxv
Addr stack_top = memState->getStackMin();
stack_top -= RandomBytes;
- for (const string& arg: argv)
+ for (const std::string& arg: argv)
stack_top -= arg.size() + 1;
- for (const string& env: envp)
+ for (const std::string& env: envp)
stack_top -= env.size() + 1;
stack_top &= -addrSize;
- vector<AuxVector<IntType>> auxv;
+
std::vector<AuxVector<IntType>> auxv;
if (elfObject != nullptr) {
auxv.emplace_back(M5_AT_ENTRY, objFile->entryPoint());
auxv.emplace_back(M5_AT_PHNUM, elfObject->programHeaderCount());
addrSize + 2 * sizeof(IntType) * auxv.size();
stack_top &= -2*addrSize;
memState->setStackSize(memState->getStackBase() - stack_top);
- allocateMem(roundDown(stack_top, pageSize),
- roundUp(memState->getStackSize(), pageSize));
+ memState->mapRegion(roundDown(stack_top, pageSize),
+ roundUp(memState->getStackSize(), pageSize), "stack");
// Copy random bytes (for AT_RANDOM) to stack
memState->setStackMin(memState->getStackMin() - RandomBytes);
uint8_t at_random[RandomBytes];
- generate(begin(at_random), end(at_random),
- [&]{ return random_mt.random(0, 0xFF); });
- initVirtMem.writeBlob(memState->getStackMin(), at_random, RandomBytes);
+ std::generate(std::begin(at_random), std::end(at_random),
+ [&]{ return random_mt.random(0, 0xFF); });
+ initVirtMem->writeBlob(memState->getStackMin(), at_random, RandomBytes);
// Copy argv to stack
- vector<Addr> argPointers;
- for (const string& arg: argv) {
+
std::vector<Addr> argPointers;
+ for (const std::string& arg: argv) {
memState->setStackMin(memState->getStackMin() - (arg.size() + 1));
- initVirtMem.writeString(memState->getStackMin(), arg.c_str());
+ initVirtMem->writeString(memState->getStackMin(), arg.c_str());
argPointers.push_back(memState->getStackMin());
if (DTRACE(Stack)) {
- string wrote;
- initVirtMem.readString(wrote, argPointers.back());
+ std::string wrote;
+ initVirtMem->readString(wrote, argPointers.back());
DPRINTFN("Wrote arg \"%s\" to address %p\n",
wrote, (void*)memState->getStackMin());
}
argPointers.push_back(0);
// Copy envp to stack
- vector<Addr> envPointers;
- for (const string& env: envp) {
+
std::vector<Addr> envPointers;
+ for (const std::string& env: envp) {
memState->setStackMin(memState->getStackMin() - (env.size() + 1));
- initVirtMem.writeString(memState->getStackMin(), env.c_str());
+ initVirtMem->writeString(memState->getStackMin(), env.c_str());
envPointers.push_back(memState->getStackMin());
DPRINTF(Stack, "Wrote env \"%s\" to address %p\n",
env, (void*)memState->getStackMin());
Addr sp = memState->getStackMin();
const auto pushOntoStack =
[this, &sp](IntType data) {
- initVirtMem.write(sp, data, GuestByteOrder);
+ initVirtMem->write(sp, data, GuestByteOrder);
sp += sizeof(data);
};
}
// Push aux vector onto stack
- std::map<IntType, string> aux_keys = {
+ std::map<IntType, std::string> aux_keys = {
{M5_AT_ENTRY, "M5_AT_ENTRY"},
{M5_AT_PHNUM, "M5_AT_PHNUM"},
{M5_AT_PHENT, "M5_AT_PHENT"},
pushOntoStack(aux.val);
}
- ThreadContext *tc = system->getThreadContext(contextIds[0]);
+ ThreadContext *tc = system->threads[contextIds[0]];
tc->setIntReg(StackPointerReg, memState->getStackMin());
tc->pcState(getStartPC());
memState->setStackMin(roundDown(memState->getStackMin(), pageSize));
}
-
-RegVal
-RiscvProcess::getSyscallArg(ThreadContext *tc, int &i)
-{
- // If a larger index is requested than there are syscall argument
- // registers, return 0
- RegVal retval = 0;
- if (i < SyscallArgumentRegs.size())
- retval = tc->readIntReg(SyscallArgumentRegs[i]);
- i++;
- return retval;
-}
-
-void
-RiscvProcess::setSyscallArg(ThreadContext *tc, int i, RegVal val)
-{
- tc->setIntReg(SyscallArgumentRegs[i], val);
-}
-
-void
-RiscvProcess::setSyscallReturn(ThreadContext *tc, SyscallReturn sysret)
-{
- if (sysret.successful()) {
- // no error
- tc->setIntReg(SyscallPseudoReturnReg, sysret.returnValue());
- } else {
- // got an error, return details
- tc->setIntReg(SyscallPseudoReturnReg, sysret.encodedValue());
- }
-}
projects / gem5.git / blobdiff