From 63b10907ef822aa6873d7f4f4d1ee849a188b2c4 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Fri, 4 Jan 2013 18:09:45 -0600
Subject: SPARC: Keep a copy of the current ASI in the decoder.

Committed by: Nilay Vaish <nilay@cs.wisc.edu>
---
 src/arch/sparc/decoder.hh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/arch/sparc/decoder.hh')

diff --git a/src/arch/sparc/decoder.hh b/src/arch/sparc/decoder.hh
index ea0793286..f85d5e4de 100644
--- a/src/arch/sparc/decoder.hh
+++ b/src/arch/sparc/decoder.hh
@@ -49,9 +49,10 @@ class Decoder
     // The extended machine instruction being generated
     ExtMachInst emi;
     bool instDone;
+    MiscReg asi;
 
   public:
-    Decoder(ThreadContext * _tc) : tc(_tc), instDone(false)
+    Decoder(ThreadContext * _tc) : tc(_tc), instDone(false), asi(0)
     {}
 
     ThreadContext *
@@ -86,8 +87,7 @@ class Decoder
         // into all the execute functions
         if (inst & (1 << 13)) {
             emi |= (static_cast<ExtMachInst>(
-                        tc->readMiscRegNoEffect(MISCREG_ASI))
-                    << (sizeof(MachInst) * 8));
+                        asi << (sizeof(MachInst) * 8)));
         } else {
             emi |= (static_cast<ExtMachInst>(bits(inst, 12, 5))
                     << (sizeof(MachInst) * 8));
@@ -107,6 +107,12 @@ class Decoder
         return instDone;
     }
 
+    void
+    setContext(MiscReg _asi)
+    {
+        asi = _asi;
+    }
+
   protected:
     /// A cache of decoded instruction objects.
     static GenericISA::BasicDecodeCache defaultCache;
-- 
cgit v1.2.3