From c7e8709e3de85d398ee9fa99317defd8c6a2756b Mon Sep 17 00:00:00 2001 From: Robert Norton Date: Thu, 1 Feb 2018 16:38:51 +0000 Subject: riscv: avoid name clash with global function 'unsigned'. --- riscv/riscv.sail | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/riscv/riscv.sail b/riscv/riscv.sail index e676353b..e8c1a2ea 100644 --- a/riscv/riscv.sail +++ b/riscv/riscv.sail @@ -159,9 +159,9 @@ function clause decode imm : bits(12) @ rs1 : regbits @ 0b101 @ rd : regbits @ 0 function clause decode imm : bits(12) @ rs1 : regbits @ 0b110 @ rd : regbits @ 0b0000011 = Some(LOAD(imm, rs1, rd, true, WORD, false, false)) -function clause execute(LOAD(imm, rs1, rd, unsigned, width, aq, rl)) = +function clause execute(LOAD(imm, rs1, rd, is_unsigned, width, aq, rl)) = let addr : bits(64) = rGPR(rs1) + EXTS(imm) in - let result : bits(64) = if unsigned then + let result : bits(64) = if is_unsigned then match width { BYTE => EXTZ(mem_read(addr, 1, aq, rl, false)), HALF => EXTZ(mem_read(addr, 2, aq, rl, false)), -- cgit v1.2.3