From 4599bddadd22fde723da3ce11e0c0b6772d76398 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: [sim] renamed sllv to sll (same for other shifts)

---
 inst.v          | 12 ++++++------
 instr-table.tex | 12 ++++++------
 opcodes         | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/inst.v b/inst.v
index aaa9854..6451263 100644
--- a/inst.v
+++ b/inst.v
@@ -25,9 +25,9 @@
 `define OR         32'b1110101_?????_?????_0000000101_?????
 `define XOR        32'b1110101_?????_?????_0000000110_?????
 `define NOR        32'b1110101_?????_?????_0000000111_?????
-`define SLLV       32'b1110101_?????_?????_1110000010_?????
-`define SRLV       32'b1110101_?????_?????_1110000100_?????
-`define SRAV       32'b1110101_?????_?????_1110000110_?????
+`define SLL        32'b1110101_?????_?????_1110000010_?????
+`define SRL        32'b1110101_?????_?????_1110000100_?????
+`define SRA        32'b1110101_?????_?????_1110000110_?????
 `define MUL        32'b1110101_?????_?????_0010000000_?????
 `define MULH       32'b1110101_?????_?????_0010000010_?????
 `define MULHU      32'b1110101_?????_?????_0010000011_?????
@@ -41,9 +41,9 @@
 `define SRAIW      32'b1110110_00000_?????_1110_0_?????_00000
 `define ADDW       32'b1110111_?????_?????_0000000000_?????
 `define SUBW       32'b1110111_?????_?????_0000000001_?????
-`define SLLVW      32'b1110111_?????_?????_1110000010_?????
-`define SRLVW      32'b1110111_?????_?????_1110000100_?????
-`define SRAVW      32'b1110111_?????_?????_1110000110_?????
+`define SLLW       32'b1110111_?????_?????_1110000010_?????
+`define SRLW       32'b1110111_?????_?????_1110000100_?????
+`define SRAW       32'b1110111_?????_?????_1110000110_?????
 `define MULW       32'b1110111_?????_?????_0010000000_?????
 `define MULHW      32'b1110111_?????_?????_0010000010_?????
 `define MULHUW     32'b1110111_?????_?????_0010000011_?????
diff --git a/instr-table.tex b/instr-table.tex
index 065007a..e7b0bcd 100644
--- a/instr-table.tex
+++ b/instr-table.tex
@@ -696,7 +696,7 @@
 \multicolumn{1}{c|}{xa} &
 \multicolumn{1}{c|}{xb} &
 \multicolumn{4}{c|}{1110000010} &
-\multicolumn{1}{c|}{xc} & SLLV xc,xb,xa \\
+\multicolumn{1}{c|}{xc} & SLL xc,xb,xa \\
 \cline{2-10}
   
 
@@ -705,7 +705,7 @@
 \multicolumn{1}{c|}{xa} &
 \multicolumn{1}{c|}{xb} &
 \multicolumn{4}{c|}{1110000100} &
-\multicolumn{1}{c|}{xc} & SRLV xc,xb,xa \\
+\multicolumn{1}{c|}{xc} & SRL xc,xb,xa \\
 \cline{2-10}
   
 
@@ -714,7 +714,7 @@
 \multicolumn{1}{c|}{xa} &
 \multicolumn{1}{c|}{xb} &
 \multicolumn{4}{c|}{1110000110} &
-\multicolumn{1}{c|}{xc} & SRAV xc,xb,xa \\
+\multicolumn{1}{c|}{xc} & SRA xc,xb,xa \\
 \cline{2-10}
   
 
@@ -853,7 +853,7 @@
 \multicolumn{1}{c|}{xa} &
 \multicolumn{1}{c|}{xb} &
 \multicolumn{4}{c|}{1110000010} &
-\multicolumn{1}{c|}{xc} & SLLVW xc,xb,xa \\
+\multicolumn{1}{c|}{xc} & SLLW xc,xb,xa \\
 \cline{2-10}
   
 
@@ -862,7 +862,7 @@
 \multicolumn{1}{c|}{xa} &
 \multicolumn{1}{c|}{xb} &
 \multicolumn{4}{c|}{1110000100} &
-\multicolumn{1}{c|}{xc} & SRLVW xc,xb,xa \\
+\multicolumn{1}{c|}{xc} & SRLW xc,xb,xa \\
 \cline{2-10}
   
 
@@ -871,7 +871,7 @@
 \multicolumn{1}{c|}{xa} &
 \multicolumn{1}{c|}{xb} &
 \multicolumn{4}{c|}{1110000110} &
-\multicolumn{1}{c|}{xc} & SRAVW xc,xb,xa \\
+\multicolumn{1}{c|}{xc} & SRAW xc,xb,xa \\
 \cline{2-10}
   
 
diff --git a/opcodes b/opcodes
index 44cab0c..e04f866 100644
--- a/opcodes
+++ b/opcodes
@@ -38,9 +38,9 @@ and     31..25=0x75 14..12=0 11..5=4 xc xb xa
 or      31..25=0x75 14..12=0 11..5=5 xc xb xa
 xor     31..25=0x75 14..12=0 11..5=6 xc xb xa
 nor     31..25=0x75 14..12=0 11..5=7 xc xb xa
-sllv    31..25=0x75 14..12=7 11..6=1 5=0 xc xb xa
-srlv    31..25=0x75 14..12=7 11..6=2 5=0 xc xb xa
-srav    31..25=0x75 14..12=7 11..6=3 5=0 xc xb xa
+sll    31..25=0x75 14..12=7 11..6=1 5=0 xc xb xa
+srl    31..25=0x75 14..12=7 11..6=2 5=0 xc xb xa
+sra    31..25=0x75 14..12=7 11..6=3 5=0 xc xb xa
 
 mul     31..25=0x75 14..12=1 11..5=0 xc xb xa
 mulh    31..25=0x75 14..12=1 11..5=2 xc xb xa
@@ -59,9 +59,9 @@ sraiw   31..25=0x76 14..12=7 11..6=3 5=0 xa xb shamtw
 
 addw    31..25=0x77 14..12=0 11..5=0 xc xb xa
 subw    31..25=0x77 14..12=0 11..5=1 xc xb xa
-sllvw   31..25=0x77 14..12=7 11..6=1 5=0 xc xb xa
-srlvw   31..25=0x77 14..12=7 11..6=2 5=0 xc xb xa
-sravw   31..25=0x77 14..12=7 11..6=3 5=0 xc xb xa
+sllw   31..25=0x77 14..12=7 11..6=1 5=0 xc xb xa
+srlw   31..25=0x77 14..12=7 11..6=2 5=0 xc xb xa
+sraw   31..25=0x77 14..12=7 11..6=3 5=0 xc xb xa
 
 mulw    31..25=0x77 14..12=1 11..5=0 xc xb xa
 mulhw   31..25=0x77 14..12=1 11..5=2 xc xb xa
-- 
cgit v1.1