From 7cfa12ecc41be453ebb5bf9721a41f29d210e7ff Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Thu, 12 Jan 2023 13:06:43 -0800 Subject: Rename RV128 shamt to shamtq This will reduce the chance that people pick the wrong shamt width. --- constants.py | 3 ++- unratified/rv128_i | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/constants.py b/constants.py index 372d2d3..718b5ee 100644 --- a/constants.py +++ b/constants.py @@ -494,7 +494,7 @@ arg_lut['bimm12hi'] = (31, 25) arg_lut['imm12lo'] = (11, 7) arg_lut['bimm12lo'] = (11, 7) arg_lut['zimm'] = (19, 15) -arg_lut['shamt'] = (26, 20) +arg_lut['shamtq'] = (26, 20) arg_lut['shamtw'] = (24, 20) arg_lut['shamtw4'] = (23, 20) arg_lut['shamtd'] = (25, 20) @@ -592,6 +592,7 @@ latex_mapping['jimm20'] = 'imm[20$\\vert$10:1$\\vert$11$\\vert$19:12]' latex_mapping['zimm'] = 'uimm' latex_mapping['shamtw'] = 'shamt' latex_mapping['shamtd'] = 'shamt' +latex_mapping['shamtq'] = 'shamt' latex_mapping['rd_p'] = "rd\\,$'$" latex_mapping['rs1_p'] = "rs1\\,$'$" latex_mapping['rs2_p'] = "rs2\\,$'$" diff --git a/unratified/rv128_i b/unratified/rv128_i index 1d62fe5..05c521e 100644 --- a/unratified/rv128_i +++ b/unratified/rv128_i @@ -17,6 +17,6 @@ ldu rd rs1 imm12 14..12=7 6..2=0x00 1..0=3 sq imm12hi rs1 rs2 imm12lo 14..12=4 6..2=0x08 1..0=3 # RV32 and RV64 versions of these are in opcodes-pseudo -slli rd rs1 31..27=0 shamt 14..12=1 6..2=0x04 1..0=3 -srli rd rs1 31..27=0 shamt 14..12=5 6..2=0x04 1..0=3 -srai rd rs1 31..27=8 shamt 14..12=5 6..2=0x04 1..0=3 +slli rd rs1 31..27=0 shamtq 14..12=1 6..2=0x04 1..0=3 +srli rd rs1 31..27=0 shamtq 14..12=5 6..2=0x04 1..0=3 +srai rd rs1 31..27=8 shamtq 14..12=5 6..2=0x04 1..0=3 -- cgit v1.1