Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/38485 )
Change subject: sim: Remove full system checks from some pseudo insts.
......................................................................
sim: Remove full system checks from some pseudo insts.
These pseudo insts are less useful outside of full system, but they
should all still work. Removing this check makes it possible to, for
instance, test them in syscall emulation mode, and removes another
difference between the two styles of simulation.
Change-Id: Ia7d29bfc6f7c5c236045d151930fc171a6966799
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38485
Reviewed-by: Giacomo Travaglini <[email protected]>
Maintainer: Giacomo Travaglini <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/sim/pseudo_inst.cc
1 file changed, 0 insertions(+), 21 deletions(-)
Approvals:
Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index 058e5dd..0079ebd 100644
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -61,7 +61,6 @@
#include "debug/WorkItems.hh"
#include "dev/net/dist_iface.hh"
#include "params/BaseCPU.hh"
-#include "sim/full_system.hh"
#include "sim/process.hh"
#include "sim/serialize.hh"
#include "sim/sim_events.hh"
@@ -100,18 +99,10 @@
} // namespace InitParamKey
-static inline void
-panicFsOnlyPseudoInst(const char *name)
-{
- panic("Pseudo inst \"%s\" is only available in Full System mode.",
name);
-}
-
void
arm(ThreadContext *tc)
{
DPRINTF(PseudoInst, "PseudoInst::arm()\n");
- if (!FullSystem)
- panicFsOnlyPseudoInst("arm");
auto *workload = tc->getSystemPtr()->workload;
if (workload)
@@ -211,8 +202,6 @@
loadsymbol(ThreadContext *tc)
{
DPRINTF(PseudoInst, "PseudoInst::loadsymbol()\n");
- if (!FullSystem)
- panicFsOnlyPseudoInst("loadsymbol");
const string &filename = tc->getCpuPtr()->system->params().symbolfile;
if (filename.empty()) {
@@ -266,8 +255,6 @@
{
DPRINTF(PseudoInst, "PseudoInst::addsymbol(0x%x, 0x%x)\n",
addr, symbolAddr);
- if (!FullSystem)
- panicFsOnlyPseudoInst("addSymbol");
std::string symbol;
tc->getVirtProxy().readString(symbol, symbolAddr);
@@ -285,10 +272,6 @@
{
DPRINTF(PseudoInst, "PseudoInst::initParam() key:%s%s\n", (char
*)&key_str1,
(char *)&key_str2);
- if (!FullSystem) {
- panicFsOnlyPseudoInst("initParam");
- return 0;
- }
// The key parameter string is passed in via two 64-bit registers. We
copy
// out the characters from the 64-bit integer variables here, and
@@ -375,10 +358,6 @@
{
DPRINTF(PseudoInst, "PseudoInst::readfile(0x%x, 0x%x, 0x%x)\n",
vaddr, len, offset);
- if (!FullSystem) {
- panicFsOnlyPseudoInst("readfile");
- return 0;
- }
const string &file = tc->getSystemPtr()->params().readfile;
if (file.empty()) {
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38485
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: Ia7d29bfc6f7c5c236045d151930fc171a6966799
Gerrit-Change-Number: 38485
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[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
