diff --git a/riscv/insns/srai.h b/riscv/insns/srai.h
index 18fc55bf..bb17d276 100644
--- a/riscv/insns/srai.h
+++ b/riscv/insns/srai.h
@@ -4,5 +4,5 @@ else
 {
   if(SHAMT & 0x20)
     throw trap_illegal_instruction;
-  RD = sext32(sreg_t(RS1) >> SHAMT);
+  RD = sext32(int32_t(RS1) >> SHAMT);
 }
diff --git a/riscv/insns/sraiw.h b/riscv/insns/sraiw.h
index 42d0fc38..4c567300 100644
--- a/riscv/insns/sraiw.h
+++ b/riscv/insns/sraiw.h
@@ -1,2 +1,2 @@
 require_xpr64;
-RD = sext32(sreg_t(RS1) >> SHAMTW);
+RD = sext32(int32_t(RS1) >> SHAMTW);