Move out-of-date vector encoding to V chapter

3 files changed, 742 insertions, 735 deletions

diff --git a/src/instr-table.tex b/src/instr-table.tex
index bf2fb3e..82e630f 100644
--- a/src/instr-table.tex
+++ b/src/instr-table.tex
@@ -1950,741 +1950,6 @@
 \end{tabular}
 \end{center}
 \end{small}
-
-\label{instr-table}
-\end{table}
-  
-
-\newpage
-
-\begin{table}[p]
-\begin{small}
-\begin{center}
-\begin{tabular}{p{0in}p{0.4in}p{0.1in}p{0.3in}p{0.5in}p{0.5in}p{0.1in}p{0.3in}p{0.5in}p{0.7in}l}
-& & & & & & & & & \\
-                      &
-\instbitrange{31}{28} &
-\instbit{27} &
-\instbitrange{26}{25} &
-\instbitrange{24}{20} &
-\instbitrange{19}{15} &
-\instbit{14} &
-\instbitrange{13}{12} &
-\instbitrange{11}{7} &
-\instbitrange{6}{0} \\
-\cline{2-10}
-
-
-&
-\multicolumn{9}{c}{} & \\
-&
-\multicolumn{9}{c}{\bf RV32V Standard Extension ({\em draft proposal, subject to change})} & \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1000} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VADD \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1000} &
-\multicolumn{2}{c|}{001} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VSUB \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1001} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VSL \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1101} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VSR \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1111} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VAND \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1110} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VOR \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1100} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VXOR \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1001} &
-\multicolumn{2}{c|}{100} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VSEQ \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1001} &
-\multicolumn{2}{c|}{101} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VSNE \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1001} &
-\multicolumn{2}{c|}{110} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VSLT \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1001} &
-\multicolumn{2}{c|}{111} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VSGE \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1011} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VCLIP \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1011} &
-\multicolumn{2}{c|}{001} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VCVT \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1010} &
-\multicolumn{2}{c|}{111} &
-\multicolumn{1}{c|}{00001} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{rd} &
-\multicolumn{1}{c|}{1100111} & VMPOP \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1010} &
-\multicolumn{2}{c|}{111} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{rd} &
-\multicolumn{1}{c|}{1100111} & VMFIRST \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1010} &
-\multicolumn{2}{c|}{000} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{rd} &
-\multicolumn{1}{c|}{1100111} & VEXTRACT \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1011} &
-\multicolumn{2}{c|}{100} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VINSERT \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1100} &
-\multicolumn{2}{c|}{001} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VMERGE \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1100} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VSELECT \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1011} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VSLIDE \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1000} &
-\multicolumn{2}{c|}{100} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VDIV \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1000} &
-\multicolumn{2}{c|}{101} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VREM \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1000} &
-\multicolumn{2}{c|}{110} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VMUL \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1000} &
-\multicolumn{2}{c|}{111} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VMULH \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1000} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VMIN \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1000} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VMAX \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1001} &
-\multicolumn{2}{c|}{010} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VSGNJ \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1001} &
-\multicolumn{2}{c|}{011} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VSGNJN \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1001} &
-\multicolumn{2}{c|}{001} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VSGNJX \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1100} &
-\multicolumn{2}{c|}{111} &
-\multicolumn{1}{c|}{00010} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VSQRT \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1100} &
-\multicolumn{2}{c|}{111} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VCLASS \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{1100} &
-\multicolumn{2}{c|}{111} &
-\multicolumn{1}{c|}{00001} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VPOPC \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{0000} &
-\multicolumn{3}{c|}{imm[7:0]} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VADDI \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{0001} &
-\multicolumn{3}{c|}{imm[7:0]} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VSLI \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{0101} &
-\multicolumn{3}{c|}{imm[7:0]} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VSRI \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{0111} &
-\multicolumn{3}{c|}{imm[7:0]} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VANDI \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{0110} &
-\multicolumn{3}{c|}{imm[7:0]} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VORI \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{0100} &
-\multicolumn{3}{c|}{imm[7:0]} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VXORI \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{0011} &
-\multicolumn{3}{c|}{imm[7:0]} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VCLIPI \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{vs3} &
-\multicolumn{1}{c|}{00} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{0} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VMADD \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{vs3} &
-\multicolumn{1}{c|}{01} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{0} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VMSUB \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{vs3} &
-\multicolumn{1}{c|}{11} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{0} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VNMADD \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{vs3} &
-\multicolumn{1}{c|}{10} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{vs1} &
-\multicolumn{1}{c|}{0} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{1100111} & VNMSUB \\
-\cline{2-10}
-  
-
-\end{tabular}
-\end{center}
-\end{small}
-
-\label{instr-table}
-\end{table}
-  
-
-\newpage
-
-\begin{table}[p]
-\begin{small}
-\begin{center}
-\begin{tabular}{p{0in}p{0.4in}p{0.1in}p{0.3in}p{0.5in}p{0.5in}p{0.1in}p{0.3in}p{0.5in}p{0.7in}l}
-& & & & & & & & & \\
-                      &
-\instbitrange{31}{28} &
-\instbit{27} &
-\instbitrange{26}{25} &
-\instbitrange{24}{20} &
-\instbitrange{19}{15} &
-\instbit{14} &
-\instbitrange{13}{12} &
-\instbitrange{11}{7} &
-\instbitrange{6}{0} \\
-\cline{2-10}
-
-
-&
-\multicolumn{9}{c}{} & \\
-&
-\multicolumn{9}{c}{\bf RV32V Standard Extension (cont.)} & \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{imm[4:0]} &
-\multicolumn{1}{c|}{00} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{0000111} & VLD \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{imm[4:0]} &
-\multicolumn{1}{c|}{01} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{0000111} & VLDS \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{imm[4:0]} &
-\multicolumn{1}{c|}{10} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{0000111} & VLDX \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{vs3} &
-\multicolumn{1}{c|}{00} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{imm[4:0]} &
-\multicolumn{1}{c|}{0100111} & VST \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{vs3} &
-\multicolumn{1}{c|}{01} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{imm[4:0]} &
-\multicolumn{1}{c|}{0100111} & VSTS \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{vs3} &
-\multicolumn{1}{c|}{10} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{imm[4:0]} &
-\multicolumn{1}{c|}{0100111} & VSTX \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{vs3} &
-\multicolumn{1}{c|}{11} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{00001} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{0100111} & VAMOSWAP \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{vs3} &
-\multicolumn{1}{c|}{11} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{0100111} & VAMOADD \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{vs3} &
-\multicolumn{1}{c|}{11} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{01100} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{0100111} & VAMOAND \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{vs3} &
-\multicolumn{1}{c|}{11} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{01000} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{0100111} & VAMOOR \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{vs3} &
-\multicolumn{1}{c|}{11} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{00100} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{0100111} & VAMOXOR \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{vs3} &
-\multicolumn{1}{c|}{11} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{10000} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{0100111} & VAMOMIN \\
-\cline{2-10}
-  
-
-&
-\multicolumn{2}{|c|}{vs3} &
-\multicolumn{1}{c|}{11} &
-\multicolumn{1}{c|}{vs2} &
-\multicolumn{1}{c|}{10100} &
-\multicolumn{1}{c|}{1} &
-\multicolumn{1}{c|}{m} &
-\multicolumn{1}{c|}{vd} &
-\multicolumn{1}{c|}{0100111} & VAMOMAX \\
-\cline{2-10}
-  
-
-\end{tabular}
-\end{center}
-\end{small}
 \caption{Instruction listing for RISC-V}
 \label{instr-table}
 \end{table}
diff --git a/src/v-instr-table.tex b/src/v-instr-table.tex
new file mode 100644
index 0000000..0efc710
--- /dev/null
+++ b/src/v-instr-table.tex
@@ -0,0 +1,735 @@
+
+\newpage
+
+\begin{table}[p]
+\begin{small}
+\begin{center}
+\begin{tabular}{p{0in}p{0.4in}p{0.1in}p{0.3in}p{0.5in}p{0.5in}p{0.1in}p{0.3in}p{0.5in}p{0.7in}l}
+& & & & & & & & & \\
+                      &
+\instbitrange{31}{28} &
+\instbit{27} &
+\instbitrange{26}{25} &
+\instbitrange{24}{20} &
+\instbitrange{19}{15} &
+\instbit{14} &
+\instbitrange{13}{12} &
+\instbitrange{11}{7} &
+\instbitrange{6}{0} \\
+\cline{2-10}
+
+
+&
+\multicolumn{9}{c}{} & \\
+&
+\multicolumn{9}{c}{\bf RV32V Standard Extension} & \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1000} &
+\multicolumn{2}{c|}{000} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VADD \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1000} &
+\multicolumn{2}{c|}{001} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VSUB \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1001} &
+\multicolumn{2}{c|}{000} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VSL \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1101} &
+\multicolumn{2}{c|}{000} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VSR \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1111} &
+\multicolumn{2}{c|}{000} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VAND \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1110} &
+\multicolumn{2}{c|}{000} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VOR \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1100} &
+\multicolumn{2}{c|}{000} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VXOR \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1001} &
+\multicolumn{2}{c|}{100} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VSEQ \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1001} &
+\multicolumn{2}{c|}{101} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VSNE \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1001} &
+\multicolumn{2}{c|}{110} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VSLT \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1001} &
+\multicolumn{2}{c|}{111} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VSGE \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1011} &
+\multicolumn{2}{c|}{000} &
+\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VCLIP \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1011} &
+\multicolumn{2}{c|}{001} &
+\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VCVT \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1010} &
+\multicolumn{2}{c|}{111} &
+\multicolumn{1}{c|}{00001} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{1100111} & VMPOP \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1010} &
+\multicolumn{2}{c|}{111} &
+\multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{1100111} & VMFIRST \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1010} &
+\multicolumn{2}{c|}{000} &
+\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{rd} &
+\multicolumn{1}{c|}{1100111} & VEXTRACT \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1011} &
+\multicolumn{2}{c|}{100} &
+\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VINSERT \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1100} &
+\multicolumn{2}{c|}{001} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VMERGE \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1100} &
+\multicolumn{2}{c|}{010} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VSELECT \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1011} &
+\multicolumn{2}{c|}{010} &
+\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VSLIDE \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1000} &
+\multicolumn{2}{c|}{100} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VDIV \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1000} &
+\multicolumn{2}{c|}{101} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VREM \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1000} &
+\multicolumn{2}{c|}{110} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VMUL \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1000} &
+\multicolumn{2}{c|}{111} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VMULH \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1000} &
+\multicolumn{2}{c|}{010} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VMIN \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1000} &
+\multicolumn{2}{c|}{011} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VMAX \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1001} &
+\multicolumn{2}{c|}{010} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VSGNJ \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1001} &
+\multicolumn{2}{c|}{011} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VSGNJN \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1001} &
+\multicolumn{2}{c|}{001} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VSGNJX \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1100} &
+\multicolumn{2}{c|}{111} &
+\multicolumn{1}{c|}{00010} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VSQRT \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1100} &
+\multicolumn{2}{c|}{111} &
+\multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VCLASS \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{1100} &
+\multicolumn{2}{c|}{111} &
+\multicolumn{1}{c|}{00001} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VPOPC \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{0000} &
+\multicolumn{3}{c|}{imm[7:0]} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VADDI \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{0001} &
+\multicolumn{3}{c|}{imm[7:0]} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VSLI \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{0101} &
+\multicolumn{3}{c|}{imm[7:0]} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VSRI \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{0111} &
+\multicolumn{3}{c|}{imm[7:0]} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VANDI \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{0110} &
+\multicolumn{3}{c|}{imm[7:0]} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VORI \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{0100} &
+\multicolumn{3}{c|}{imm[7:0]} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VXORI \\
+\cline{2-10}
+  
+
+&
+\multicolumn{1}{|c|}{0011} &
+\multicolumn{3}{c|}{imm[7:0]} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VCLIPI \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{vs3} &
+\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{0} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VMADD \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{vs3} &
+\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{0} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VMSUB \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{vs3} &
+\multicolumn{1}{c|}{11} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{0} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VNMADD \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{vs3} &
+\multicolumn{1}{c|}{10} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{vs1} &
+\multicolumn{1}{c|}{0} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{1100111} & VNMSUB \\
+\cline{2-10}
+  
+
+\end{tabular}
+\end{center}
+\end{small}
+
+\label{instr-table}
+\end{table}
+  
+
+\newpage
+
+\begin{table}[p]
+\begin{small}
+\begin{center}
+\begin{tabular}{p{0in}p{0.4in}p{0.1in}p{0.3in}p{0.5in}p{0.5in}p{0.1in}p{0.3in}p{0.5in}p{0.7in}l}
+& & & & & & & & & \\
+                      &
+\instbitrange{31}{28} &
+\instbit{27} &
+\instbitrange{26}{25} &
+\instbitrange{24}{20} &
+\instbitrange{19}{15} &
+\instbit{14} &
+\instbitrange{13}{12} &
+\instbitrange{11}{7} &
+\instbitrange{6}{0} \\
+\cline{2-10}
+
+
+&
+\multicolumn{9}{c}{} & \\
+&
+\multicolumn{9}{c}{\bf RV32V Standard Extension (cont.)} & \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{imm[4:0]} &
+\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{0000111} & VLD \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{imm[4:0]} &
+\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{0000111} & VLDS \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{imm[4:0]} &
+\multicolumn{1}{c|}{10} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{0000111} & VLDX \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{vs3} &
+\multicolumn{1}{c|}{00} &
+\multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{imm[4:0]} &
+\multicolumn{1}{c|}{0100111} & VST \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{vs3} &
+\multicolumn{1}{c|}{01} &
+\multicolumn{1}{c|}{rs2} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{imm[4:0]} &
+\multicolumn{1}{c|}{0100111} & VSTS \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{vs3} &
+\multicolumn{1}{c|}{10} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{rs1} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{imm[4:0]} &
+\multicolumn{1}{c|}{0100111} & VSTX \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{vs3} &
+\multicolumn{1}{c|}{11} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{00001} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{0100111} & VAMOSWAP \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{vs3} &
+\multicolumn{1}{c|}{11} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{0100111} & VAMOADD \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{vs3} &
+\multicolumn{1}{c|}{11} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{01100} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{0100111} & VAMOAND \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{vs3} &
+\multicolumn{1}{c|}{11} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{01000} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{0100111} & VAMOOR \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{vs3} &
+\multicolumn{1}{c|}{11} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{00100} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{0100111} & VAMOXOR \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{vs3} &
+\multicolumn{1}{c|}{11} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{10000} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{0100111} & VAMOMIN \\
+\cline{2-10}
+  
+
+&
+\multicolumn{2}{|c|}{vs3} &
+\multicolumn{1}{c|}{11} &
+\multicolumn{1}{c|}{vs2} &
+\multicolumn{1}{c|}{10100} &
+\multicolumn{1}{c|}{1} &
+\multicolumn{1}{c|}{m} &
+\multicolumn{1}{c|}{vd} &
+\multicolumn{1}{c|}{0100111} & VAMOMAX \\
+\cline{2-10}
+  
+
+\end{tabular}
+\end{center}
+\end{small}
+\caption{Instruction listing for RISC-V}
+\label{instr-table}
+\end{table}
+  
diff --git a/src/v.tex b/src/v.tex
index 271a4c9..e2d7ec0 100644
--- a/src/v.tex
+++ b/src/v.tex
@@ -1393,3 +1393,10 @@ precise dot-products.
 
 \section{Optional Transcendental Support}
 
+\section{Instruction-Set Encoding}
+
+\note{This section is out of date.}
+
+On the next two pages is a proposed instruction-set encoding.
+
+\input{v-instr-table}