summaryrefslogtreecommitdiff
path: root/src/arch/arm/insts
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2011-11-02 01:25:15 -0700
committerGabe Black <gblack@eecs.umich.edu>2011-11-02 01:25:15 -0700
commit239b33e016b19aa18e70f3bc64c4e11de3f92c7d (patch)
tree87008a6ac9437f57bb9a33b240603fe090b4b0ab /src/arch/arm/insts
parent7b417d4188c4978ecdeddd04a0b53f60b96d22e1 (diff)
downloadgem5-239b33e016b19aa18e70f3bc64c4e11de3f92c7d.tar.xz
SE/FS: Get rid of FULL_SYSTEM in the ARM ISA.
Diffstat (limited to 'src/arch/arm/insts')
-rw-r--r--src/arch/arm/insts/static_inst.hh7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/arch/arm/insts/static_inst.hh b/src/arch/arm/insts/static_inst.hh
index fa850190f..d65555822 100644
--- a/src/arch/arm/insts/static_inst.hh
+++ b/src/arch/arm/insts/static_inst.hh
@@ -46,6 +46,7 @@
#include "arch/arm/utility.hh"
#include "base/trace.hh"
#include "cpu/static_inst.hh"
+#include "sim/full_system.hh"
namespace ArmISA
{
@@ -294,11 +295,11 @@ class ArmStaticInst : public StaticInst
inline Fault
disabledFault() const
{
-#if FULL_SYSTEM
+ if (FullSystem) {
return new UndefinedInstruction();
-#else
+ } else {
return new UndefinedInstruction(machInst, false, mnemonic, true);
-#endif
+ }
}
};
}