From 9f674be2c3d63bfea4fbbe34dd22dba3f7eadfc8 Mon Sep 17 00:00:00 2001 From: Jon French Date: Tue, 28 Aug 2018 14:43:23 +0100 Subject: fix bug in RISCV assembly mapping, incorrect order of FENCE pred/succ bits --- riscv/riscv.sail | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riscv/riscv.sail b/riscv/riscv.sail index d9baf299..d92ff5f6 100644 --- a/riscv/riscv.sail +++ b/riscv/riscv.sail @@ -665,7 +665,7 @@ mapping bit_maybe_o : bits(1) <-> string = { } mapping fence_bits : bits(4) <-> string = { - r : bits(1) @ w : bits(1) @ i : bits(1) @ o : bits(1) <-> bit_maybe_r(r) ^ bit_maybe_w(w) ^ bit_maybe_i(i) ^ bit_maybe_o(o) + i : bits(1) @ o : bits(1) @ r : bits(1) @ w : bits(1) <-> bit_maybe_i(i) ^ bit_maybe_o(o) ^ bit_maybe_r(r) ^ bit_maybe_w(w) } mapping clause assembly = FENCE(pred, succ) <-> "fence" ^ spc() ^ fence_bits(pred) ^ sep() ^ fence_bits(succ) -- cgit v1.2.3