Merge ktlim@zizzer:/bk/newmem

into  zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem

--HG--
extra : convert_revision : 35e2ff6ce62281299ad98dca64ba04a3a8a6757c

1 files changed, 7 insertions, 0 deletions

diff --git a/src/arch/sparc/tlb.hh b/src/arch/sparc/tlb.hh
index 0fdba6baf..7a9a6aea1 100644
--- a/src/arch/sparc/tlb.hh
+++ b/src/arch/sparc/tlb.hh
@@ -31,6 +31,7 @@
 #ifndef __ARCH_SPARC_TLB_HH__
 #define __ARCH_SPARC_TLB_HH__
 
+#include "base/misc.hh"
 #include "mem/request.hh"
 #include "sim/faults.hh"
 #include "sim/sim_object.hh"
@@ -56,6 +57,9 @@ namespace SparcISA
 
         Fault translate(RequestPtr &req, ThreadContext *tc) const
         {
+            //For now, always assume the address is already physical.
+            //Also assume that there are 40 bits of physical address space.
+            req->setPaddr(req->getVaddr() & ((1ULL << 40) - 1));
             return NoFault;
         }
     };
@@ -69,6 +73,9 @@ namespace SparcISA
 
         Fault translate(RequestPtr &req, ThreadContext *tc, bool write) const
         {
+            //For now, always assume the address is already physical.
+            //Also assume that there are 40 bits of physical address space.
+            req->setPaddr(req->getVaddr() & ((1ULL << 40) - 1));
             return NoFault;
         }
     };