From 40c524172fdddcd9562adbc28f7f2457940df814 Mon Sep 17 00:00:00 2001
From: Yunsup Lee <yunsup@cs.berkeley.edu>
Date: Tue, 5 Oct 2010 15:54:32 -0700
Subject: [opcodes] update parse-opcodes

---
 inst.v          |   4 +-
 instr-table.tex | 596 +++++++++++++++++++++++++++-----------------------------
 parse-opcodes   |  40 ++--
 3 files changed, 311 insertions(+), 329 deletions(-)

diff --git a/inst.v b/inst.v
index a9b70fa..b5df390 100644
--- a/inst.v
+++ b/inst.v
@@ -140,8 +140,8 @@
 `define MTFLH_D    32'b1101010_?????_?????_1110011001_?????
 `define MTF_S      32'b1101010_00000_?????_0010111001_?????
 `define MTF_D      32'b1101010_00000_?????_1110111001_?????
-`define L_S        32'b1101000_00000_?????_0100000000_00000
-`define L_D        32'b1101000_00000_?????_0110000000_00000
+`define L_S        32'b1101000_?????_?????_010_????????????
+`define L_D        32'b1101000_?????_?????_011_????????????
 `define S_S        32'b1101001_00000_?????_010_????????????
 `define S_D        32'b1101001_00000_?????_011_????????????
 `define MADD_S     32'b1101011_?????_?????_00000_?????_?????
diff --git a/instr-table.tex b/instr-table.tex
index 7c847bb..37b8d2a 100644
--- a/instr-table.tex
+++ b/instr-table.tex
@@ -32,37 +32,37 @@
 \cline{2-10}
 &
 \multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{6}{c|}{LUI-immediate} & LUI-type \\
 \cline{2-10}
 &
 \multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
+\multicolumn{1}{c|}{rdi} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{funct3} &
 \multicolumn{4}{c|}{immediate} & I-type \\
 \cline{2-10}
 &
 \multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
+\multicolumn{1}{c|}{rdi} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{3}{c|}{funct9} &
 \multicolumn{2}{c|}{shamt} & ISH-type \\
 \cline{2-10}
 &
 \multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
+\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{4}{c|}{funct10} &
-\multicolumn{1}{c|}{rc} & R-type \\
+\multicolumn{1}{c|}{rdr} & R-type \\
 \cline{2-10}
 &
 \multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
+\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{2}{c|}{funct5} &
-\multicolumn{2}{c|}{rd} &
-\multicolumn{1}{c|}{rc} & R4-type \\
+\multicolumn{2}{c|}{rs3} &
+\multicolumn{1}{c|}{rdr} & R4-type \\
 \cline{2-10}
   
 
@@ -126,8 +126,8 @@
 
 &
 \multicolumn{2}{|c|}{1110011} &
-\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{000} &
 \multicolumn{4}{c|}{imm12} & BEQ rs1,rs2,imm12 \\
 \cline{2-10}
@@ -135,8 +135,8 @@
 
 &
 \multicolumn{2}{|c|}{1110011} &
-\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{001} &
 \multicolumn{4}{c|}{imm12} & BNE rs1,rs2,imm12 \\
 \cline{2-10}
@@ -144,8 +144,8 @@
 
 &
 \multicolumn{2}{|c|}{1110011} &
-\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{100} &
 \multicolumn{4}{c|}{imm12} & BLT rs1,rs2,imm12 \\
 \cline{2-10}
@@ -153,8 +153,8 @@
 
 &
 \multicolumn{2}{|c|}{1110011} &
-\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{101} &
 \multicolumn{4}{c|}{imm12} & BGE rs1,rs2,imm12 \\
 \cline{2-10}
@@ -162,8 +162,8 @@
 
 &
 \multicolumn{2}{|c|}{1110011} &
-\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{110} &
 \multicolumn{4}{c|}{imm12} & BLTU rs1,rs2,imm12 \\
 \cline{2-10}
@@ -171,8 +171,8 @@
 
 &
 \multicolumn{2}{|c|}{1110011} &
-\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{111} &
 \multicolumn{4}{c|}{imm12} & BGEU rs1,rs2,imm12 \\
 \cline{2-10}
@@ -187,8 +187,8 @@
 
 &
 \multicolumn{2}{|c|}{1111000} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{000} &
 \multicolumn{4}{c|}{imm12} & LB rdi,rs1,imm12 \\
 \cline{2-10}
@@ -196,8 +196,8 @@
 
 &
 \multicolumn{2}{|c|}{1111000} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{001} &
 \multicolumn{4}{c|}{imm12} & LH rdi,rs1,imm12 \\
 \cline{2-10}
@@ -205,8 +205,8 @@
 
 &
 \multicolumn{2}{|c|}{1111000} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{010} &
 \multicolumn{4}{c|}{imm12} & LW rdi,rs1,imm12 \\
 \cline{2-10}
@@ -214,8 +214,8 @@
 
 &
 \multicolumn{2}{|c|}{1111000} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{011} &
 \multicolumn{4}{c|}{imm12} & LD rdi,rs1,imm12 \\
 \cline{2-10}
@@ -223,8 +223,8 @@
 
 &
 \multicolumn{2}{|c|}{1111000} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{100} &
 \multicolumn{4}{c|}{imm12} & LBU rdi,rs1,imm12 \\
 \cline{2-10}
@@ -232,8 +232,8 @@
 
 &
 \multicolumn{2}{|c|}{1111000} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{101} &
 \multicolumn{4}{c|}{imm12} & LHU rdi,rs1,imm12 \\
 \cline{2-10}
@@ -241,8 +241,8 @@
 
 &
 \multicolumn{2}{|c|}{1111000} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{110} &
 \multicolumn{4}{c|}{imm12} & LWU rdi,rs1,imm12 \\
 \cline{2-10}
@@ -250,8 +250,8 @@
 
 &
 \multicolumn{2}{|c|}{1111000} &
-\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{111} &
 \multicolumn{4}{c|}{imm12} & SYNCI rs1,imm12 \\
 \cline{2-10}
@@ -259,8 +259,8 @@
 
 &
 \multicolumn{2}{|c|}{1111001} &
-\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{000} &
 \multicolumn{4}{c|}{imm12} & SB rs2,rs1,imm12 \\
 \cline{2-10}
@@ -268,8 +268,8 @@
 
 &
 \multicolumn{2}{|c|}{1111001} &
-\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{001} &
 \multicolumn{4}{c|}{imm12} & SH rs2,rs1,imm12 \\
 \cline{2-10}
@@ -277,8 +277,8 @@
 
 &
 \multicolumn{2}{|c|}{1111001} &
-\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{010} &
 \multicolumn{4}{c|}{imm12} & SW rs2,rs1,imm12 \\
 \cline{2-10}
@@ -286,8 +286,8 @@
 
 &
 \multicolumn{2}{|c|}{1111001} &
-\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{011} &
 \multicolumn{4}{c|}{imm12} & SD rs2,rs1,imm12 \\
 \cline{2-10}
@@ -485,37 +485,37 @@
 \cline{2-10}
 &
 \multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{6}{c|}{LUI-immediate} & LUI-type \\
 \cline{2-10}
 &
 \multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
+\multicolumn{1}{c|}{rdi} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{funct3} &
 \multicolumn{4}{c|}{immediate} & I-type \\
 \cline{2-10}
 &
 \multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
+\multicolumn{1}{c|}{rdi} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{3}{c|}{funct9} &
 \multicolumn{2}{c|}{shamt} & ISH-type \\
 \cline{2-10}
 &
 \multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
+\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{4}{c|}{funct10} &
-\multicolumn{1}{c|}{rc} & R-type \\
+\multicolumn{1}{c|}{rdr} & R-type \\
 \cline{2-10}
 &
 \multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
+\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{2}{c|}{funct5} &
-\multicolumn{2}{c|}{rd} &
-\multicolumn{1}{c|}{rc} & R4-type \\
+\multicolumn{2}{c|}{rs3} &
+\multicolumn{1}{c|}{rdr} & R4-type \\
 \cline{2-10}
   
 
@@ -528,15 +528,15 @@
 
 &
 \multicolumn{2}{|c|}{1110001} &
-\multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{6}{c|}{imm20} & LUI rdi,imm20 \\
 \cline{2-10}
   
 
 &
 \multicolumn{2}{|c|}{1110100} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{000} &
 \multicolumn{4}{c|}{imm12} & ADDI rdi,rs1,imm12 \\
 \cline{2-10}
@@ -544,8 +544,8 @@
 
 &
 \multicolumn{2}{|c|}{1110100} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{010} &
 \multicolumn{4}{c|}{imm12} & SLTI rdi,rs1,imm12 \\
 \cline{2-10}
@@ -553,8 +553,8 @@
 
 &
 \multicolumn{2}{|c|}{1110100} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{011} &
 \multicolumn{4}{c|}{imm12} & SLTIU rdi,rs1,imm12 \\
 \cline{2-10}
@@ -562,8 +562,8 @@
 
 &
 \multicolumn{2}{|c|}{1110100} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{100} &
 \multicolumn{4}{c|}{imm12} & ANDI rdi,rs1,imm12 \\
 \cline{2-10}
@@ -571,8 +571,8 @@
 
 &
 \multicolumn{2}{|c|}{1110100} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{101} &
 \multicolumn{4}{c|}{imm12} & ORI rdi,rs1,imm12 \\
 \cline{2-10}
@@ -580,8 +580,8 @@
 
 &
 \multicolumn{2}{|c|}{1110100} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{110} &
 \multicolumn{4}{c|}{imm12} & XORI rdi,rs1,imm12 \\
 \cline{2-10}
@@ -785,8 +785,8 @@
 
 &
 \multicolumn{2}{|c|}{1110110} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{000} &
 \multicolumn{4}{c|}{imm12} & ADDIW rdi,rs1,imm12 \\
 \cline{2-10}
@@ -971,37 +971,37 @@
 \cline{2-10}
 &
 \multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{6}{c|}{LUI-immediate} & LUI-type \\
 \cline{2-10}
 &
 \multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
+\multicolumn{1}{c|}{rdi} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{funct3} &
 \multicolumn{4}{c|}{immediate} & I-type \\
 \cline{2-10}
 &
 \multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
+\multicolumn{1}{c|}{rdi} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{3}{c|}{funct9} &
 \multicolumn{2}{c|}{shamt} & ISH-type \\
 \cline{2-10}
 &
 \multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
+\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{4}{c|}{funct10} &
-\multicolumn{1}{c|}{rc} & R-type \\
+\multicolumn{1}{c|}{rdr} & R-type \\
 \cline{2-10}
 &
 \multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
+\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{2}{c|}{funct5} &
-\multicolumn{2}{c|}{rd} &
-\multicolumn{1}{c|}{rc} & R4-type \\
+\multicolumn{2}{c|}{rs3} &
+\multicolumn{1}{c|}{rdr} & R4-type \\
 \cline{2-10}
   
 
@@ -1013,9 +1013,27 @@
   
 
 &
-\multicolumn{2}{|c|}{1101001} &
+\multicolumn{2}{|c|}{1101000} &
+\multicolumn{1}{c|}{rdi} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{010} &
+\multicolumn{4}{c|}{imm12} & L.S rdi,rs1,imm12 \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{1101000} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{011} &
+\multicolumn{4}{c|}{imm12} & L.D rdi,rs1,imm12 \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{1101001} &
 \multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{010} &
 \multicolumn{4}{c|}{imm12} & S.S rs2,rs1,imm12 \\
 \cline{2-10}
@@ -1023,8 +1041,8 @@
 
 &
 \multicolumn{2}{|c|}{1101001} &
-\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
 \multicolumn{1}{c|}{011} &
 \multicolumn{4}{c|}{imm12} & S.D rs2,rs1,imm12 \\
 \cline{2-10}
@@ -1038,207 +1056,137 @@
   
 
 &
-\multicolumn{2}{|c|}{1101011} &
+\multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{2}{c|}{00000} &
-\multicolumn{2}{c|}{rs3} &
-\multicolumn{1}{c|}{rdr} & MADD.S rdr,rs1,rs2,rs3 \\
+\multicolumn{4}{c|}{0000000000} &
+\multicolumn{1}{c|}{rdr} & ADD.S rdr,rs1,rs2 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101011} &
+\multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{2}{c|}{00001} &
-\multicolumn{2}{c|}{rs3} &
-\multicolumn{1}{c|}{rdr} & MSUB.S rdr,rs1,rs2,rs3 \\
+\multicolumn{4}{c|}{0000000001} &
+\multicolumn{1}{c|}{rdr} & SUB.S rdr,rs1,rs2 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101011} &
+\multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{2}{c|}{00010} &
-\multicolumn{2}{c|}{rs3} &
-\multicolumn{1}{c|}{rdr} & NMSUB.S rdr,rs1,rs2,rs3 \\
+\multicolumn{4}{c|}{0000000010} &
+\multicolumn{1}{c|}{rdr} & MUL.S rdr,rs1,rs2 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101011} &
+\multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{2}{c|}{00011} &
-\multicolumn{2}{c|}{rs3} &
-\multicolumn{1}{c|}{rdr} & NMADD.S rdr,rs1,rs2,rs3 \\
+\multicolumn{4}{c|}{0000000011} &
+\multicolumn{1}{c|}{rdr} & DIV.S rdr,rs1,rs2 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101011} &
-\multicolumn{1}{c|}{rs2} &
+\multicolumn{2}{|c|}{1101010} &
+\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{2}{c|}{11000} &
-\multicolumn{2}{c|}{rs3} &
-\multicolumn{1}{c|}{rdr} & MADD.D rdr,rs1,rs2,rs3 \\
+\multicolumn{4}{c|}{0000000100} &
+\multicolumn{1}{c|}{rdr} & SQRT.S rdr,rs1 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101011} &
+\multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{2}{c|}{11001} &
-\multicolumn{2}{c|}{rs3} &
-\multicolumn{1}{c|}{rdr} & MSUB.D rdr,rs1,rs2,rs3 \\
+\multicolumn{4}{c|}{0000000101} &
+\multicolumn{1}{c|}{rdr} & SGNINJ.S rdr,rs1,rs2 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101011} &
+\multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{2}{c|}{11010} &
-\multicolumn{2}{c|}{rs3} &
-\multicolumn{1}{c|}{rdr} & NMSUB.D rdr,rs1,rs2,rs3 \\
+\multicolumn{4}{c|}{0000000110} &
+\multicolumn{1}{c|}{rdr} & SGNINJN.S rdr,rs1,rs2 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101011} &
+\multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{2}{c|}{11011} &
-\multicolumn{2}{c|}{rs3} &
-\multicolumn{1}{c|}{rdr} & NMADD.D rdr,rs1,rs2,rs3 \\
+\multicolumn{4}{c|}{0000000111} &
+\multicolumn{1}{c|}{rdr} & SGNMUL.S rdr,rs1,rs2 \\
 \cline{2-10}
   
 
 &
-\multicolumn{9}{c}{} & \\
-&
-\multicolumn{9}{c}{\bf Floating Point Compare Instructions} & \\
+\multicolumn{2}{|c|}{1101010} &
+\multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{4}{c|}{0000001000} &
+\multicolumn{1}{c|}{rdr} & TRUNC.L.S rdr,rs1 \\
 \cline{2-10}
   
 
-\end{tabular}
-\end{center}
-\end{small}
-
-\label{instr-table}
-\end{table}
-  
-
-\newpage
-
-\begin{table}[p]
-\begin{small}
-\begin{center}
-\begin{tabular}{rcccccccccl}
-                &
-\hspace*{0.6in} &
-\hspace*{0.2in} &
-\hspace*{0.5in} &
-\hspace*{0.5in} &
-\hspace*{0.3in} &
-\hspace*{0.2in} &
-\hspace*{0.4in} &
-\hspace*{0.1in} &
-\hspace*{0.5in} \\
-                      &
-\instbitrange{31}{27} &
-\instbitrange{26}{25} &
-\instbitrange{24}{20} &
-\instbitrange{19}{15} &
-\instbitrange{14}{12} &
-\instbitrange{11}{10} &
-\instbitrange{9}{6} &
-\instbit{5} &
-\instbitrange{4}{0} \\
-\cline{2-10}
-&
-\multicolumn{1}{|c|}{opcode5} &
-\multicolumn{8}{c|}{jump target} & J-type \\
-\cline{2-10}
-&
-\multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{6}{c|}{LUI-immediate} & LUI-type \\
-\cline{2-10}
-&
-\multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
-\multicolumn{1}{c|}{funct3} &
-\multicolumn{4}{c|}{immediate} & I-type \\
-\cline{2-10}
-&
-\multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
-\multicolumn{3}{c|}{funct9} &
-\multicolumn{2}{c|}{shamt} & ISH-type \\
-\cline{2-10}
-&
-\multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
-\multicolumn{4}{c|}{funct10} &
-\multicolumn{1}{c|}{rc} & R-type \\
-\cline{2-10}
 &
-\multicolumn{2}{|c|}{opcode} &
-\multicolumn{1}{c|}{ra} &
-\multicolumn{1}{c|}{rb} &
-\multicolumn{2}{c|}{funct5} &
-\multicolumn{2}{c|}{rd} &
-\multicolumn{1}{c|}{rc} & R4-type \\
+\multicolumn{2}{|c|}{1101010} &
+\multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{4}{c|}{0000001001} &
+\multicolumn{1}{c|}{rdr} & TRUNCU.L.S rdr,rs1 \\
 \cline{2-10}
   
 
 &
-\multicolumn{9}{c}{} & \\
-&
-\multicolumn{9}{c}{\bf Integer/Floating Point Moves\&Conversion Instructions} & \\
+\multicolumn{2}{|c|}{1101010} &
+\multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{4}{c|}{0000001010} &
+\multicolumn{1}{c|}{rdr} & TRUNC.W.S rdr,rs1 \\
 \cline{2-10}
   
 
 &
 \multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000000000} &
-\multicolumn{1}{c|}{rdr} & ADD.S rdr,rs1,rs2 \\
+\multicolumn{4}{c|}{0000001011} &
+\multicolumn{1}{c|}{rdr} & TRUNCU.W.S rdr,rs1 \\
 \cline{2-10}
   
 
 &
 \multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000000001} &
-\multicolumn{1}{c|}{rdr} & SUB.S rdr,rs1,rs2 \\
+\multicolumn{4}{c|}{0000001100} &
+\multicolumn{1}{c|}{rdr} & CVT.S.L rdr,rs1 \\
 \cline{2-10}
   
 
 &
 \multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000000010} &
-\multicolumn{1}{c|}{rdr} & MUL.S rdr,rs1,rs2 \\
+\multicolumn{4}{c|}{0000001101} &
+\multicolumn{1}{c|}{rdr} & CVTU.S.L rdr,rs1 \\
 \cline{2-10}
   
 
 &
 \multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000000011} &
-\multicolumn{1}{c|}{rdr} & DIV.S rdr,rs1,rs2 \\
+\multicolumn{4}{c|}{0000001110} &
+\multicolumn{1}{c|}{rdr} & CVT.S.W rdr,rs1 \\
 \cline{2-10}
   
 
@@ -1246,8 +1194,8 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000000100} &
-\multicolumn{1}{c|}{rdr} & SQRT.S rdr,rs1 \\
+\multicolumn{4}{c|}{0000001111} &
+\multicolumn{1}{c|}{rdr} & CVTU.S.W rdr,rs1 \\
 \cline{2-10}
   
 
@@ -1255,8 +1203,8 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000000101} &
-\multicolumn{1}{c|}{rdr} & SGNINJ.S rdr,rs1,rs2 \\
+\multicolumn{4}{c|}{0000010101} &
+\multicolumn{1}{c|}{rdr} & C.EQ.S rdr,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -1264,8 +1212,8 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000000110} &
-\multicolumn{1}{c|}{rdr} & SGNINJN.S rdr,rs1,rs2 \\
+\multicolumn{4}{c|}{0000010110} &
+\multicolumn{1}{c|}{rdr} & C.LT.S rdr,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -1273,8 +1221,8 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000000111} &
-\multicolumn{1}{c|}{rdr} & SGNMUL.S rdr,rs1,rs2 \\
+\multicolumn{4}{c|}{0000010111} &
+\multicolumn{1}{c|}{rdr} & C.LE.S rdr,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -1350,42 +1298,6 @@
 \cline{2-10}
   
 
-&
-\multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000001000} &
-\multicolumn{1}{c|}{rdr} & TRUNC.L.S rdr,rs1 \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000001001} &
-\multicolumn{1}{c|}{rdr} & TRUNCU.L.S rdr,rs1 \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000001010} &
-\multicolumn{1}{c|}{rdr} & TRUNC.W.S rdr,rs1 \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000001011} &
-\multicolumn{1}{c|}{rdr} & TRUNCU.W.S rdr,rs1 \\
-\cline{2-10}
-  
-
 &
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
@@ -1426,8 +1338,8 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000001100} &
-\multicolumn{1}{c|}{rdr} & CVT.S.L rdr,rs1 \\
+\multicolumn{4}{c|}{1100001100} &
+\multicolumn{1}{c|}{rdr} & CVT.D.L rdr,rs1 \\
 \cline{2-10}
   
 
@@ -1435,8 +1347,8 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000001101} &
-\multicolumn{1}{c|}{rdr} & CVTU.S.L rdr,rs1 \\
+\multicolumn{4}{c|}{1100001101} &
+\multicolumn{1}{c|}{rdr} & CVTU.D.L rdr,rs1 \\
 \cline{2-10}
   
 
@@ -1444,8 +1356,8 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000001110} &
-\multicolumn{1}{c|}{rdr} & CVT.S.W rdr,rs1 \\
+\multicolumn{4}{c|}{1100001110} &
+\multicolumn{1}{c|}{rdr} & CVT.D.W rdr,rs1 \\
 \cline{2-10}
   
 
@@ -1453,116 +1365,122 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000001111} &
-\multicolumn{1}{c|}{rdr} & CVTU.S.W rdr,rs1 \\
+\multicolumn{4}{c|}{1100001111} &
+\multicolumn{1}{c|}{rdr} & CVTU.D.W rdr,rs1 \\
 \cline{2-10}
   
 
 &
 \multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100001100} &
-\multicolumn{1}{c|}{rdr} & CVT.D.L rdr,rs1 \\
+\multicolumn{4}{c|}{1100010101} &
+\multicolumn{1}{c|}{rdr} & C.EQ.D rdr,rs1,rs2 \\
 \cline{2-10}
   
 
 &
 \multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100001101} &
-\multicolumn{1}{c|}{rdr} & CVTU.D.L rdr,rs1 \\
+\multicolumn{4}{c|}{1100010110} &
+\multicolumn{1}{c|}{rdr} & C.LT.D rdr,rs1,rs2 \\
 \cline{2-10}
   
 
 &
 \multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100001110} &
-\multicolumn{1}{c|}{rdr} & CVT.D.W rdr,rs1 \\
+\multicolumn{4}{c|}{1100010111} &
+\multicolumn{1}{c|}{rdr} & C.LE.D rdr,rs1,rs2 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{00000} &
+\multicolumn{2}{|c|}{1101011} &
+\multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100001111} &
-\multicolumn{1}{c|}{rdr} & CVTU.D.W rdr,rs1 \\
+\multicolumn{2}{c|}{00000} &
+\multicolumn{2}{c|}{rs3} &
+\multicolumn{1}{c|}{rdr} & MADD.S rdr,rs1,rs2,rs3 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{00000} &
+\multicolumn{2}{|c|}{1101011} &
+\multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000110011} &
-\multicolumn{1}{c|}{rdr} & CVT.S.D rdr,rs1 \\
+\multicolumn{2}{c|}{00001} &
+\multicolumn{2}{c|}{rs3} &
+\multicolumn{1}{c|}{rdr} & MSUB.S rdr,rs1,rs2,rs3 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{00000} &
+\multicolumn{2}{|c|}{1101011} &
+\multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100110000} &
-\multicolumn{1}{c|}{rdr} & CVT.D.S rdr,rs1 \\
+\multicolumn{2}{c|}{00010} &
+\multicolumn{2}{c|}{rs3} &
+\multicolumn{1}{c|}{rdr} & NMSUB.S rdr,rs1,rs2,rs3 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101010} &
+\multicolumn{2}{|c|}{1101011} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000010101} &
-\multicolumn{1}{c|}{rdr} & C.EQ.S rdr,rs1,rs2 \\
+\multicolumn{2}{c|}{00011} &
+\multicolumn{2}{c|}{rs3} &
+\multicolumn{1}{c|}{rdr} & NMADD.S rdr,rs1,rs2,rs3 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101010} &
+\multicolumn{2}{|c|}{1101011} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000010110} &
-\multicolumn{1}{c|}{rdr} & C.LT.S rdr,rs1,rs2 \\
+\multicolumn{2}{c|}{11000} &
+\multicolumn{2}{c|}{rs3} &
+\multicolumn{1}{c|}{rdr} & MADD.D rdr,rs1,rs2,rs3 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101010} &
+\multicolumn{2}{|c|}{1101011} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000010111} &
-\multicolumn{1}{c|}{rdr} & C.LE.S rdr,rs1,rs2 \\
+\multicolumn{2}{c|}{11001} &
+\multicolumn{2}{c|}{rs3} &
+\multicolumn{1}{c|}{rdr} & MSUB.D rdr,rs1,rs2,rs3 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101010} &
+\multicolumn{2}{|c|}{1101011} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100010101} &
-\multicolumn{1}{c|}{rdr} & C.EQ.D rdr,rs1,rs2 \\
+\multicolumn{2}{c|}{11010} &
+\multicolumn{2}{c|}{rs3} &
+\multicolumn{1}{c|}{rdr} & NMSUB.D rdr,rs1,rs2,rs3 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101010} &
+\multicolumn{2}{|c|}{1101011} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100010110} &
-\multicolumn{1}{c|}{rdr} & C.LT.D rdr,rs1,rs2 \\
+\multicolumn{2}{c|}{11011} &
+\multicolumn{2}{c|}{rs3} &
+\multicolumn{1}{c|}{rdr} & NMADD.D rdr,rs1,rs2,rs3 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100010111} &
-\multicolumn{1}{c|}{rdr} & C.LE.D rdr,rs1,rs2 \\
+\multicolumn{9}{c}{} & \\
+&
+\multicolumn{9}{c}{\bf Floating Point Compare Instructions} & \\
 \cline{2-10}
   
 
@@ -1570,62 +1488,126 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{1100111000} &
-\multicolumn{1}{c|}{rdr} & MFFL.D rdr,rs2 \\
+\multicolumn{4}{c|}{1101011000} &
+\multicolumn{1}{c|}{rdr} & MFFH.D rdr,rs2 \\
 \cline{2-10}
   
 
+\end{tabular}
+\end{center}
+\end{small}
+
+\label{instr-table}
+\end{table}
+  
+
+\newpage
+
+\begin{table}[p]
+\begin{small}
+\begin{center}
+\begin{tabular}{rcccccccccl}
+                &
+\hspace*{0.6in} &
+\hspace*{0.2in} &
+\hspace*{0.5in} &
+\hspace*{0.5in} &
+\hspace*{0.3in} &
+\hspace*{0.2in} &
+\hspace*{0.4in} &
+\hspace*{0.1in} &
+\hspace*{0.5in} \\
+                      &
+\instbitrange{31}{27} &
+\instbitrange{26}{25} &
+\instbitrange{24}{20} &
+\instbitrange{19}{15} &
+\instbitrange{14}{12} &
+\instbitrange{11}{10} &
+\instbitrange{9}{6} &
+\instbit{5} &
+\instbitrange{4}{0} \\
+\cline{2-10}
 &
-\multicolumn{2}{|c|}{1101010} &
+\multicolumn{1}{|c|}{opcode5} &
+\multicolumn{8}{c|}{jump target} & J-type \\
+\cline{2-10}
+&
+\multicolumn{2}{|c|}{opcode} &
+\multicolumn{1}{c|}{rdi} &
+\multicolumn{6}{c|}{LUI-immediate} & LUI-type \\
+\cline{2-10}
+&
+\multicolumn{2}{|c|}{opcode} &
+\multicolumn{1}{c|}{rdi} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{funct3} &
+\multicolumn{4}{c|}{immediate} & I-type \\
+\cline{2-10}
+&
+\multicolumn{2}{|c|}{opcode} &
+\multicolumn{1}{c|}{rdi} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{3}{c|}{funct9} &
+\multicolumn{2}{c|}{shamt} & ISH-type \\
+\cline{2-10}
+&
+\multicolumn{2}{|c|}{opcode} &
 \multicolumn{1}{c|}{rs2} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{1101011000} &
-\multicolumn{1}{c|}{rdr} & MFFH.D rdr,rs2 \\
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{4}{c|}{funct10} &
+\multicolumn{1}{c|}{rdr} & R-type \\
+\cline{2-10}
+&
+\multicolumn{2}{|c|}{opcode} &
+\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{2}{c|}{funct5} &
+\multicolumn{2}{c|}{rs3} &
+\multicolumn{1}{c|}{rdr} & R4-type \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{0001111000} &
-\multicolumn{1}{c|}{rdr} & MFF.S rdr,rs2 \\
+\multicolumn{9}{c}{} & \\
+&
+\multicolumn{9}{c}{\bf Integer/Floating Point Moves\&Conversion Instructions} & \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{1101111000} &
-\multicolumn{1}{c|}{rdr} & MFF.D rdr,rs2 \\
+\multicolumn{2}{|c|}{1101000} &
+\multicolumn{1}{c|}{rdi} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{010} &
+\multicolumn{4}{c|}{imm12} & L.S rdi,rs1,imm12 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{rs2} &
+\multicolumn{2}{|c|}{1101000} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1110011001} &
-\multicolumn{1}{c|}{rdr} & MTFLH.D rdr,rs1,rs2 \\
+\multicolumn{1}{c|}{011} &
+\multicolumn{4}{c|}{imm12} & L.D rdi,rs1,imm12 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{00000} &
+\multicolumn{2}{|c|}{1101000} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0010111001} &
-\multicolumn{1}{c|}{rdr} & MTF.S rdr,rs1 \\
+\multicolumn{1}{c|}{010} &
+\multicolumn{4}{c|}{imm12} & L.S rdi,rs1,imm12 \\
 \cline{2-10}
   
 
 &
-\multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{00000} &
+\multicolumn{2}{|c|}{1101000} &
+\multicolumn{1}{c|}{rdi} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1110111001} &
-\multicolumn{1}{c|}{rdr} & MTF.D rdr,rs1 \\
+\multicolumn{1}{c|}{011} &
+\multicolumn{4}{c|}{imm12} & L.D rdi,rs1,imm12 \\
 \cline{2-10}
   
 
diff --git a/parse-opcodes b/parse-opcodes
index 47f11e8..12ae1d2 100755
--- a/parse-opcodes
+++ b/parse-opcodes
@@ -37,7 +37,7 @@ typelut[0x79] = 3
 typelut[0x7a] = 4
 typelut[0x7b] = 4
 typelut[0x7e] = 4
-typelut[0x68] = 4
+typelut[0x68] = 3
 typelut[0x69] = 3
 typelut[0x6a] = 4
 typelut[0x6b] = 5
@@ -184,7 +184,7 @@ def print_lui_type(name,match,arguments):
   """ % \
   ( \
     binary(yank(match,25,7),7), \
-    str_arg('rs1','',match,arguments), \
+    str_arg('rdi','',match,arguments), \
     str_arg('imm20','',match,arguments), \
     str_inst(name,arguments) \
   )
@@ -201,8 +201,8 @@ def print_i_type(name,match,arguments):
   """ % \
   ( \
     binary(yank(match,25,7),7), \
+    str_arg('rdi','rs2',match,arguments), \
     str_arg('rs1','',match,arguments), \
-    str_arg('rs2','',match,arguments), \
     binary(yank(match,12,3),3), \
     str_arg('imm12','',match,arguments), \
     str_inst(name,arguments) \
@@ -322,37 +322,37 @@ def print_header():
 \\cline{2-10}
 &
 \\multicolumn{2}{|c|}{opcode} &
-\\multicolumn{1}{c|}{ra} &
+\\multicolumn{1}{c|}{rdi} &
 \\multicolumn{6}{c|}{LUI-immediate} & LUI-type \\\\
 \\cline{2-10}
 &
 \\multicolumn{2}{|c|}{opcode} &
-\\multicolumn{1}{c|}{ra} &
-\\multicolumn{1}{c|}{rb} &
+\\multicolumn{1}{c|}{rdi} &
+\\multicolumn{1}{c|}{rs1} &
 \\multicolumn{1}{c|}{funct3} &
 \\multicolumn{4}{c|}{immediate} & I-type \\\\
 \\cline{2-10}
 &
 \\multicolumn{2}{|c|}{opcode} &
-\\multicolumn{1}{c|}{ra} &
-\\multicolumn{1}{c|}{rb} &
+\\multicolumn{1}{c|}{rdi} &
+\\multicolumn{1}{c|}{rs1} &
 \\multicolumn{3}{c|}{funct9} &
 \\multicolumn{2}{c|}{shamt} & ISH-type \\\\
 \\cline{2-10}
 &
 \\multicolumn{2}{|c|}{opcode} &
-\\multicolumn{1}{c|}{ra} &
-\\multicolumn{1}{c|}{rb} &
+\\multicolumn{1}{c|}{rs2} &
+\\multicolumn{1}{c|}{rs1} &
 \\multicolumn{4}{c|}{funct10} &
-\\multicolumn{1}{c|}{rc} & R-type \\\\
+\\multicolumn{1}{c|}{rdr} & R-type \\\\
 \\cline{2-10}
 &
 \\multicolumn{2}{|c|}{opcode} &
-\\multicolumn{1}{c|}{ra} &
-\\multicolumn{1}{c|}{rb} &
+\\multicolumn{1}{c|}{rs2} &
+\\multicolumn{1}{c|}{rs1} &
 \\multicolumn{2}{c|}{funct5} &
-\\multicolumn{2}{c|}{rd} &
-\\multicolumn{1}{c|}{rc} & R4-type \\\\
+\\multicolumn{2}{c|}{rs3} &
+\\multicolumn{1}{c|}{rdr} & R4-type \\\\
 \\cline{2-10}
   """
 
@@ -426,21 +426,21 @@ def make_latex_table():
 
   print_header()
   print_subtitle('Floating Point Memory Instructions')
+  print_insts(0x68,-1,-1,-1)
   print_insts(0x69,-1,-1,-1)
   print_subtitle('Floating Point Compute Instructions')
-  print_insts(0x68,-1,0x000,0x01F)
-  print_insts(0x68,-1,0x300,0x31F)
+  print_insts(0x6a,-1,0x000,0x01F)
+  print_insts(0x6a,-1,0x300,0x31F)
   print_insts(0x6b,-1,-1,-1)
   print_subtitle('Floating Point Compare Instructions')
-  print_insts(0x68,-1,0x040,0x05F)
-  print_insts(0x68,-1,0x340,0x35F)
+  print_insts(0x6a,-1,0x040,0x05F)
+  print_insts(0x6a,-1,0x340,0x35F)
   print_footer(0)
 
   print_header()
   print_subtitle('Integer/Floating Point Moves\&Conversion Instructions')
   print_insts(0x68,-1,0x020,0x03F)
   print_insts(0x68,-1,0x320,0x33F)
-  print_insts(0x6a,-1,-1,-1)
   print_subtitle('Miscellaneous Instructions')
   print_insts(0x7b,-1,0x080,0x300)
   print_subtitle('Privileged Instructions')
-- 
cgit v1.2.3