From: Gabe Black Date: Fri, 3 May 2019 05:53:41 +0000 (-0700) Subject: riscv: Add an object file loader for linux. X-Git-Tag: v19.0.0.0~832 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=45518cc26e02ed217c9a46c6978fe2fa64d4d7f2;p=gem5.git riscv: Add an object file loader for linux. Change-Id: I3accca91cc4e02fa8e3a1169590cbe6696cf05e2 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18628 Tested-by: kokoro Reviewed-by: Alec Roelke Maintainer: Alec Roelke --- diff --git a/src/arch/riscv/linux/process.cc b/src/arch/riscv/linux/process.cc index 72399201e..b2d030523 100644 --- a/src/arch/riscv/linux/process.cc +++ b/src/arch/riscv/linux/process.cc @@ -38,6 +38,7 @@ #include "arch/riscv/isa_traits.hh" #include "arch/riscv/linux/linux.hh" +#include "base/loader/object_file.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" #include "debug/SyscallVerbose.hh" @@ -51,6 +52,40 @@ using namespace std; using namespace RiscvISA; +namespace +{ + +class RiscvLinuxObjectFileLoader : public ObjectFile::Loader +{ + public: + Process * + load(ProcessParams *params, ObjectFile *obj_file) override + { + auto arch = obj_file->getArch(); + auto opsys = obj_file->getOpSys(); + + if (arch != ObjectFile::Riscv64 && arch != ObjectFile::Riscv32) + return nullptr; + + if (opsys == ObjectFile::UnknownOpSys) { + warn("Unknown operating system; assuming Linux."); + opsys = ObjectFile::Linux; + } + + if (opsys != ObjectFile::Linux) + return nullptr; + + if (arch == ObjectFile::Riscv64) + return new RiscvLinuxProcess64(params, obj_file); + else + return new RiscvLinuxProcess32(params, obj_file); + } +}; + +RiscvLinuxObjectFileLoader loader; + +} // anonymous namespace + /// Target uname() handler. static SyscallReturn unameFunc64(SyscallDesc *desc, int callnum, Process *process,