[gem5-dev] changeset in gem5: SPARC: Remove the last checks of FULL_SYSTEM.

[Gabe Black]

changeset a6c772fef2f1 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=a6c772fef2f1
description:
        SPARC: Remove the last checks of FULL_SYSTEM.

diffstat:

 src/arch/sparc/tlb.cc |  29 +++++++++++++++--------------
 src/arch/sparc/tlb.hh |   1 -
 2 files changed, 15 insertions(+), 15 deletions(-)

diffs (66 lines):

diff -r 6f63141531c8 -r a6c772fef2f1 src/arch/sparc/tlb.cc
--- a/src/arch/sparc/tlb.cc     Thu Oct 13 01:11:00 2011 -0700
+++ b/src/arch/sparc/tlb.cc     Thu Oct 13 01:37:19 2011 -0700
@@ -42,6 +42,7 @@
 #include "debug/TLB.hh"
 #include "mem/packet_access.hh"
 #include "mem/request.hh"
+#include "sim/full_system.hh"
 #include "sim/system.hh"
 
 /* @todo remove some of the magic constants.  -- ali
@@ -497,14 +498,14 @@
 
     if (e == NULL || !e->valid) {
         writeTagAccess(vaddr, context);
-        if (real)
+        if (real) {
             return new InstructionRealTranslationMiss;
-        else
-#if FULL_SYSTEM
-            return new FastInstructionAccessMMUMiss;
-#else
-            return new FastInstructionAccessMMUMiss(req->getVaddr());
-#endif
+        } else {
+            if (FullSystem)
+                return new FastInstructionAccessMMUMiss;
+            else
+                return new FastInstructionAccessMMUMiss(req->getVaddr());
+        }
     }
 
     // were not priviledged accesing priv page
@@ -709,14 +710,14 @@
     if (e == NULL || !e->valid) {
         writeTagAccess(vaddr, context);
         DPRINTF(TLB, "TLB: DTB Failed to find matching TLB entry\n");
-        if (real)
+        if (real) {
             return new DataRealTranslationMiss;
-        else
-#if FULL_SYSTEM
-            return new FastDataAccessMMUMiss;
-#else
-            return new FastDataAccessMMUMiss(req->getVaddr());
-#endif
+        } else {
+            if (FullSystem)
+                return new FastDataAccessMMUMiss;
+            else
+                return new FastDataAccessMMUMiss(req->getVaddr());
+        }
 
     }
 
diff -r 6f63141531c8 -r a6c772fef2f1 src/arch/sparc/tlb.hh
--- a/src/arch/sparc/tlb.hh     Thu Oct 13 01:11:00 2011 -0700
+++ b/src/arch/sparc/tlb.hh     Thu Oct 13 01:37:19 2011 -0700
@@ -34,7 +34,6 @@
 #include "arch/sparc/asi.hh"
 #include "arch/sparc/tlb_map.hh"
 #include "base/misc.hh"
-#include "config/full_system.hh"
 #include "mem/request.hh"
 #include "params/SparcTLB.hh"
 #include "sim/fault_fwd.hh"
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev