From: Gabe Black Date: Fri, 3 May 2019 05:52:46 +0000 (-0700) Subject: arm: Add an object file loader for linux and freebsd. X-Git-Tag: v19.0.0.0~835 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b2b67729f9f6e8bf46bb627b34620f79bf575dca;p=gem5.git arm: Add an object file loader for linux and freebsd. Change-Id: Ie5fd187a4897aa608ffc12278b23d3ee8c0f323c Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18585 Tested-by: kokoro Reviewed-by: Andreas Sandberg Maintainer: Andreas Sandberg --- diff --git a/src/arch/arm/freebsd/process.cc b/src/arch/arm/freebsd/process.cc index e6aa74068..ba79eb18b 100644 --- a/src/arch/arm/freebsd/process.cc +++ b/src/arch/arm/freebsd/process.cc @@ -41,6 +41,7 @@ #include "arch/arm/freebsd/freebsd.hh" #include "arch/arm/isa_traits.hh" +#include "base/loader/object_file.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" #include "kern/freebsd/freebsd.hh" @@ -52,6 +53,37 @@ using namespace std; using namespace ArmISA; +namespace +{ + +class ArmFreebsdObjectFileLoader : 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::Arm && arch != ObjectFile::Thumb && + arch != ObjectFile::Arm64) { + return nullptr; + } + + if (opsys != ObjectFile::FreeBSD) + return nullptr; + + if (arch == ObjectFile::Arm64) + return new ArmFreebsdProcess64(params, obj_file, arch); + else + return new ArmFreebsdProcess32(params, obj_file, arch); + } +}; + +ArmFreebsdObjectFileLoader loader; + +} // anonymous namespace + static SyscallReturn issetugidFunc(SyscallDesc *desc, int callnum, Process *process, ThreadContext *tc) diff --git a/src/arch/arm/linux/process.cc b/src/arch/arm/linux/process.cc index 99f4b2cd3..cd37c770a 100644 --- a/src/arch/arm/linux/process.cc +++ b/src/arch/arm/linux/process.cc @@ -50,6 +50,7 @@ #include "arch/arm/isa_traits.hh" #include "arch/arm/linux/linux.hh" +#include "base/loader/object_file.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" #include "kern/linux/linux.hh" @@ -61,6 +62,47 @@ using namespace std; using namespace ArmISA; +namespace +{ + +class ArmLinuxObjectFileLoader : 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::Arm && arch != ObjectFile::Thumb && + arch != ObjectFile::Arm64) { + return nullptr; + } + + if (opsys == ObjectFile::UnknownOpSys) { + warn("Unknown operating system; assuming Linux."); + opsys = ObjectFile::Linux; + } + + if (opsys == ObjectFile::LinuxArmOABI) { + fatal("gem5 does not support ARM OABI binaries. Please recompile " + "with an EABI compiler."); + } + + if (opsys != ObjectFile::Linux) + return nullptr; + + if (arch == ObjectFile::Arm64) + return new ArmLinuxProcess64(params, obj_file, arch); + else + return new ArmLinuxProcess32(params, obj_file, arch); + } +}; + +ArmLinuxObjectFileLoader loader; + +} // anonymous namespace + /// Target uname() handler. static SyscallReturn unameFunc32(SyscallDesc *desc, int callnum, Process *process,