From a659d5afbadc97852190a8e3e95ad34d1e3308e9 Mon Sep 17 00:00:00 2001
From: Bill Traynor <wmat@riscv.org>
Date: Tue, 31 Jan 2023 13:45:39 -0500
Subject: Fixing table formatting

Aligning columns
Replacing latexmath with characters
---
 src/rvwmo.adoc | 98 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 48 insertions(+), 50 deletions(-)

(limited to 'src/rvwmo.adoc')

diff --git a/src/rvwmo.adoc b/src/rvwmo.adoc
index 75d6638..aec4351 100644
--- a/src/rvwmo.adoc
+++ b/src/rvwmo.adoc
@@ -409,24 +409,24 @@ Key:
 
 - ^D^Data source register
 
-- latexmath:[$^\dagger$]The instruction does not carry a dependency from
+- † The instruction does not carry a dependency from
 any source register to any destination register
 
-- latexmath:[$^\ddagger$]The instruction carries dependencies from source
+- ‡ The instruction carries dependencies from source
 register(s) to destination register(s) as specified
 
 .RV32I Base Integer Instruction Set
-[%autowidth,float="center",align="center",cols="<,<,<,<",options="header"]
+[%autowidth,float="center",align="center",cols="<,<,<,<,<",options="header"]
 |===
-||Source Registers |Destination  Registers|Accumulating CSRs
+||Source Registers |Destination  Registers|Accumulating CSRs||
 
-|LUI | |_rd_ |
+|LUI | |_rd_ | ||
 
-|AUIPC | |_rd_ |
+|AUIPC | |_rd_ |||
 
-|JAL | |_rd_ |
+|JAL | |_rd_ |||
 
-|JALR latexmath:[$^\dagger$] |_rs1_ |_rd_ |
+|JALR† |_rs1_ |_rd_ 
 
 |BEQ |_rs1_, _rs2_ | |
 
@@ -440,15 +440,15 @@ register(s) to destination register(s) as specified
 
 |BGEU |_rs1_, _rs2_ | |
 
-|LB latexmath:[$^\dagger$] | _rs1_  ^A^ | _rd_ |
+|LB † | _rs1_  ^A^ | _rd_ |
 
-|LH latexmath:[$^\dagger$] | _rs1_  ^A^ | _rd_ |
+|LH † | _rs1_  ^A^ | _rd_ |
 
-|LW latexmath:[$^\dagger$] | _rs1_  ^A^ | _rd_ |
+|LW † | _rs1_  ^A^ | _rd_ |
 
-|LBU latexmath:[$^\dagger$] | _rs1_  ^A^ | _rd_ |
+|LBU † | _rs1_  ^A^ | _rd_ |
 
-|LHU latexmath:[$^\dagger$] | _rs1_  ^A^ | _rd_ |
+|LHU † | _rs1_  ^A^ | _rd_ |
 
 |SB |_rs1_  ^A^, _rs2_ ^D^ | |
 
@@ -502,22 +502,21 @@ register(s) to destination register(s) as specified
 
 |EBREAK | | |
 
-|CSRRW‡ latexmath:[$^\ddagger$]  |_rs1_, _csr_^*^ | _rd_, _csr_ | ^*^unless _rd_=`x0`
-
-|CSRRS latexmath:[$^\ddagger$] |_rs1_, _csr_ |_rd_ ^*^, _csr_ |^*^unless _rs1_=`x0`
+|CSRRW‡ |_rs1_, _csr_^*^ | _rd_, _csr_ | |^*^unless _rd_=`x0`
 
-|CSRRC latexmath:[$^\ddagger$] |_rs1_, _csr_  |_rd_ ^*^, _csr_ |^*^unless _rs1_=`x0`
+|CSRRS‡ |_rs1_, _csr_ |_rd_ ^*^, _csr_ | |^*^unless _rs1_=`x0`
 
-4+|latexmath:[$\ddagger$]carries a dependency from _rs1_ to _csr_ and from _csr_ to _rd_
+|CSRRC‡ |_rs1_, _csr_  |_rd_ ^*^, _csr_ | |^*^unless _rs1_=`x0`
 
+5+| ‡ carries a dependency from _rs1_ to _csr_ and from _csr_ to _rd_
 
-|CSRRWI latexmath:[$^\ddagger$] |_csr_ ^*^ |_rd_, _csr_  |^*^unless _rd_=_x0_
+|CSRRWI ‡ |_csr_ ^*^ |_rd_, _csr_  | |^*^unless _rd_=_x0_
 
-|CSRRSI latexmath:[$^\ddagger$] |_csr_ |_rd_, _csr_^*^  |^*^unless uimm[4:0]=0
+|CSRRSI ‡ |_csr_ |_rd_, _csr_^*^  | |^*^unless uimm[4:0]=0
 
-|CSRRCI latexmath:[$^\ddagger$] |_csr_ |_rd_, _csr_^*^  |^*^unless uimm[4:0]=0
+|CSRRCI ‡ |_csr_ |_rd_, _csr_^*^  | |^*^unless uimm[4:0]=0
 
-4+|latexmath:[$\ddagger$]carries a dependency from _csr_ to _rd_
+4+| ‡ carries a dependency from _csr_ to _rd_
 |===
 
 .RV64I Base Integer Instruction Set
@@ -525,11 +524,11 @@ register(s) to destination register(s) as specified
 |===
 ||Source Registers |Destination Registers |Accumulating CSRs
 
-|_LWU_ latexmath:[$^\dagger$] |_rs1_  ^A^ |_rd_ |
+|_LWU_ † |_rs1_  ^A^ |_rd_ |
 
-|_LD_ latexmath:[$^\dagger$] |_rs1_  ^A^ |_rd_ |
+|_LD_ † |_rs1_  ^A^ |_rd_ |
 
-|SD |_rs1_  ^A^, _rs2_ ^D^ | |
+|SD |_rs1_  ^A^, _rs2_ ^D^ |
 
 |SLLI | _rs1_ | _rd_ |
 
@@ -599,27 +598,27 @@ register(s) to destination register(s) as specified
 |===
 ||Source Registers |Destination Registers |Accumulating CSRs|
 
-|LR.W latexmath:[$^\dagger$] | _rs1_  ^A^ | _rd_ | |
+|LR.W† | _rs1_  ^A^ | _rd_ | |
 
-|SC.W latexmath:[$^\dagger$] | _rs1_  ^A^, _rs2_ ^D^ | _rd_ ^*^ | | ^*^ if successful
+|SC.W† | _rs1_  ^A^, _rs2_ ^D^ | _rd_ ^*^ | | ^*^ if successful
 
-|AMOSWAP.W latexmath:[$^\dagger$] |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
+|AMOSWAP.W† |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
 
-|AMOADD.W latexmath:[$^\dagger$] |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
+|AMOADD.W† |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
 
-|AMOXOR.W latexmath:[$^\dagger$] |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
+|AMOXOR.W† |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
 
-|AMOAND.W latexmath:[$^\dagger$] |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
+|AMOAND.W† |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
 
-|AMOOR.W latexmath:[$^\dagger$] |_rs1_ ^A^, _rs2_^D^ |_rd_ | |
+|AMOOR.W† |_rs1_ ^A^, _rs2_^D^ |_rd_ | |
 
-|AMOMIN.W latexmath:[$^\dagger$] |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
+|AMOMIN.W† |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
 
-|AMOMAX.W latexmath:[$^\dagger$] |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
+|AMOMAX.W† |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
 
-|AMOMINU.W latexmath:[$^\dagger$] |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
+|AMOMINU.W† |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
 
-|AMOMAXU.W latexmath:[$^\dagger$] |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
+|AMOMAXU.W† |_rs1_ ^A^, _rs2_ ^D^ |_rd_ | |
 
 |===
 
@@ -629,28 +628,27 @@ register(s) to destination register(s) as specified
 
 | |Source Registers |Destination Registers |Accumulating CSRs|
 
-|LR.D latexmath:[$^\dagger$] |_rs1_  ^A^ |_rd_ | |
+|LR.D† |_rs1_  ^A^ |_rd_ | |
 
-|SC.D latexmath:[$^\dagger$] |_rs1_ ^A^, _rs2_ ^D^ |_rd_ ^*^ | |^*^if
-successful
+|SC.D† |_rs1_ ^A^, _rs2_ ^D^ |_rd_ ^*^ | |^*^if successful
 
-|AMOSWAP.D latexmath:[$^\dagger$] |_rs1_  ^A^, _rs2_ ^D^ |_rd_ | |
+|AMOSWAP.D† |_rs1_  ^A^, _rs2_ ^D^ |_rd_ | |
 
-|AMOADD.D latexmath:[$^\dagger$] |_rs1_  ^A^, _rs2_ ^D^ |_rd_ | |
+|AMOADD.D† |_rs1_  ^A^, _rs2_ ^D^ |_rd_ | |
 
-|AMOXOR.D latexmath:[$^\dagger$] |_rs1_  ^A^, _rs2_ ^D^ |_rd_ | |
+|AMOXOR.D† |_rs1_  ^A^, _rs2_ ^D^ |_rd_ | |
 
-|AMOAND.D latexmath:[$^\dagger$] |_rs1_  ^A^, _rs2_^D^ |_rd_ | |
+|AMOAND.D† |_rs1_  ^A^, _rs2_^D^ |_rd_ | |
 
-|AMOOR.D latexmath:[$^\dagger$] |_rs1_ ^A^, _rs2_^D^ |_rd_ | |
+|AMOOR.D† |_rs1_ ^A^, _rs2_^D^ |_rd_ | |
 
-|AMOMIN.D latexmath:[$^\dagger$] |_rs1_ ^A^, _rs2_^D^ |_rd_ | |
+|AMOMIN.D† |_rs1_ ^A^, _rs2_^D^ |_rd_ | |
 
-|AMOMAX.D latexmath:[$^\dagger$] |_rs1_ ^A^, _rs2_^D^ |_rd_ | |
+|AMOMAX.D† |_rs1_ ^A^, _rs2_^D^ |_rd_ | |
 
-|AMOMINU.D latexmath:[$^\dagger$] |_rs1_ ^A^, _rs2_^D^ |_rd_ | |
+|AMOMINU.D† |_rs1_ ^A^, _rs2_^D^ |_rd_ | |
 
-|AMOMAXU.D latexmath:[$^\dagger$] |_rs1_ ^A^, _rs2_^D^ |_rd_ | |
+|AMOMAXU.D† |_rs1_ ^A^, _rs2_^D^ |_rd_ | |
 
 |===
 
@@ -661,7 +659,7 @@ successful
 | |Source Registers |Destination Registers |Accumulating CSRs |
 
 
-|FLWlatexmath:[$^\dagger$] |_rs1_ ^A^ |_rd_ | |
+|FLW† |_rs1_ ^A^ |_rd_ | |
 
 |FSW |_rs1_ ^A^, _rs2_^D^ | | |
 
@@ -737,7 +735,7 @@ successful
 | |Source Registers|Destination Registers |Accumulating CSRs |
 
 
-|FLD latexmath:[$^\dagger$] |_rs1_ ^A^ |_rd_ | |
+|FLD† |_rs1_ ^A^ |_rd_ | |
 
 |FSD |_rs1_ ^A^, _rs2_^D^ | | |
 
-- 
cgit v1.1

