diff --git a/riscv/execute.h b/riscv/execute.h
index 4715b7fc..242786fe 100644
--- a/riscv/execute.h
+++ b/riscv/execute.h
@@ -728,7 +728,7 @@ switch((insn.bits >> 0x19) & 0x7f)
       }
       case 0x5:
       {
-        if((insn.bits & 0xfff07c00) == 0xea005000)
+        if((insn.bits & 0xfff07800) == 0xea005000)
         {
           #include "insns/sll.h"
           break;
@@ -737,7 +737,7 @@ switch((insn.bits >> 0x19) & 0x7f)
       }
       case 0x6:
       {
-        if((insn.bits & 0xfff07c00) == 0xea006000)
+        if((insn.bits & 0xfff07800) == 0xea006000)
         {
           #include "insns/srl.h"
           break;
@@ -746,7 +746,7 @@ switch((insn.bits >> 0x19) & 0x7f)
       }
       case 0x7:
       {
-        if((insn.bits & 0xfff07c00) == 0xea007000)
+        if((insn.bits & 0xfff07800) == 0xea007000)
         {
           #include "insns/sra.h"
           break;
@@ -843,11 +843,6 @@ switch((insn.bits >> 0x19) & 0x7f)
           #include "insns/sllw.h"
           break;
         }
-        if((insn.bits & 0xfff07c00) == 0xec005400)
-        {
-          #include "insns/sll32.h"
-          break;
-        }
         #include "insns/unimp.h"
       }
       case 0x6:
@@ -857,20 +852,10 @@ switch((insn.bits >> 0x19) & 0x7f)
           #include "insns/srlw.h"
           break;
         }
-        if((insn.bits & 0xfff07c00) == 0xec006400)
-        {
-          #include "insns/srl32.h"
-          break;
-        }
         #include "insns/unimp.h"
       }
       case 0x7:
       {
-        if((insn.bits & 0xfff07c00) == 0xec007400)
-        {
-          #include "insns/sra32.h"
-          break;
-        }
         if((insn.bits & 0xfff07c00) == 0xec007000)
         {
           #include "insns/sraw.h"
diff --git a/riscv/insns/sll32.h b/riscv/insns/sll32.h
deleted file mode 100644
index cfd9ba35..00000000
--- a/riscv/insns/sll32.h
+++ /dev/null
@@ -1,2 +0,0 @@
-require64;
-RC = RB << (32+SHAMT);
diff --git a/riscv/insns/sra32.h b/riscv/insns/sra32.h
deleted file mode 100644
index 001e3bdf..00000000
--- a/riscv/insns/sra32.h
+++ /dev/null
@@ -1,2 +0,0 @@
-require64;
-RC = sreg_t(RB) >> (32+SHAMT);
diff --git a/riscv/insns/srl32.h b/riscv/insns/srl32.h
deleted file mode 100644
index 5d52dea7..00000000
--- a/riscv/insns/srl32.h
+++ /dev/null
@@ -1,2 +0,0 @@
-require64;
-RC = RB >> (32+SHAMT);