Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/33904 )
Change subject: x86: Delegate process loading to the EmuLinux workload.
......................................................................
x86: Delegate process loading to the EmuLinux workload.
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 <[email protected]>
Reviewed-by: Alexandru Duțu <[email protected]>
Reviewed-by: Bobby R. Bruce <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/arch/x86/SConscript
D src/arch/x86/linux/process.cc
D src/arch/x86/linux/process.hh
M src/arch/x86/linux/se_workload.cc
M src/arch/x86/linux/se_workload.hh
5 files changed, 37 insertions(+), 146 deletions(-)
Approvals:
Alexandru Duțu: Looks good to me, but someone else must approve
Gabe Black: Looks good to me, approved; Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/x86/SConscript b/src/arch/x86/SConscript
index 678bdff..954c3a3 100644
--- a/src/arch/x86/SConscript
+++ b/src/arch/x86/SConscript
@@ -59,7 +59,6 @@
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')
diff --git a/src/arch/x86/linux/process.cc b/src/arch/x86/linux/process.cc
deleted file mode 100644
index 7d9f174..0000000
--- a/src/arch/x86/linux/process.cc
+++ /dev/null
@@ -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 ¶ms, ::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
diff --git a/src/arch/x86/linux/process.hh b/src/arch/x86/linux/process.hh
deleted file mode 100644
index 4aa6e11..0000000
--- a/src/arch/x86/linux/process.hh
+++ /dev/null
@@ -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__
diff --git a/src/arch/x86/linux/se_workload.cc
b/src/arch/x86/linux/se_workload.cc
index 6f4384a..1e56371 100644
--- a/src/arch/x86/linux/se_workload.cc
+++ b/src/arch/x86/linux/se_workload.cc
@@ -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 ¶ms, ::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
{
diff --git a/src/arch/x86/linux/se_workload.hh
b/src/arch/x86/linux/se_workload.hh
index 30477b4..ee1805c 100644
--- a/src/arch/x86/linux/se_workload.hh
+++ b/src/arch/x86/linux/se_workload.hh
@@ -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 @@
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;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33904
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I425b95c9c730f31291790d63bc842e2c0092960d
Gerrit-Change-Number: 33904
Gerrit-PatchSet: 11
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Alexandru Duțu <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Brandon Potter <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Matthew Poremba <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
