From e091d4f4a892af59e47532078f82a0628c55709e Mon Sep 17 00:00:00 2001
From: Yunsup Lee <yunsup@cs.berkeley.edu>
Date: Sun, 15 May 2011 22:53:52 -0700
Subject: [opcodes,pk,sim,xcc] resolve a conflict

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

diff --git a/inst.v b/inst.v
index bc5bce0..9a644b3 100644
--- a/inst.v
+++ b/inst.v
@@ -92,10 +92,10 @@
 `define FENCE_G_CV 32'b?????_?????_????????????_111_0101111
 `define STOP       32'b00000_00000_00000_0000000010_1110111
 `define UTIDX      32'b?????_00000_00000_0000000011_1110111
-`define MOVZ       32'b?????_?????_?????_0000000100_1110111
-`define MOVN       32'b?????_?????_?????_0000000101_1110111
-`define FMOVZ      32'b?????_?????_?????_0000000110_1110111
-`define FMOVN      32'b?????_?????_?????_0000000111_1110111
+`define MOVZ       32'b?????_?????_?????_0000000101_1110111
+`define MOVN       32'b?????_?????_?????_0000001101_1110111
+`define FMOVZ      32'b?????_?????_?????_0000010101_1110111
+`define FMOVN      32'b?????_?????_?????_0000011101_1110111
 `define EI         32'b?????_00000_00000_0000000000_1111011
 `define DI         32'b?????_00000_00000_0000000001_1111011
 `define MFPCR      32'b?????_00000_?????_0000000010_1111011
diff --git a/instr-table.tex b/instr-table.tex
index ee84667..241c769 100644
--- a/instr-table.tex
+++ b/instr-table.tex
@@ -2075,7 +2075,7 @@
 \multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{100} &
+\multicolumn{2}{c|}{101} &
 \multicolumn{1}{c|}{1110111} & MOVZ rd,rs1,rs2 \\
 \cline{2-11}
   
@@ -2084,7 +2084,7 @@
 \multicolumn{1}{|c|}{rd} &
 \multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
+\multicolumn{4}{c|}{0000001} &
 \multicolumn{2}{c|}{101} &
 \multicolumn{1}{c|}{1110111} & MOVN rd,rs1,rs2 \\
 \cline{2-11}
@@ -2094,8 +2094,8 @@
 \multicolumn{1}{|c|}{rd} &
 \multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{110} &
+\multicolumn{4}{c|}{0000010} &
+\multicolumn{2}{c|}{101} &
 \multicolumn{1}{c|}{1110111} & FMOVZ rd,rs1,rs2 \\
 \cline{2-11}
   
@@ -2104,8 +2104,8 @@
 \multicolumn{1}{|c|}{rd} &
 \multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{111} &
+\multicolumn{4}{c|}{0000011} &
+\multicolumn{2}{c|}{101} &
 \multicolumn{1}{c|}{1110111} & FMOVN rd,rs1,rs2 \\
 \cline{2-11}
   
diff --git a/opcodes b/opcodes
index b7b646a..b559429 100644
--- a/opcodes
+++ b/opcodes
@@ -120,12 +120,12 @@ fence.l.cv  rd rs1 imm12 9..7=6 6..2=0x0B 1..0=3
 fence.g.cv  rd rs1 imm12 9..7=7 6..2=0x0B 1..0=3
 
 # vector scalar instructions
-stop    31..27=0 26..22=0 21..17=0 16..7=2 6..2=0x1D 1..0=3
-utidx   rd       26..22=0 21..17=0 16..7=3 6..2=0x1D 1..0=3
-movz    rd       rs1      rs2      16..7=4 6..2=0x1D 1..0=3
-movn    rd       rs1      rs2      16..7=5 6..2=0x1D 1..0=3
-fmovz   rd       rs1      rs2      16..7=6 6..2=0x1D 1..0=3
-fmovn   rd       rs1      rs2      16..7=7 6..2=0x1D 1..0=3
+stop    31..27=0 26..22=0 21..17=0 16..10=0 9..7=2 6..2=0x1D 1..0=3
+utidx   rd       26..22=0 21..17=0 16..10=0 9..7=3 6..2=0x1D 1..0=3
+movz    rd       rs1      rs2      16..10=0 9..7=5 6..2=0x1D 1..0=3
+movn    rd       rs1      rs2      16..10=1 9..7=5 6..2=0x1D 1..0=3
+fmovz   rd       rs1      rs2      16..10=2 9..7=5 6..2=0x1D 1..0=3
+fmovn   rd       rs1      rs2      16..10=3 9..7=5 6..2=0x1D 1..0=3
 
 ei      rd       26..22=0 21..17=0 16..7=0 6..2=0x1E 1..0=3
 di      rd       26..22=0 21..17=0 16..7=1 6..2=0x1E 1..0=3
-- 
cgit v1.2.3