projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Yet another merge with the main repository.
[gem5.git]
/
src
/
cpu
/
inorder
/
inorder_dyn_inst.cc
diff --git
a/src/cpu/inorder/inorder_dyn_inst.cc
b/src/cpu/inorder/inorder_dyn_inst.cc
index ff178f6d3ee56cc60119c8b0951737aa6892ca83..b61beece2558fe1bdf8c76977810d5fb3a1acd7e 100644
(file)
--- a/
src/cpu/inorder/inorder_dyn_inst.cc
+++ b/
src/cpu/inorder/inorder_dyn_inst.cc
@@
-45,6
+45,7
@@
#include "cpu/exetrace.hh"
#include "debug/InOrderDynInst.hh"
#include "mem/request.hh"
#include "cpu/exetrace.hh"
#include "debug/InOrderDynInst.hh"
#include "mem/request.hh"
+#include "sim/full_system.hh"
using namespace std;
using namespace TheISA;
using namespace std;
using namespace TheISA;
@@
-269,8
+270,6
@@
InOrderDynInst::memAccess()
}
}
-#if FULL_SYSTEM
-
Fault
InOrderDynInst::hwrei()
{
Fault
InOrderDynInst::hwrei()
{
@@
-311,17
+310,15
@@
InOrderDynInst::simPalCheck(int palFunc)
#endif
return this->cpu->simPalCheck(palFunc, this->threadNumber);
}
#endif
return this->cpu->simPalCheck(palFunc, this->threadNumber);
}
-#endif
void
InOrderDynInst::syscall(int64_t callnum)
{
void
InOrderDynInst::syscall(int64_t callnum)
{
-#if FULL_SYSTEM
- panic("Syscall emulation isn't available in FS mode.\n");
-#else
+ if (FullSystem)
+
panic("Syscall emulation isn't available in FS mode.\n");
+
syscallNum = callnum;
cpu->syscallContext(NoFault, this->threadNumber, this);
syscallNum = callnum;
cpu->syscallContext(NoFault, this->threadNumber, this);
-#endif
}
void
}
void