Changed the sign extension function from mine to the provided one. Mine relied on implementation specific behavior, namely right shifting a signed value.

--HG--
extra : convert_revision : 4f5ef44d012de87919ad681024fe2ed0213a412f

2 files changed, 6 insertions, 6 deletions

diff --git a/src/arch/sparc/isa/formats/branch.isa b/src/arch/sparc/isa/formats/branch.isa
index 2c206354b..5fb7ade2d 100644
--- a/src/arch/sparc/isa/formats/branch.isa
+++ b/src/arch/sparc/isa/formats/branch.isa
@@ -80,7 +80,7 @@ output header {{
                     OpClass __opClass) :
                 BranchDisp(mnem, _machInst, __opClass)
             {
-                disp = sign_ext(_machInst << 2, bits + 2);
+                disp = sext<bits + 2>((_machInst & mask(bits)) << 2);
             }
         };
 
@@ -95,7 +95,7 @@ output header {{
                     OpClass __opClass) :
                 BranchDisp(mnem, _machInst, __opClass)
             {
-                disp = sign_ext((D16HI << 16) | (D16LO << 2), 18);
+                disp = sext<18>((D16HI << 16) | (D16LO << 2));
             }
         };
 
@@ -108,7 +108,7 @@ output header {{
           protected:
             // Constructor
             BranchImm13(const char *mnem, MachInst _machInst, OpClass __opClass) :
-                Branch(mnem, _machInst, __opClass), imm(sign_ext(SIMM13, 13))
+                Branch(mnem, _machInst, __opClass), imm(sext<13>(SIMM13))
             {
             }
 
diff --git a/src/arch/sparc/isa/formats/integerop.isa b/src/arch/sparc/isa/formats/integerop.isa
index 83c7e6958..0304a1064 100644
--- a/src/arch/sparc/isa/formats/integerop.isa
+++ b/src/arch/sparc/isa/formats/integerop.isa
@@ -87,7 +87,7 @@ output header {{
                     OpClass __opClass) :
                 IntOpImm(mnem, _machInst, __opClass)
             {
-                imm = sign_ext(SIMM10, 10);
+                imm = sext<10>(SIMM10);
             }
         };
 
@@ -102,7 +102,7 @@ output header {{
                     OpClass __opClass) :
                 IntOpImm(mnem, _machInst, __opClass)
             {
-                imm = sign_ext(SIMM11, 11);
+                imm = sext<11>(SIMM11);
             }
         };
 
@@ -117,7 +117,7 @@ output header {{
                     OpClass __opClass) :
                 IntOpImm(mnem, _machInst, __opClass)
             {
-                imm = sign_ext(SIMM13, 13);
+                imm = sext<13>(SIMM13);
             }
         };