Update ISA encoding

1 files changed, 845 insertions, 866 deletions

diff --git a/instr-table.tex b/instr-table.tex
index 22e28d5..6a26f36 100644
--- a/instr-table.tex
+++ b/instr-table.tex
@@ -6,486 +6,495 @@
 \begin{center}
 \begin{tabular}{rccccccccccl}
                       &
-\instbitrange{31}{27} &
-\instbitrange{26}{22} &
-\instbitrange{21}{17} &
-\instbit{16} &
- &
-\instbitrange{}{12} &
-\instbitrange{11}{10} &
-\instbit{9} &
-\instbitrange{}{7} &
+\multicolumn{1}{l}{\instbit{31}} &
+\multicolumn{1}{r}{\instbit{27}} &
+\instbit{26} &
+\instbit{25} &
+\multicolumn{2}{c}{\instbitrange{24}{20}} &
+\instbitrange{19}{15} &
+\instbitrange{14}{12} &
+\instbitrange{11}{7} &
 \instbitrange{6}{0} \\
 \cline{2-11}
+
+
 &
-\multicolumn{9}{|c|}{jump target} &
-\multicolumn{1}{c|}{opcode} & J-type \\
-\cline{2-11}
-&
-\multicolumn{1}{|c|}{rd} &
-\multicolumn{8}{c|}{upper immediate} &
-\multicolumn{1}{c|}{opcode} & U-type \\
+\multicolumn{4}{|c|}{funct7} &
+\multicolumn{2}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{funct3} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{opcode} & R-type \\
 \cline{2-11}
+
+
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{imm[11:7]} &
-\multicolumn{4}{c|}{imm[6:0]} &
-\multicolumn{2}{c|}{funct3} &
+\multicolumn{1}{c|}{funct3} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{opcode} & I-type \\
 \cline{2-11}
+
+
 &
-\multicolumn{1}{|c|}{imm[11:7]} &
+\multicolumn{4}{|c|}{imm[11:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm[6:0]} &
-\multicolumn{2}{c|}{funct3} &
-\multicolumn{1}{c|}{opcode} & B-type \\
+\multicolumn{1}{c|}{imm[4:0]} &
+\multicolumn{1}{c|}{funct3} &
+\multicolumn{1}{c|}{opcode} & S-type \\
 \cline{2-11}
+
+
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{imm[12, 10:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{6}{c|}{funct10} &
-\multicolumn{1}{c|}{opcode} & R-type \\
+\multicolumn{1}{c|}{funct3} &
+\multicolumn{1}{c|}{imm[4:1, 11]} &
+\multicolumn{1}{c|}{opcode} & SB-type \\
 \cline{2-11}
+
+
 &
-\multicolumn{1}{|c|}{rd} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{rs3} &
-\multicolumn{3}{c|}{funct5} &
-\multicolumn{1}{c|}{opcode} & R4-type \\
+\multicolumn{8}{|c|}{imm[31:12]} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{opcode} & U-type \\
 \cline{2-11}
-  
+
 
 &
-\multicolumn{10}{c}{} & \\
-&
-\multicolumn{10}{c}{\bf RV32I Instruction Subset} & \\
+\multicolumn{8}{|c|}{imm[20, 10:1, 11, 19:12]} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{opcode} & UJ-type \\
 \cline{2-11}
-  
+
 
 &
-\multicolumn{1}{|c|}{rd} &
-\multicolumn{8}{c|}{imm20} &
-\multicolumn{1}{c|}{0110111} & LUI rd,imm20 \\
+\multicolumn{10}{c}{} & \\
+&
+\multicolumn{10}{c}{\bf RV32I Base Instruction Set} & \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
-\multicolumn{8}{c|}{imm20} &
-\multicolumn{1}{c|}{0010111} & AUIPC rd,imm20 \\
+\multicolumn{8}{|c|}{imm[31:12]} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0110111} & LUI rd,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{9}{|c|}{imm25} &
-\multicolumn{1}{c|}{1101011} & J imm25 \\
+\multicolumn{8}{|c|}{imm[31:12]} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0010111} & AUIPC rd,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{9}{|c|}{imm25} &
-\multicolumn{1}{c|}{1101111} & JAL imm25 \\
+\multicolumn{8}{|c|}{imm[20, 10:1, 11, 19:12]} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{1100111} & JAL rd,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{1100111} & JALR rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{1101111} & JALR rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{imm12hi} &
+\multicolumn{4}{|c|}{imm[12, 10:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm12lo} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{1100011} & BEQ rs1,rs2,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{imm[4:1, 11]} &
+\multicolumn{1}{c|}{1100011} & BEQ rs1,rs2,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{imm12hi} &
+\multicolumn{4}{|c|}{imm[12, 10:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm12lo} &
-\multicolumn{2}{c|}{001} &
-\multicolumn{1}{c|}{1100011} & BNE rs1,rs2,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{imm[4:1, 11]} &
+\multicolumn{1}{c|}{1100011} & BNE rs1,rs2,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{imm12hi} &
+\multicolumn{4}{|c|}{imm[12, 10:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm12lo} &
-\multicolumn{2}{c|}{100} &
-\multicolumn{1}{c|}{1100011} & BLT rs1,rs2,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{imm[4:1, 11]} &
+\multicolumn{1}{c|}{1100011} & BLT rs1,rs2,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{imm12hi} &
+\multicolumn{4}{|c|}{imm[12, 10:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm12lo} &
-\multicolumn{2}{c|}{101} &
-\multicolumn{1}{c|}{1100011} & BGE rs1,rs2,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{imm[4:1, 11]} &
+\multicolumn{1}{c|}{1100011} & BGE rs1,rs2,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{imm12hi} &
+\multicolumn{4}{|c|}{imm[12, 10:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm12lo} &
-\multicolumn{2}{c|}{110} &
-\multicolumn{1}{c|}{1100011} & BLTU rs1,rs2,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{imm[4:1, 11]} &
+\multicolumn{1}{c|}{1100011} & BLTU rs1,rs2,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{imm12hi} &
+\multicolumn{4}{|c|}{imm[12, 10:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm12lo} &
-\multicolumn{2}{c|}{111} &
-\multicolumn{1}{c|}{1100011} & BGEU rs1,rs2,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{imm[4:1, 11]} &
+\multicolumn{1}{c|}{1100011} & BGEU rs1,rs2,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{0000011} & LB rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0000011} & LB rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{001} &
-\multicolumn{1}{c|}{0000011} & LH rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0000011} & LH rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0000011} & LW rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0000011} & LW rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{100} &
-\multicolumn{1}{c|}{0000011} & LBU rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0000011} & LBU rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{101} &
-\multicolumn{1}{c|}{0000011} & LHU rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0000011} & LHU rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{imm12hi} &
+\multicolumn{4}{|c|}{imm[11:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm12lo} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{0100011} & SB rs1,rs2,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{imm[4:0]} &
+\multicolumn{1}{c|}{0100011} & SB rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{imm12hi} &
+\multicolumn{4}{|c|}{imm[11:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm12lo} &
-\multicolumn{2}{c|}{001} &
-\multicolumn{1}{c|}{0100011} & SH rs1,rs2,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{imm[4:0]} &
+\multicolumn{1}{c|}{0100011} & SH rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{imm12hi} &
+\multicolumn{4}{|c|}{imm[11:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm12lo} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0100011} & SW rs1,rs2,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{imm[4:0]} &
+\multicolumn{1}{c|}{0100011} & SW rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{0010011} & ADDI rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0010011} & ADDI rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{2}{c|}{000000} &
-\multicolumn{3}{c|}{shamt} &
-\multicolumn{2}{c|}{001} &
-\multicolumn{1}{c|}{0010011} & SLLI rd,rs1,shamt \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0010011} & SLTI rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0010011} & SLTI rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0010011} & SLTIU rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{0010011} & SLTIU rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0010011} & XORI rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{100} &
-\multicolumn{1}{c|}{0010011} & XORI rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0010011} & ORI rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{2}{c|}{000000} &
-\multicolumn{3}{c|}{shamt} &
-\multicolumn{2}{c|}{101} &
-\multicolumn{1}{c|}{0010011} & SRLI rd,rs1,shamt \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0010011} & ANDI rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{2}{c|}{000001} &
+\multicolumn{3}{|c|}{010000} &
 \multicolumn{3}{c|}{shamt} &
-\multicolumn{2}{c|}{101} &
-\multicolumn{1}{c|}{0010011} & SRAI rd,rs1,shamt \\
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0010011} & SLLI rd,rs1,shamt \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{3}{|c|}{000000} &
+\multicolumn{3}{c|}{shamt} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{110} &
-\multicolumn{1}{c|}{0010011} & ORI rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0010011} & SRLI rd,rs1,shamt \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{3}{|c|}{010000} &
+\multicolumn{3}{c|}{shamt} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{111} &
-\multicolumn{1}{c|}{0010011} & ANDI rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0010011} & SRAI rd,rs1,shamt \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{000} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & ADD rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0100000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{1000000} &
-\multicolumn{2}{c|}{000} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & SUB rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{001} &
+\multicolumn{1}{c|}{001} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & SLL rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{010} &
+\multicolumn{1}{c|}{010} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & SLT rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{011} &
+\multicolumn{1}{c|}{011} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & SLTU rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{100} &
+\multicolumn{1}{c|}{100} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & XOR rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{101} &
+\multicolumn{1}{c|}{101} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & SRL rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0100000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{1000000} &
-\multicolumn{2}{c|}{101} &
+\multicolumn{1}{c|}{101} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & SRA rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{110} &
+\multicolumn{1}{c|}{110} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & OR rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{111} &
+\multicolumn{1}{c|}{111} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & AND rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{00000} &
+\multicolumn{1}{|c|}{0000} &
+\multicolumn{4}{c|}{~~~pred~~~~} &
+\multicolumn{1}{c|}{succ} &
 \multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{000} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{001} &
-\multicolumn{1}{c|}{0101111} & FENCE.I  \\
+\multicolumn{1}{c|}{0001111} & FENCE  \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{00000} &
+\multicolumn{1}{|c|}{0000} &
+\multicolumn{4}{c|}{0000} &
+\multicolumn{1}{c|}{0000} &
 \multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{000} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0101111} & FENCE  \\
+\multicolumn{1}{c|}{0001111} & FENCE.I  \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{00000} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{000} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{000} &
 \multicolumn{1}{c|}{1110111} & SYSCALL  \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{00000} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{001} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{001} &
 \multicolumn{1}{c|}{1110111} & BREAK  \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{100} &
+\multicolumn{1}{c|}{100} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1110111} & RDCYCLE rd \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
-\multicolumn{1}{c|}{00000} &
+\multicolumn{4}{|c|}{0000001} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{100} &
+\multicolumn{1}{c|}{100} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1110111} & RDTIME rd \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000010} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{0000010} &
-\multicolumn{2}{c|}{100} &
+\multicolumn{1}{c|}{100} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1110111} & RDINSTRET rd \\
 \cline{2-11}
   
@@ -505,179 +514,167 @@
 \begin{center}
 \begin{tabular}{rccccccccccl}
                       &
-\instbitrange{31}{27} &
-\instbitrange{26}{22} &
-\instbitrange{21}{17} &
-\instbit{16} &
- &
-\instbitrange{}{12} &
-\instbitrange{11}{10} &
-\instbit{9} &
-\instbitrange{}{7} &
+\multicolumn{1}{l}{\instbit{31}} &
+\multicolumn{1}{r}{\instbit{27}} &
+\instbit{26} &
+\instbit{25} &
+\multicolumn{2}{c}{\instbitrange{24}{20}} &
+\instbitrange{19}{15} &
+\instbitrange{14}{12} &
+\instbitrange{11}{7} &
 \instbitrange{6}{0} \\
 \cline{2-11}
+
+
 &
-\multicolumn{9}{|c|}{jump target} &
-\multicolumn{1}{c|}{opcode} & J-type \\
-\cline{2-11}
-&
-\multicolumn{1}{|c|}{rd} &
-\multicolumn{8}{c|}{upper immediate} &
-\multicolumn{1}{c|}{opcode} & U-type \\
-\cline{2-11}
-&
-\multicolumn{1}{|c|}{rd} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{imm[11:7]} &
-\multicolumn{4}{c|}{imm[6:0]} &
-\multicolumn{2}{c|}{funct3} &
-\multicolumn{1}{c|}{opcode} & I-type \\
-\cline{2-11}
-&
-\multicolumn{1}{|c|}{imm[11:7]} &
+\multicolumn{4}{|c|}{funct7} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm[6:0]} &
-\multicolumn{2}{c|}{funct3} &
-\multicolumn{1}{c|}{opcode} & B-type \\
+\multicolumn{1}{c|}{funct3} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{opcode} & R-type \\
 \cline{2-11}
+
+
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{6}{c|}{funct10} &
-\multicolumn{1}{c|}{opcode} & R-type \\
+\multicolumn{1}{c|}{funct3} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{opcode} & I-type \\
 \cline{2-11}
+
+
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{imm[11:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{rs3} &
-\multicolumn{3}{c|}{funct5} &
-\multicolumn{1}{c|}{opcode} & R4-type \\
+\multicolumn{1}{c|}{imm[4:0]} &
+\multicolumn{1}{c|}{funct3} &
+\multicolumn{1}{c|}{opcode} & S-type \\
 \cline{2-11}
-  
+
 
 &
 \multicolumn{10}{c}{} & \\
 &
-\multicolumn{10}{c}{\bf RV64I Instruction Subset (in addition to RV32I)} & \\
+\multicolumn{10}{c}{\bf RV64I Base Instruction Set (in addition to RV32I)} & \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{110} &
-\multicolumn{1}{c|}{0000011} & LWU rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0000011} & LWU rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{0000011} & LD rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0000011} & LD rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{imm12hi} &
+\multicolumn{4}{|c|}{imm[11:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm12lo} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{0100011} & SD rs1,rs2,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{imm[4:0]} &
+\multicolumn{1}{c|}{0100011} & SD rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{0011011} & ADDIW rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0011011} & ADDIW rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0100000} &
+\multicolumn{2}{c|}{shamt} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{3}{c|}{0000000} &
-\multicolumn{2}{c|}{shamtw} &
-\multicolumn{2}{c|}{001} &
-\multicolumn{1}{c|}{0011011} & SLLIW rd,rs1,shamtw \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0011011} & SLLIW rd,rs1,shamt \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{shamt} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{3}{c|}{0000000} &
-\multicolumn{2}{c|}{shamtw} &
-\multicolumn{2}{c|}{101} &
-\multicolumn{1}{c|}{0011011} & SRLIW rd,rs1,shamtw \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0011011} & SRLIW rd,rs1,shamt \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0100000} &
+\multicolumn{2}{c|}{shamt} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{3}{c|}{0000010} &
-\multicolumn{2}{c|}{shamtw} &
-\multicolumn{2}{c|}{101} &
-\multicolumn{1}{c|}{0011011} & SRAIW rd,rs1,shamtw \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0011011} & SRAIW rd,rs1,shamt \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{000} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0111011} & ADDW rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0100000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{1000000} &
-\multicolumn{2}{c|}{000} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0111011} & SUBW rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{001} &
+\multicolumn{1}{c|}{001} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0111011} & SLLW rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{101} &
+\multicolumn{1}{c|}{101} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0111011} & SRLW rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0100000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{1000000} &
-\multicolumn{2}{c|}{101} &
+\multicolumn{1}{c|}{101} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0111011} & SRAW rd,rs1,rs2 \\
 \cline{2-11}
   
@@ -685,86 +682,86 @@
 &
 \multicolumn{10}{c}{} & \\
 &
-\multicolumn{10}{c}{\bf RV32M Instruction Subset} & \\
+\multicolumn{10}{c}{\bf RV32M Standard Extension} & \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{000} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & MUL rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{001} &
+\multicolumn{1}{c|}{001} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & MULH rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{010} &
+\multicolumn{1}{c|}{010} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & MULHSU rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{011} &
+\multicolumn{1}{c|}{011} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & MULHU rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{100} &
+\multicolumn{1}{c|}{100} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & DIV rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{101} &
+\multicolumn{1}{c|}{101} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & DIVU rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{110} &
+\multicolumn{1}{c|}{110} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & REM rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{111} &
+\multicolumn{1}{c|}{111} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0110011} & REMU rd,rs1,rs2 \\
 \cline{2-11}
   
@@ -772,56 +769,56 @@
 &
 \multicolumn{10}{c}{} & \\
 &
-\multicolumn{10}{c}{\bf RV64M Instruction Subset (in addition to RV32M)} & \\
+\multicolumn{10}{c}{\bf RV64M Standard Extension (in addition to RV32M)} & \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{000} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0111011} & MULW rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{100} &
+\multicolumn{1}{c|}{100} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0111011} & DIVW rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{101} &
+\multicolumn{1}{c|}{101} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0111011} & DIVUW rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{110} &
+\multicolumn{1}{c|}{110} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0111011} & REMW rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{111} &
+\multicolumn{1}{c|}{111} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{0111011} & REMUW rd,rs1,rs2 \\
 \cline{2-11}
   
@@ -829,107 +826,139 @@
 &
 \multicolumn{10}{c}{} & \\
 &
-\multicolumn{10}{c}{\bf RV32A Instruction Subset} & \\
+\multicolumn{10}{c}{\bf RV32A Standard Extension} & \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{00010} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0101011} & AMOADD.W rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & LR.W rd,rs1 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{00011} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0101011} & AMOSWAP.W rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & SC.W rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{00001} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000010} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0101011} & AMOAND.W rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOSWAP.W rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{00000} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000011} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0101011} & AMOOR.W rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOADD.W rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{00100} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000100} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0101011} & AMOMIN.W rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOXOR.W rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{01100} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000101} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0101011} & AMOMAX.W rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOAND.W rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{01000} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000110} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0101011} & AMOMINU.W rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOOR.W rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{10000} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000111} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0101011} & AMOMAXU.W rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOMIN.W rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{10100} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{1000000} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0101011} & LR.W rd,rs1 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOMAX.W rd,rs1,rs2 \\
+\cline{2-11}
+  
+
+&
+\multicolumn{2}{|c|}{11000} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOMINU.W rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{11100} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{1000001} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0101011} & SC.W rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOMAXU.W rd,rs1,rs2 \\
 \cline{2-11}
   
 
@@ -948,463 +977,462 @@
 \begin{center}
 \begin{tabular}{rccccccccccl}
                       &
-\instbitrange{31}{27} &
-\instbitrange{26}{22} &
-\instbitrange{21}{17} &
-\instbit{16} &
- &
-\instbitrange{}{12} &
-\instbitrange{11}{10} &
-\instbit{9} &
-\instbitrange{}{7} &
+\multicolumn{1}{l}{\instbit{31}} &
+\multicolumn{1}{r}{\instbit{27}} &
+\instbit{26} &
+\instbit{25} &
+\multicolumn{2}{c}{\instbitrange{24}{20}} &
+\instbitrange{19}{15} &
+\instbitrange{14}{12} &
+\instbitrange{11}{7} &
 \instbitrange{6}{0} \\
 \cline{2-11}
+
+
 &
-\multicolumn{9}{|c|}{jump target} &
-\multicolumn{1}{c|}{opcode} & J-type \\
-\cline{2-11}
-&
-\multicolumn{1}{|c|}{rd} &
-\multicolumn{8}{c|}{upper immediate} &
-\multicolumn{1}{c|}{opcode} & U-type \\
+\multicolumn{4}{|c|}{funct7} &
+\multicolumn{2}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{funct3} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{opcode} & R-type \\
 \cline{2-11}
+
+
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{imm[11:7]} &
-\multicolumn{4}{c|}{imm[6:0]} &
-\multicolumn{2}{c|}{funct3} &
+\multicolumn{1}{c|}{funct3} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{opcode} & I-type \\
 \cline{2-11}
+
+
 &
-\multicolumn{1}{|c|}{imm[11:7]} &
+\multicolumn{4}{|c|}{imm[11:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm[6:0]} &
-\multicolumn{2}{c|}{funct3} &
-\multicolumn{1}{c|}{opcode} & B-type \\
+\multicolumn{1}{c|}{imm[4:0]} &
+\multicolumn{1}{c|}{funct3} &
+\multicolumn{1}{c|}{opcode} & S-type \\
 \cline{2-11}
+
+
 &
-\multicolumn{1}{|c|}{rd} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{6}{c|}{funct10} &
-\multicolumn{1}{c|}{opcode} & R-type \\
-\cline{2-11}
+\multicolumn{10}{c}{} & \\
 &
-\multicolumn{1}{|c|}{rd} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{rs3} &
-\multicolumn{3}{c|}{funct5} &
-\multicolumn{1}{c|}{opcode} & R4-type \\
+\multicolumn{10}{c}{\bf RV64A Standard Extension (in addition to RV32A)} & \\
 \cline{2-11}
   
 
 &
-\multicolumn{10}{c}{} & \\
-&
-\multicolumn{10}{c}{\bf RV64A Instruction Subset (in addition to RV32A)} & \\
+\multicolumn{2}{|c|}{00010} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{00000} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & LR.D rd,rs1 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{00011} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000000} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{0101011} & AMOADD.D rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & SC.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{00001} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000001} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{0101011} & AMOSWAP.D rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOSWAP.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{00000} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000010} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{0101011} & AMOAND.D rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOADD.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{00100} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000011} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{0101011} & AMOOR.D rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOXOR.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{01100} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000100} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{0101011} & AMOMIN.D rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOAND.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{01000} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000101} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{0101011} & AMOMAX.D rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOOR.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{10000} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000110} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{0101011} & AMOMINU.D rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOMIN.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{10100} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{0000111} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{0101011} & AMOMAXU.D rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOMAX.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{11000} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{1000000} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{0101011} & LR.D rd,rs1 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOMINU.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{11100} &
+\multicolumn{1}{c|}{aq} &
+\multicolumn{1}{c|}{rl} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{1000001} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{0101011} & SC.D rd,rs1,rs2 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0101111} & AMOMAXU.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
 \multicolumn{10}{c}{} & \\
 &
-\multicolumn{10}{c}{\bf RV32F Instruction Subset} & \\
+\multicolumn{10}{c}{\bf RV32F Standard Extension} & \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0000111} & FLW rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0000111} & FLW rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{imm12hi} &
+\multicolumn{4}{|c|}{imm[11:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm12lo} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{0100111} & FSW rs1,rs2,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{imm[4:0]} &
+\multicolumn{1}{c|}{0100111} & FSW rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{00000} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FADD.S rd,rs1,rs2,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000100} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{00001} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FSUB.S rd,rs1,rs2,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0001000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{00010} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FMUL.S rd,rs1,rs2,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0001100} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{00011} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FDIV.S rd,rs1,rs2,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0010000} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{00100} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FSQRT.S rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1100000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{11000} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FMIN.S rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1100100} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{11001} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FMAX.S rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{rs3} &
+\multicolumn{2}{c|}{00} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{rs3} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1000011} & FMADD.S rd,rs1,rs2,rs3,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{rs3} &
+\multicolumn{2}{c|}{00} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{rs3} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1000111} & FMSUB.S rd,rs1,rs2,rs3,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{rs3} &
+\multicolumn{2}{c|}{00} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{rs3} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1001011} & FNMSUB.S rd,rs1,rs2,rs3,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{rs3} &
+\multicolumn{2}{c|}{00} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{rs3} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1001111} & FNMADD.S rd,rs1,rs2,rs3,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0010100} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{00101} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FSGNJ.S rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0011000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{00110} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FSGNJN.S rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0011100} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{00111} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FSGNJX.S rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0111000} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01110} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.S.W rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0111100} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01111} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.S.WU rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1111000} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{11110} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FMV.S.X rd,rs1 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0101000} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01010} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.W.S rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0101100} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01011} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.WU.S rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1110000} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{11100} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FMV.X.S rd,rs1 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1010100} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{10101} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FEQ.S rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1011000} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{10110} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FLT.S rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1011100} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{10111} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FLE.S rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1111100} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{11111} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FSSR rd,rs1 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
-\multicolumn{1}{c|}{00000} &
+\multicolumn{4}{|c|}{1110100} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{11101} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FRSR rd \\
 \cline{2-11}
   
@@ -1424,55 +1452,35 @@
 \begin{center}
 \begin{tabular}{rccccccccccl}
                       &
-\instbitrange{31}{27} &
-\instbitrange{26}{22} &
-\instbitrange{21}{17} &
-\instbit{16} &
- &
-\instbitrange{}{12} &
-\instbitrange{11}{10} &
-\instbit{9} &
-\instbitrange{}{7} &
+\multicolumn{1}{l}{\instbit{31}} &
+\multicolumn{1}{r}{\instbit{27}} &
+\instbit{26} &
+\instbit{25} &
+\multicolumn{2}{c}{\instbitrange{24}{20}} &
+\instbitrange{19}{15} &
+\instbitrange{14}{12} &
+\instbitrange{11}{7} &
 \instbitrange{6}{0} \\
 \cline{2-11}
+
+
 &
-\multicolumn{9}{|c|}{jump target} &
-\multicolumn{1}{c|}{opcode} & J-type \\
-\cline{2-11}
-&
-\multicolumn{1}{|c|}{rd} &
-\multicolumn{8}{c|}{upper immediate} &
-\multicolumn{1}{c|}{opcode} & U-type \\
-\cline{2-11}
-&
-\multicolumn{1}{|c|}{rd} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{imm[11:7]} &
-\multicolumn{4}{c|}{imm[6:0]} &
-\multicolumn{2}{c|}{funct3} &
-\multicolumn{1}{c|}{opcode} & I-type \\
-\cline{2-11}
-&
-\multicolumn{1}{|c|}{imm[11:7]} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm[6:0]} &
-\multicolumn{2}{c|}{funct3} &
-\multicolumn{1}{c|}{opcode} & B-type \\
-\cline{2-11}
-&
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{funct7} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{6}{c|}{funct10} &
+\multicolumn{1}{c|}{funct3} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{opcode} & R-type \\
 \cline{2-11}
+
+
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{rs3} &
+\multicolumn{2}{c|}{funct2} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{rs3} &
-\multicolumn{3}{c|}{funct5} &
+\multicolumn{1}{c|}{funct3} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{opcode} & R4-type \\
 \cline{2-11}
   
@@ -1480,50 +1488,46 @@
 &
 \multicolumn{10}{c}{} & \\
 &
-\multicolumn{10}{c}{\bf RV64F Instruction Subset (in addition to RV32F)} & \\
+\multicolumn{10}{c}{\bf RV64F Standard Extension (in addition to RV32F)} & \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0110000} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01100} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.S.L rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0110100} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01101} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.S.LU rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0100000} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01000} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.L.S rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0100100} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01001} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.LU.S rd,rs1,rm \\
 \cline{2-11}
   
@@ -1531,256 +1535,239 @@
 &
 \multicolumn{10}{c}{} & \\
 &
-\multicolumn{10}{c}{\bf RV32D Instruction Subset} & \\
+\multicolumn{10}{c}{\bf RV32D Standard Extension} & \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{6}{|c|}{imm[11:0]} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{5}{c|}{imm12} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{0000111} & FLD rd,rs1,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{0000111} & FLD rd,rs1,imm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{imm12hi} &
+\multicolumn{4}{|c|}{imm[11:5]} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{4}{c|}{imm12lo} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{0100111} & FSD rs1,rs2,imm12 \\
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{imm[4:0]} &
+\multicolumn{1}{c|}{0100111} & FSD rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{00000} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FADD.D rd,rs1,rs2,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0000101} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{00001} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FSUB.D rd,rs1,rs2,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0001001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{00010} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FMUL.D rd,rs1,rs2,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0001101} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{00011} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FDIV.D rd,rs1,rs2,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0010001} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{00100} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FSQRT.D rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1100001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{11000} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FMIN.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1100101} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{11001} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FMAX.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{rs3} &
+\multicolumn{2}{c|}{01} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{rs3} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1000011} & FMADD.D rd,rs1,rs2,rs3,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{rs3} &
+\multicolumn{2}{c|}{01} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{rs3} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1000111} & FMSUB.D rd,rs1,rs2,rs3,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{rs3} &
+\multicolumn{2}{c|}{01} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{rs3} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1001011} & FNMSUB.D rd,rs1,rs2,rs3,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{2}{|c|}{rs3} &
+\multicolumn{2}{c|}{01} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{rs3} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1001111} & FNMADD.D rd,rs1,rs2,rs3,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0010101} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{00101} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FSGNJ.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0011001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{00110} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FSGNJN.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0011101} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{00111} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FSGNJX.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0111001} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01110} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.D.W rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0111101} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01111} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.D.WU rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0101001} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01010} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.W.D rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0101101} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01011} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.WU.D rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1010101} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{10101} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FEQ.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1011001} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{10110} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FLT.D rd,rs1,rs2 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1011101} &
+\multicolumn{2}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{3}{c|}{10111} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FLE.D rd,rs1,rs2 \\
 \cline{2-11}
   
@@ -1788,94 +1775,86 @@
 &
 \multicolumn{10}{c}{} & \\
 &
-\multicolumn{10}{c}{\bf RV64D Instruction Subset (in addition to RV32D)} & \\
+\multicolumn{10}{c}{\bf RV64D Standard Extension (in addition to RV32D)} & \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0110001} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01100} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.D.L rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0110101} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01101} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.D.LU rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1111001} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{11110} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FMV.D.X rd,rs1 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0100001} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01000} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.L.D rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{0100101} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{01001} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.LU.D rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1110001} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{11100} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{000} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FMV.X.D rd,rs1 \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1000100} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{10001} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.S.D rd,rs1,rm \\
 \cline{2-11}
   
 
 &
-\multicolumn{1}{|c|}{rd} &
+\multicolumn{4}{|c|}{1000001} &
+\multicolumn{2}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{3}{c|}{10000} &
-\multicolumn{2}{c|}{rm} &
-\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rm} &
+\multicolumn{1}{c|}{rd} &
 \multicolumn{1}{c|}{1010011} & FCVT.D.S rd,rs1,rm \\
 \cline{2-11}