Implement Ali's review feedback.

Try to decrease indentation, and remove some redundant FullSystem checks.

2 files changed, 10 insertions, 14 deletions

diff --git a/src/arch/power/tlb.cc b/src/arch/power/tlb.cc
index 2148e875a..9f535e9e5 100644
--- a/src/arch/power/tlb.cc
+++ b/src/arch/power/tlb.cc
@@ -309,14 +309,13 @@ TLB::translateData(RequestPtr req, ThreadContext *tc, bool write)
 Fault
 TLB::translateAtomic(RequestPtr req, ThreadContext *tc, Mode mode)
 {
-    if (FullSystem) {
+    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);
-    }
+
+    if (mode == Execute)
+        return translateInst(req, tc);
+    else
+        return translateData(req, tc, mode == Write);
 }
 
 void
diff --git a/src/arch/power/vtophys.cc b/src/arch/power/vtophys.cc
index 597f41b2f..b03f507fc 100755
--- a/src/arch/power/vtophys.cc
+++ b/src/arch/power/vtophys.cc
@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2002-2005 The Regents of The University of Michigan
- * Copyright (c) 2007 MIPS Technologies, Inc.
+ * Copyright (c) 2012 Google
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,9 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * Authors: Ali Saidi
- *          Nathan Binkert
- *          Jaidev Patwardhan
+ * Authors: Gabe Black
  */
 
 #include "arch/power/vtophys.hh"
@@ -38,12 +35,12 @@ using namespace std;
 Addr
 PowerISA::vtophys(Addr vaddr)
 {
-    fatal("VTOPHYS: Unimplemented on POWER\n");
+    fatal("vtophys: Unimplemented on POWER\n");
 }
 
 Addr
 PowerISA::vtophys(ThreadContext *tc, Addr addr)
 {
-    fatal("VTOPHYS: Unimplemented on POWER\n");
+    fatal("vtophys: Unimplemented on POWER\n");
 }