aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Jenkins <charlie@rivosinc.com>2023-07-20 21:04:39 -0700
committerCharlie Jenkins <charlie@rivosinc.com>2023-07-20 21:04:39 -0700
commit327d2429937a41fac4d8ba180d4a21d718422072 (patch)
tree9612ece7de0743a69d1a3aa3eb6fdac59a60829f
parent546edec0a74b8cd64b0dce53041e90dde5ee6bac (diff)
downloadriscv-isa-manual-327d2429937a41fac4d8ba180d4a21d718422072.zip
riscv-isa-manual-327d2429937a41fac4d8ba180d4a21d718422072.tar.gz
riscv-isa-manual-327d2429937a41fac4d8ba180d4a21d718422072.tar.bz2
Make "Conditional Branches" wavdrom consistent
Bit 12 was merged with bits 10:5, but it was still labeled as 6 bits instead of 7. Bits 4:1 and 11 were merged in the label but not in the diagram and they were merged backward in the label. Merge them in the diagram and fix the label. Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
-rw-r--r--src/images/wavedrom/ct-conditional.adoc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/images/wavedrom/ct-conditional.adoc b/src/images/wavedrom/ct-conditional.adoc
index 84ef7c5..b886d7c 100644
--- a/src/images/wavedrom/ct-conditional.adoc
+++ b/src/images/wavedrom/ct-conditional.adoc
@@ -4,11 +4,10 @@
....
{reg: [
{bits: 7, name: 'opcode', attr: ['7', 'BRANCH', 'BRANCH', 'BRANCH'], type: 8},
- {bits: 1, name: '[11]', attr: '1', type: 3},
- {bits: 4, name: 'imm[4:1]', attr: ['4', 'offset[11|4:1]', 'offset[11|4:1]', 'offset[11|4:1]'], type: 3},
+ {bits: 5, name: 'imm[4:1|11]', attr: ['5', 'offset[4:1|11]', 'offset[4:1|11]', 'offset[4:1|11]'], type: 3},
{bits: 3, name: 'funct3', attr: ['3', 'BEQ/BNE', 'BLT[U]', 'BGE[U]'], type: 8},
{bits: 5, name: 'rs1', attr: ['5', 'src1', 'src1', 'src1'], type: 4},
{bits: 5, name: 'rs2', attr: ['5', 'src2','src2', 'src2'], type: 4},
- {bits: 7, name: 'imm[12|10:5]', attr: ['6', 'offset[12|10:5]', 'offset[12|10:5]', 'offset[12|10:5]'], type: 3},
+ {bits: 7, name: 'imm[12|10:5]', attr: ['7', 'offset[12|10:5]', 'offset[12|10:5]', 'offset[12|10:5]'], type: 3},
], config:{fontsize: 10}}
....