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/isa/formats/unimp.isa | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/arch/arm/isa/formats/unimp.isa')

diff --git a/src/arch/arm/isa/formats/unimp.isa b/src/arch/arm/isa/formats/unimp.isa
index a0e0afd32..1c9a4b402 100644
--- a/src/arch/arm/isa/formats/unimp.isa
+++ b/src/arch/arm/isa/formats/unimp.isa
@@ -147,11 +147,10 @@ output exec {{
     FailUnimplemented::execute(%(CPU_exec_context)s *xc,
                                Trace::InstRecord *traceData) const
     {
-#if FULL_SYSTEM
-        return new UndefinedInstruction;
-#else
-        return new UndefinedInstruction(machInst, false, mnemonic);
-#endif
+        if (FullSystem)
+            return new UndefinedInstruction;
+        else
+            return new UndefinedInstruction(machInst, false, mnemonic);
     }
 
     Fault
-- 
cgit v1.2.3