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

(limited to 'src/arch/arm/isa/insts/swap.isa')

diff --git a/src/arch/arm/isa/insts/swap.isa b/src/arch/arm/isa/insts/swap.isa
index f319e75aa..b42a1c4b2 100644
--- a/src/arch/arm/isa/insts/swap.isa
+++ b/src/arch/arm/isa/insts/swap.isa
@@ -73,11 +73,10 @@ let {{
 
     swpPreAccCode = '''
         if (!((SCTLR)Sctlr).sw) {
-#if FULL_SYSTEM
-            return new UndefinedInstruction;
-#else
-            return new UndefinedInstruction(false, mnemonic);
-#endif
+            if (FullSystem)
+                return new UndefinedInstruction;
+            else
+                return new UndefinedInstruction(false, mnemonic);
         }
     '''
 
-- 
cgit v1.2.3