From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Wed, 7 Aug 2013 00:59:48 +0000 (-0700)
Subject: Swap J and JALR encoding
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d9bef8871f9e59e7cab17f3a31c054af1bf7f047;p=riscv-isa-sim.git

Swap J and JALR encoding
---

diff --git a/riscv/opcodes.h b/riscv/opcodes.h
index fd86d9d..90565e0 100644
--- a/riscv/opcodes.h
+++ b/riscv/opcodes.h
@@ -32,7 +32,7 @@ DECLARE_INSN(divuw, 0x6bb, 0x1ffff)
 DECLARE_INSN(mulw, 0x43b, 0x1ffff)
 DECLARE_INSN(srlw, 0x2bb, 0x1ffff)
 DECLARE_INSN(div, 0x633, 0x1ffff)
-DECLARE_INSN(j, 0x67, 0x7f)
+DECLARE_INSN(j, 0x6b, 0x7f)
 DECLARE_INSN(fence, 0x12f, 0x3ff)
 DECLARE_INSN(fnmsub_s, 0x4b, 0x1ff)
 DECLARE_INSN(fcvt_l_s, 0x8053, 0x3ff1ff)
@@ -146,7 +146,7 @@ DECLARE_INSN(divw, 0x63b, 0x1ffff)
 DECLARE_INSN(amomin_d, 0x11ab, 0x1ffff)
 DECLARE_INSN(divu, 0x6b3, 0x1ffff)
 DECLARE_INSN(amoswap_w, 0x52b, 0x1ffff)
-DECLARE_INSN(jalr, 0x6b, 0x3ff)
+DECLARE_INSN(jalr, 0x67, 0x3ff)
 DECLARE_INSN(fadd_s, 0x53, 0x1f1ff)
 DECLARE_INSN(fcvt_l_d, 0x80d3, 0x3ff1ff)
 DECLARE_INSN(sw, 0x123, 0x3ff)