Rename sext/zext instructions

Author: koute

crates/polkavm-common/src/assembler.rs

@@ -447,9 +447,9 @@ pub fn assemble(code: &str) -> Result<Vec<u8>, String> {
                             ("clz", OpMarker::NONE) => Some(Instruction::count_leading_zero_bits_64 as F),
                             ("ctz", OpMarker::I32) => Some(Instruction::count_trailing_zero_bits_32 as F),
                             ("ctz", OpMarker::NONE) => Some(Instruction::count_trailing_zero_bits_64 as F),
-                            ("sext.b", _) => Some(Instruction::sign_extend_8 as F),
-                            ("sext.h", _) => Some(Instruction::sign_extend_16 as F),
-                            ("zext.h", _) => Some(Instruction::zero_extend_16 as F),
+                            ("sext8", _) => Some(Instruction::sign_extend_8 as F),
+                            ("sext16", _) => Some(Instruction::sign_extend_16 as F),
+                            ("zext16", _) => Some(Instruction::zero_extend_16 as F),
                             ("reverse", _) => Some(Instruction::reverse_byte as F),
                             _ => None,
                         };

crates/polkavm-common/src/program.rs

@@ -2516,19 +2516,19 @@ impl<'a, 'b, 'c> InstructionVisitor for InstructionFormatter<'a, 'b, 'c> {
     fn sign_extend_8(&mut self, d: RawReg, s: RawReg) -> Self::ReturnTy {
         let d = self.format_reg(d);
         let s = self.format_reg(s);
-        write!(self, "{d} = sext.b {s}")
+        write!(self, "{d} = sext8 {s}")
     }
 
     fn sign_extend_16(&mut self, d: RawReg, s: RawReg) -> Self::ReturnTy {
         let d = self.format_reg(d);
         let s = self.format_reg(s);
-        write!(self, "{d} = sext.h {s}")
+        write!(self, "{d} = sext16 {s}")
     }
 
     fn zero_extend_16(&mut self, d: RawReg, s: RawReg) -> Self::ReturnTy {
         let d = self.format_reg(d);
         let s = self.format_reg(s);
-        write!(self, "{d} = zext.h {s}")
+        write!(self, "{d} = zext16 {s}")
     }
 
     fn reverse_byte(&mut self, d: RawReg, s: RawReg) -> Self::ReturnTy {

tools/spectool/spec/src/inst_sign_extend_16.txt

@@ -2,7 +2,7 @@ pre: a0 = 0xaaaa
 pre: gas = 10000
 
 pub @main:
-    a2 = sext.h a0
+    a2 = sext16 a0
 
 post: a2 = 0xffffffffffffaaaa
 post: gas = 9998

tools/spectool/spec/src/inst_sign_extend_8.txt

@@ -2,7 +2,7 @@ pre: a0 = 0xaa
 pre: gas = 10000
 
 pub @main:
-    a2 = sext.b a0
+    a2 = sext8 a0
 
 post: a2 = 0xffffffffffffffaa
 post: gas = 9998

tools/spectool/spec/src/inst_zero_extend_16.txt

@@ -2,7 +2,7 @@ pre: a0 = 0xaaaa
 pre: gas = 10000
 
 pub @main:
-    a2 = zext.h a0
+    a2 = zext16 a0
 
 post: a2 = 0x00000000aaaa
 post: gas = 9998