Hand merge

[gem5.git] / arch / alpha / isa_desc

diff --git a/arch/alpha/isa_desc b/arch/alpha/isa_desc
index 5308efaaef5034b01bb9b5e87f6cbd5f7b080241..904af3ef0defac65e5aabf7a6699b9173393453a 100644 (file)
--- a/arch/alpha/isa_desc
+++ b/arch/alpha/isa_desc
@@ -744,9 +744,9 @@ output header {{
        /// Memory request flags.  See mem_req_base.hh.
         unsigned memAccessFlags;
        /// Pointer to EAComp object.
-       const StaticInstPtr<AlphaISA> eaCompPtr;
+       StaticInstPtr<AlphaISA> eaCompPtr;
        /// Pointer to MemAcc object.
-       const StaticInstPtr<AlphaISA> memAccPtr;
+       StaticInstPtr<AlphaISA> memAccPtr;
 
        /// Constructor
        Memory(const char *mnem, MachInst _machInst, OpClass __opClass,
@@ -762,8 +762,8 @@ output header {{
 
       public:
 
-       const StaticInstPtr<AlphaISA> &eaCompInst() const { return eaCompPtr; }
-       const StaticInstPtr<AlphaISA> &memAccInst() const { return memAccPtr; }
+       StaticInstPtr<AlphaISA> &eaCompInst() { return eaCompPtr; }
+       StaticInstPtr<AlphaISA> &memAccInst() { return memAccPtr; }
     };
 
     /**
@@ -1610,7 +1610,8 @@ output decoder {{
 }};
 
 def format HwMoveIPR(code) {{
-    iop = InstObjParams(name, Name, 'HwMoveIPR', CodeBlock(code))
+    iop = InstObjParams(name, Name, 'HwMoveIPR', CodeBlock(code),
+                       ['IprAccessOp'])
     header_output = BasicDeclare.subst(iop)
     decoder_output = BasicConstructor.subst(iop)
     decode_block = BasicDecode.subst(iop)
@@ -2538,9 +2539,9 @@ decode OPCODE default Unknown::unknown() {
                xc->syscall();
            }}, IsNonSpeculative);
            // Read uniq reg into ABI return value register (r0)
-           0x9e: rduniq({{ R0 = Runiq; }});
+           0x9e: rduniq({{ R0 = Runiq; }}, IsNonSpeculative);
            // Write uniq reg with value from ABI arg register (r16)
-           0x9f: wruniq({{ Runiq = R16; }});
+           0x9f: wruniq({{ Runiq = R16; }}, IsNonSpeculative);
        }
     }
 #endif
@@ -2565,7 +2566,7 @@ decode OPCODE default Unknown::unknown() {
     }
 
     format BasicOperate {
-       0x1e: hw_rei({{ xc->hwrei(); }});
+       0x1e: hw_rei({{ xc->hwrei(); }}, IsSerializing);
 
        // M5 special opcodes use the reserved 0x01 opcode space
        0x01: decode M5FUNC {