From 17a3dd72c7f143c004dde7c81b498a4c694f26b8 Mon Sep 17 00:00:00 2001 From: Tariq Kurd Date: Thu, 4 Jan 2024 15:43:54 +0000 Subject: [PATCH] resolve overlapping encodings --- unratified/rv64_cheri | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/unratified/rv64_cheri b/unratified/rv64_cheri index ee76f405..5ade1bd5 100644 --- a/unratified/rv64_cheri +++ b/unratified/rv64_cheri @@ -1,10 +1,10 @@ lc rd rs1 imm12 14..12=4 6..2=0x03 1..0=3 sc imm12hi rs1 rs2 imm12lo 14..12=4 6..2=0x08 1..0=3 -#maybe doesn't need full 12-bit immediate -cincoffsetimm rd rs1 imm12 14..12=1 6..2=0x04 1..0=3 -#can trim to 5-bit immediate -csetboundsimm rd rs1 imm12 14..12=5 6..2=0x04 1..0=3 +#6-bit immediate fits, should hopefully be enough? +cincoffsetimm rd rs1 imm6 31..26=1 14..12=1 6..2=0x04 1..0=3 +#5-bit immediate and 25 says whether to shift it +csetboundsimm rd rs1 imm5 31..26=1 14..12=5 6..2=0x04 1..0=3 cincoffset rd rs1 rs2 31..25=6 14..12=0 6..2=0x0C 1..0=3 csetaddr rd rs1 rs2 31..25=6 14..12=1 6..2=0x0C 1..0=3