Skip to content

Commit e66dd0a

Browse files
committed
Make lr/sc encdec mapping formatting consistent
1 parent 972c997 commit e66dd0a

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/cheri_insts.sail

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,14 +1161,10 @@ mapping clause assembly = AMOSwapCap(cd, cs2, rs1, aq, rl) <-> "amoswap.c" ^ m
11611161
widths but refuses to decode them we can implement them for CHERI simply by
11621162
adding the decodings here.
11631163
*/
1164-
mapping clause encdec = LOADRES(aq, rl, rs1, size, rd)
1165-
if extensionEnabled(Ext_Zalrsc) & ((size == BYTE) | (size == HALF))
1166-
<-> 0b00010 @ bool_bits(aq) @ bool_bits(rl) @ 0b00000 @ rs1 @ 0b0 @ size_enc(size) @ rd @ 0b0101111
1167-
if extensionEnabled(Ext_Zalrsc) & ((size == BYTE) | (size == HALF))
1168-
mapping clause encdec = STORECON(aq, rl, rs2, rs1, size, rd)
1169-
if extensionEnabled(Ext_Zalrsc) & ((size == BYTE) | (size == HALF))
1170-
<-> 0b00011 @ bool_bits(aq) @ bool_bits(rl) @ rs2 @ rs1 @ 0b0 @ size_enc(size) @ rd @ 0b0101111
1171-
if extensionEnabled(Ext_Zalrsc) & ((size == BYTE) | (size == HALF))
1164+
mapping clause encdec = LOADRES(aq, rl, rs1, size, rd) if extensionEnabled(Ext_Zalrsc) & ((size == BYTE) | (size == HALF))
1165+
<-> 0b00010 @ bool_bits(aq) @ bool_bits(rl) @ 0b00000 @ rs1 @ 0b0 @ size_enc(size) @ rd @ 0b0101111 if extensionEnabled(Ext_Zalrsc) & ((size == BYTE) | (size == HALF))
1166+
mapping clause encdec = STORECON(aq, rl, rs2, rs1, size, rd) if extensionEnabled(Ext_Zalrsc) & ((size == BYTE) | (size == HALF))
1167+
<-> 0b00011 @ bool_bits(aq) @ bool_bits(rl) @ rs2 @ rs1 @ 0b0 @ size_enc(size) @ rd @ 0b0101111 if extensionEnabled(Ext_Zalrsc) & ((size == BYTE) | (size == HALF))
11721168

11731169
/*
11741170
* Encoding/assembly mappings for capmode specific instructions. This does not

0 commit comments

Comments
 (0)