derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: Delegate process loading to the EmuLinux workload.

Browse Source 
This is still triggered by the generic mechanism that tries out all
paths to go from an object file to a process. That's not entirely
necessary since the only loader that should be used when using the
X86ISA::EmuLinux workload is the one it provides, but the rest of gem5
isn't ready for that change yet.

This removes the last lingering reason to keep around the
arch/x86/linux/process.(hh|cc) files, so they have been deleted.

Change-Id: I425b95c9c730f31291790d63bc842e2c0092960d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33904
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Reviewed-by: Alexandru Duțu <alexandru.dutu@amd.com>
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Gabe Black
2020-10-20 17:36:54 -07:00
parent ab474613bc
commit bfad4b77d0
5 changed files with 37 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/arch/x86/SConscript
View File

@@ -59,7 +59,6 @@ if env['TARGET_ISA'] == 'x86':
Source('linux/se_workload.cc')
Source('linux/fs_workload.cc')
Source('linux/linux.cc')
Source('linux/process.cc')
Source('mmu.cc')
Source('nativetrace.cc')
Source('pagetable.cc')

77
src/arch/x86/linux/process.cc
View File

@@ -1,77 +0,0 @@
/*
* Copyright (c) 2007 The Hewlett-Packard Development Company
* All rights reserved.
*
* The license below extends only to copyright in the software and shall
* not be construed as granting a license to any other intellectual
* property including but not limited to intellectual property relating
* to a hardware implementation of the functionality of the software
* licensed hereunder. You may use the software subject to the license
* terms below provided that you ensure that this notice is replicated
* unmodified and in its entirety in all distributions of the software,
* modified or unmodified, in source code or in binary form.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer;
* redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution;
* neither the name of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* 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.
*/
#include "arch/x86/linux/process.hh"
#include "base/loader/object_file.hh"
#include "sim/process.hh"
using namespace std;
namespace
{
class X86LinuxObjectFileLoader : public Process::Loader
{
public:
Process *
load(const ProcessParams &params, ::Loader::ObjectFile *obj_file) override
{
auto arch = obj_file->getArch();
auto opsys = obj_file->getOpSys();
if (arch != ::Loader::X86_64 && arch != ::Loader::I386)
return nullptr;
if (opsys == ::Loader::UnknownOpSys) {
warn("Unknown operating system; assuming Linux.");
opsys = ::Loader::Linux;
}
if (opsys != ::Loader::Linux)
return nullptr;
if (arch == ::Loader::X86_64)
return new X86ISA::X86_64LinuxProcess(params, obj_file);
else
return new X86ISA::I386LinuxProcess(params, obj_file);
}
};
X86LinuxObjectFileLoader loader;
} // anonymous namespace

66
src/arch/x86/linux/process.hh
View File

@@ -1,66 +0,0 @@
/*
* Copyright (c) 2007 The Hewlett-Packard Development Company
* All rights reserved.
*
* The license below extends only to copyright in the software and shall
* not be construed as granting a license to any other intellectual
* property including but not limited to intellectual property relating
* to a hardware implementation of the functionality of the software
* licensed hereunder. You may use the software subject to the license
* terms below provided that you ensure that this notice is replicated
* unmodified and in its entirety in all distributions of the software,
* modified or unmodified, in source code or in binary form.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer;
* redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution;
* neither the name of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* 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.
*/
#ifndef __X86_LINUX_PROCESS_HH__
#define __X86_LINUX_PROCESS_HH__
#include "arch/x86/linux/linux.hh"
#include "arch/x86/process.hh"
#include "sim/process.hh"
#include "sim/syscall_abi.hh"
struct ProcessParams;
struct ThreadContext;
namespace X86ISA
{
class X86_64LinuxProcess : public X86_64Process
{
public:
using X86_64Process::X86_64Process;
};
class I386LinuxProcess : public I386Process
{
public:
using I386Process::I386Process;
};
} // namespace X86ISA
#endif // __X86_LINUX_PROCESS_HH__

36
src/arch/x86/linux/se_workload.cc
View File

@@ -31,7 +31,7 @@
#include "arch/x86/isa_traits.hh"
#include "arch/x86/linux/linux.hh"
#include "arch/x86/linux/process.hh"
#include "arch/x86/process.hh"
#include "arch/x86/registers.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
@@ -40,6 +40,40 @@
#include "sim/syscall_desc.hh"
#include "sim/syscall_emul.hh"
namespace
{
class LinuxLoader : public Process::Loader
{
public:
Process *
load(const ProcessParams &params, ::Loader::ObjectFile *obj_file)
{
auto arch = obj_file->getArch();
auto opsys = obj_file->getOpSys();
if (arch != ::Loader::X86_64 && arch != ::Loader::I386)
return nullptr;
if (opsys == ::Loader::UnknownOpSys) {
warn("Unknown operating system; assuming Linux.");
opsys = ::Loader::Linux;
}
if (opsys != ::Loader::Linux)
return nullptr;
if (arch == ::Loader::X86_64)
return new X86ISA::X86_64Process(params, obj_file);
else
return new X86ISA::I386Process(params, obj_file);
}
};
LinuxLoader loader;
} // anonymous namespace
namespace X86ISA
{

3
src/arch/x86/linux/se_workload.hh
View File

@@ -30,6 +30,7 @@
#include "arch/x86/linux/linux.hh"
#include "params/X86EmuLinux.hh"
#include "sim/process.hh"
#include "sim/se_workload.hh"
#include "sim/syscall_abi.hh"
@@ -49,7 +50,7 @@ class EmuLinux : public SEWorkload
EmuLinux(const Params &p);
Loader::Arch getArch() const override { return Loader::X86_64; }
::Loader::Arch getArch() const override { return ::Loader::X86_64; }
void syscall(ThreadContext *tc) override;