aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Waterman <andrew@sifive.com>2017-05-07 19:17:49 -0700
committerAndrew Waterman <andrew@sifive.com>2017-05-07 19:18:07 -0700
commit56b0bf9dd7579b3aa433773650bb6328abff93f5 (patch)
treeb52192b714072897e1b235c27bbea8ba64094267
parent650d64e15836ca556e90980115f27f44618b855b (diff)
downloadriscv-isa-manual-56b0bf9dd7579b3aa433773650bb6328abff93f5.zip
riscv-isa-manual-56b0bf9dd7579b3aa433773650bb6328abff93f5.tar.gz
riscv-isa-manual-56b0bf9dd7579b3aa433773650bb6328abff93f5.tar.bz2
SB/UJ -> B/J
-rw-r--r--src/instr-table.tex4
-rw-r--r--src/rv32.tex6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/instr-table.tex b/src/instr-table.tex
index 418a0f8..209c58d 100644
--- a/src/instr-table.tex
+++ b/src/instr-table.tex
@@ -55,7 +55,7 @@
\multicolumn{1}{c|}{rs1} &
\multicolumn{1}{c|}{funct3} &
\multicolumn{1}{c|}{imm[4:1$\vert$11]} &
-\multicolumn{1}{c|}{opcode} & SB-type \\
+\multicolumn{1}{c|}{opcode} & B-type \\
\cline{2-11}
@@ -69,7 +69,7 @@
&
\multicolumn{8}{|c|}{imm[20$\vert$10:1$\vert$11$\vert$19:12]} &
\multicolumn{1}{c|}{rd} &
-\multicolumn{1}{c|}{opcode} & UJ-type \\
+\multicolumn{1}{c|}{opcode} & J-type \\
\cline{2-11}
diff --git a/src/rv32.tex b/src/rv32.tex
index dcaf335..3c08dd0 100644
--- a/src/rv32.tex
+++ b/src/rv32.tex
@@ -227,7 +227,7 @@ high-order bit in B format.
Similarly, the only difference between the U and J formats is
that the 20-bit immediate is shifted left by 12 bits to form U
immediates and by 1 bit to form J immediates. The location of
-instruction bits in the U and UJ format immediates is chosen to
+instruction bits in the U and J format immediates is chosen to
maximize overlap with the other formats and with each other.
\begin{figure}[h]
@@ -639,7 +639,7 @@ slots.
\subsubsection*{Unconditional Jumps}
-\vspace{-0.1in} The jump and link (JAL) instruction uses the UJ-type
+\vspace{-0.1in} The jump and link (JAL) instruction uses the J-type
format, where the J-immediate encodes a signed offset in multiples of
2 bytes. The offset is sign-extended and added to the {\tt pc}
to form the jump target address. Jumps can therefore target a
@@ -794,7 +794,7 @@ enable macro-op fusion of the sequences:\linebreak
\subsubsection*{Conditional Branches}
-All branch instructions use the SB-type instruction format. The
+All branch instructions use the B-type instruction format. The
12-bit B-immediate encodes signed offsets in multiples of 2, and is
added to the current {\tt pc} to give the target address. The
conditional branch range is $\pm$\wunits{4}{KiB}.