From 239b33e016b19aa18e70f3bc64c4e11de3f92c7d Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Nov 2011 01:25:15 -0700
Subject: SE/FS: Get rid of FULL_SYSTEM in the ARM ISA.

---
 src/arch/arm/insts/static_inst.hh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/arch/arm/insts')

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
+        }
     }
 };
 }
-- 
cgit v1.2.3