From: Gabe Black <gblack@eecs.umich.edu>
Date: Sun, 30 Oct 2011 10:55:24 +0000 (-0700)
Subject: SE/FS: Remove the last references to FULL_SYSTEM from POWER.
X-Git-Tag: stable_2012_06_28~301
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b144f05b535697629b08767bf77b5b80f91a34f2;p=gem5.git

SE/FS: Remove the last references to FULL_SYSTEM from POWER.
---

diff --git a/src/arch/power/SConscript b/src/arch/power/SConscript
index 366fc1e65..e8d385f4d 100644
--- a/src/arch/power/SConscript
+++ b/src/arch/power/SConscript
@@ -41,7 +41,10 @@ if env['TARGET_ISA'] == 'power':
     Source('insts/condition.cc')
     Source('insts/static_inst.cc')
     Source('interrupts.cc')
+    Source('linux/linux.cc')
+    Source('linux/process.cc')
     Source('pagetable.cc')
+    Source('process.cc')
     Source('tlb.cc')
     Source('utility.cc')
     Source('vtophys.cc')
@@ -51,11 +54,6 @@ if env['TARGET_ISA'] == 'power':
 
     DebugFlag('Power')
 
-    if not env['FULL_SYSTEM']:
-        Source('process.cc')
-        Source('linux/linux.cc')
-        Source('linux/process.cc')
-
     # Add in files generated by the ISA description.
     isa_desc_files = env.ISADesc('isa/main.isa')
 
diff --git a/src/arch/power/tlb.cc b/src/arch/power/tlb.cc
index 8a088032c..d9be7fa69 100644
--- a/src/arch/power/tlb.cc
+++ b/src/arch/power/tlb.cc
@@ -50,6 +50,7 @@
 #include "debug/TLB.hh"
 #include "mem/page_table.hh"
 #include "params/PowerTLB.hh"
+#include "sim/full_system.hh"
 #include "sim/process.hh"
 
 using namespace std;
@@ -310,14 +311,14 @@ TLB::translateData(RequestPtr req, ThreadContext *tc, bool write)
 Fault
 TLB::translateAtomic(RequestPtr req, ThreadContext *tc, Mode mode)
 {
-#if !FULL_SYSTEM
-    if (mode == Execute)
-        return translateInst(req, tc);
-    else
-        return translateData(req, tc, mode == Write);
-#else
-  fatal("translate atomic not yet implemented\n");
-#endif
+    if (FullSystem) {
+        fatal("translate atomic not yet implemented in full system mode.\n");
+    } else {
+        if (mode == Execute)
+            return translateInst(req, tc);
+        else
+            return translateData(req, tc, mode == Write);
+    }
 }
 
 void