From 19b59dd9a00e6cd68e4f81a116d400289e513402 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@s141.Millennium.Berkeley.EDU>
Date: Sun, 12 Sep 2010 19:13:48 -0700
Subject: [PATCH] [sim] renamed sllv to sll (same for other shifts)

---
 riscv/execute.h                 | 58 ++++++++++++++++-----------------
 riscv/insns/{sllv.h => sll.h}   |  0
 riscv/insns/{sllvw.h => sllw.h} |  0
 riscv/insns/{srav.h => sra.h}   |  0
 riscv/insns/{sravw.h => sraw.h} |  0
 riscv/insns/{srlv.h => srl.h}   |  0
 riscv/insns/{srlvw.h => srlw.h} |  0
 7 files changed, 29 insertions(+), 29 deletions(-)
 rename riscv/insns/{sllv.h => sll.h} (100%)
 rename riscv/insns/{sllvw.h => sllw.h} (100%)
 rename riscv/insns/{srav.h => sra.h} (100%)
 rename riscv/insns/{sravw.h => sraw.h} (100%)
 rename riscv/insns/{srlv.h => srl.h} (100%)
 rename riscv/insns/{srlvw.h => srlw.h} (100%)

diff --git a/riscv/execute.h b/riscv/execute.h
index f1374b5..2a168ea 100644
--- a/riscv/execute.h
+++ b/riscv/execute.h
@@ -236,11 +236,6 @@ switch((insn.bits >> 0x19) & 0x7f)
           #include "insns/truncu_l_d.h"
           break;
         }
-        if((insn.bits & 0xfe007fe0) == 0xd0006040)
-        {
-          #include "insns/mul_d.h"
-          break;
-        }
         if((insn.bits & 0xfe007fe0) == 0xd0006020)
         {
           #include "insns/sub_d.h"
@@ -266,6 +261,11 @@ switch((insn.bits >> 0x19) & 0x7f)
           #include "insns/truncu_w_d.h"
           break;
         }
+        if((insn.bits & 0xfe007fe0) == 0xd0006040)
+        {
+          #include "insns/mul_d.h"
+          break;
+        }
         if((insn.bits & 0xfe007fe0) == 0xd0006840)
         {
           #include "insns/c_lt_d.h"
@@ -317,14 +317,14 @@ switch((insn.bits >> 0x19) & 0x7f)
     {
       case 0x0:
       {
-        if((insn.bits & 0xfe0fffe0) == 0xd4000800)
+        if((insn.bits & 0xfe0fffe0) == 0xd4000000)
         {
-          #include "insns/mtf_s.h"
+          #include "insns/mff_s.h"
           break;
         }
-        if((insn.bits & 0xfe0fffe0) == 0xd4000000)
+        if((insn.bits & 0xfe0fffe0) == 0xd4000800)
         {
-          #include "insns/mff_s.h"
+          #include "insns/mtf_s.h"
           break;
         }
         #include "insns/unimp.h"
@@ -371,14 +371,14 @@ switch((insn.bits >> 0x19) & 0x7f)
           #include "insns/nmadd_s.h"
           break;
         }
-        if((insn.bits & 0xfe007c00) == 0xd6000400)
+        if((insn.bits & 0xfe007c00) == 0xd6000c00)
         {
-          #include "insns/msub_s.h"
+          #include "insns/nmsub_s.h"
           break;
         }
-        if((insn.bits & 0xfe007c00) == 0xd6000c00)
+        if((insn.bits & 0xfe007c00) == 0xd6000400)
         {
-          #include "insns/nmsub_s.h"
+          #include "insns/msub_s.h"
           break;
         }
         if((insn.bits & 0xfe007c00) == 0xd6000000)
@@ -541,6 +541,11 @@ switch((insn.bits >> 0x19) & 0x7f)
           #include "insns/nor.h"
           break;
         }
+        if((insn.bits & 0xfe007fe0) == 0xea000060)
+        {
+          #include "insns/sltu.h"
+          break;
+        }
         if((insn.bits & 0xfe007fe0) == 0xea0000c0)
         {
           #include "insns/xor.h"
@@ -561,11 +566,6 @@ switch((insn.bits >> 0x19) & 0x7f)
           #include "insns/slt.h"
           break;
         }
-        if((insn.bits & 0xfe007fe0) == 0xea000060)
-        {
-          #include "insns/sltu.h"
-          break;
-        }
         if((insn.bits & 0xfe007fe0) == 0xea000080)
         {
           #include "insns/and.h"
@@ -614,19 +614,19 @@ switch((insn.bits >> 0x19) & 0x7f)
       }
       case 0x7:
       {
-        if((insn.bits & 0xfe007fe0) == 0xea007080)
+        if((insn.bits & 0xfe007fe0) == 0xea0070c0)
         {
-          #include "insns/srlv.h"
+          #include "insns/sra.h"
           break;
         }
-        if((insn.bits & 0xfe007fe0) == 0xea0070c0)
+        if((insn.bits & 0xfe007fe0) == 0xea007080)
         {
-          #include "insns/srav.h"
+          #include "insns/srl.h"
           break;
         }
         if((insn.bits & 0xfe007fe0) == 0xea007040)
         {
-          #include "insns/sllv.h"
+          #include "insns/sll.h"
           break;
         }
         #include "insns/unimp.h"
@@ -732,19 +732,19 @@ switch((insn.bits >> 0x19) & 0x7f)
       }
       case 0x7:
       {
-        if((insn.bits & 0xfe007fe0) == 0xee0070c0)
+        if((insn.bits & 0xfe007fe0) == 0xee007080)
         {
-          #include "insns/sravw.h"
+          #include "insns/srlw.h"
           break;
         }
-        if((insn.bits & 0xfe007fe0) == 0xee007040)
+        if((insn.bits & 0xfe007fe0) == 0xee0070c0)
         {
-          #include "insns/sllvw.h"
+          #include "insns/sraw.h"
           break;
         }
-        if((insn.bits & 0xfe007fe0) == 0xee007080)
+        if((insn.bits & 0xfe007fe0) == 0xee007040)
         {
-          #include "insns/srlvw.h"
+          #include "insns/sllw.h"
           break;
         }
         #include "insns/unimp.h"
diff --git a/riscv/insns/sllv.h b/riscv/insns/sll.h
similarity index 100%
rename from riscv/insns/sllv.h
rename to riscv/insns/sll.h
diff --git a/riscv/insns/sllvw.h b/riscv/insns/sllw.h
similarity index 100%
rename from riscv/insns/sllvw.h
rename to riscv/insns/sllw.h
diff --git a/riscv/insns/srav.h b/riscv/insns/sra.h
similarity index 100%
rename from riscv/insns/srav.h
rename to riscv/insns/sra.h
diff --git a/riscv/insns/sravw.h b/riscv/insns/sraw.h
similarity index 100%
rename from riscv/insns/sravw.h
rename to riscv/insns/sraw.h
diff --git a/riscv/insns/srlv.h b/riscv/insns/srl.h
similarity index 100%
rename from riscv/insns/srlv.h
rename to riscv/insns/srl.h
diff --git a/riscv/insns/srlvw.h b/riscv/insns/srlw.h
similarity index 100%
rename from riscv/insns/srlvw.h
rename to riscv/insns/srlw.h
-- 
2.30.2