1 files changed, 10 insertions, 10 deletions

diff --git a/arch/sparc/isa/formats/integerop.isa b/arch/sparc/isa/formats/integerop.isa
index 2c2123f86..f14f9e858 100644
--- a/arch/sparc/isa/formats/integerop.isa
+++ b/arch/sparc/isa/formats/integerop.isa
@@ -37,7 +37,7 @@ output header {{
             {
             }
 
-            uint32_t imm;
+            int32_t imm;
 
             std::string generateDisassembly(Addr pc,
                 const SymbolTable *symtab) const;
@@ -57,7 +57,7 @@ output header {{
                     OpClass __opClass) :
                 IntOpImm(mnem, _machInst, __opClass)
             {
-                imm = SIMM10;
+                imm = sign_ext(SIMM10, 10);
             }
         };
 
@@ -72,7 +72,7 @@ output header {{
                     OpClass __opClass) :
                 IntOpImm(mnem, _machInst, __opClass)
             {
-                imm = SIMM13;
+                imm = sign_ext(SIMM13, 13);
             }
         };
 
@@ -195,7 +195,7 @@ output decoder {{
             if(!printPseudoOps(response, pc, symtab))
             {
                 printMnemonic(response, mnemonic);
-                if (_numSrcRegs > 1)
+                if (_numSrcRegs > 0)
                 {
                     printReg(response, _srcRegIdx[0]);
                     for(int x = 1; x < _numSrcRegs - 1; x++)
@@ -254,14 +254,14 @@ let {{
     def doIntFormat(code, ccCode, name, Name, opt_flags):
         (usesImm, code, immCode,
          rString, iString) = splitOutImm(code)
-        iop = genCompositeIop(code, name, Name,
-                'IntOp', opt_flags, cc_code=ccCode)
+        iop = InstObjParams(name, Name,	'IntOp', code,
+                opt_flags, ("cc_code", ccCode))
         header_output = BasicDeclare.subst(iop)
         decoder_output = BasicConstructor.subst(iop)
         exec_output = IntOpExecute.subst(iop)
         if usesImm:
-            imm_iop = genCompositeIop(code, name, Name + 'Imm',
-                    'IntOpImm' + iString, opt_flags, cc_code=ccCode)
+            imm_iop = InstObjParams(name, Name + 'Imm', 'IntOpImm' + iString,
+                    immCode, opt_flags, ("cc_code", ccCode))
             header_output += BasicDeclare.subst(imm_iop)
             decoder_output += BasicConstructor.subst(imm_iop)
             exec_output += IntOpExecute.subst(imm_iop)
@@ -316,8 +316,8 @@ def format IntOpCcRes(code, *opt_flags) {{
 }};
 
 def format SetHi(code, *opt_flags) {{
-    iop = genCompositeIop(code, name, Name, 'SetHi',
-            opt_flags, cc_code='')
+    iop = InstObjParams(name, Name, 'SetHi',
+            code, opt_flags, ("cc_code", ''))
     header_output = BasicDeclare.subst(iop)
     decoder_output = BasicConstructor.subst(iop)
     exec_output = IntOpExecute.subst(iop)