aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunsup Lee <yunsup@cs.berkeley.edu>2013-11-21 14:42:32 -0800
committerYunsup Lee <yunsup@cs.berkeley.edu>2013-11-21 14:42:32 -0800
commitee7867e79ed0a80e23b3b1863adcb0dfd8427e1b (patch)
treed661f258867b828a0fb581afc1007c70cf6087cf
parent15ca044738d478f427300d211fe50e9a1b1b5ac6 (diff)
downloadriscv-isa-sim-ee7867e79ed0a80e23b3b1863adcb0dfd8427e1b.zip
riscv-isa-sim-ee7867e79ed0a80e23b3b1863adcb0dfd8427e1b.tar.gz
riscv-isa-sim-ee7867e79ed0a80e23b3b1863adcb0dfd8427e1b.tar.bz2
fix slli/slliw encoding bug
-rw-r--r--hwacha/opcodes_hwacha_ut.h4
-rw-r--r--riscv/opcodes.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/hwacha/opcodes_hwacha_ut.h b/hwacha/opcodes_hwacha_ut.h
index 903efc5..cca5154 100644
--- a/hwacha/opcodes_hwacha_ut.h
+++ b/hwacha/opcodes_hwacha_ut.h
@@ -10,7 +10,7 @@ DECLARE_INSN(ut_remuw, 0x200703b, 0xfe00707f)
DECLARE_INSN(ut_fmin_d, 0xc2000053, 0xfe00707f)
DECLARE_INSN(ut_amomax_d, 0xa000302f, 0xf800707f)
DECLARE_INSN(ut_fmin_s, 0xc0000053, 0xfe00707f)
-DECLARE_INSN(ut_slliw, 0x4000101b, 0xfe00707f)
+DECLARE_INSN(ut_slliw, 0x101b, 0xfe00707f)
DECLARE_INSN(ut_lb, 0x3, 0x707f)
DECLARE_INSN(ut_fcvt_s_wu, 0x78000053, 0xfff0007f)
DECLARE_INSN(ut_fcvt_d_l, 0x62000053, 0xfff0007f)
@@ -100,7 +100,7 @@ DECLARE_INSN(ut_remu, 0x2007033, 0xfe00707f)
DECLARE_INSN(ut_flw, 0x2007, 0x707f)
DECLARE_INSN(ut_remw, 0x200603b, 0xfe00707f)
DECLARE_INSN(ut_sltu, 0x3033, 0xfe00707f)
-DECLARE_INSN(ut_slli, 0x40001013, 0xfc00707f)
+DECLARE_INSN(ut_slli, 0x1013, 0xfc00707f)
DECLARE_INSN(ut_amoor_w, 0x4000202f, 0xf800707f)
DECLARE_INSN(ut_fld, 0x3007, 0x707f)
DECLARE_INSN(ut_fsub_s, 0x8000053, 0xfe00007f)
diff --git a/riscv/opcodes.h b/riscv/opcodes.h
index 2a42554..aa2a38c 100644
--- a/riscv/opcodes.h
+++ b/riscv/opcodes.h
@@ -5,7 +5,7 @@ DECLARE_INSN(fmin_d, 0xc2000053, 0xfe00707f)
DECLARE_INSN(amomax_d, 0xa000302f, 0xf800707f)
DECLARE_INSN(bltu, 0x6063, 0x707f)
DECLARE_INSN(fmin_s, 0xc0000053, 0xfe00707f)
-DECLARE_INSN(slliw, 0x4000101b, 0xfe00707f)
+DECLARE_INSN(slliw, 0x101b, 0xfe00707f)
DECLARE_INSN(lb, 0x3, 0x707f)
DECLARE_INSN(fcvt_s_wu, 0x78000053, 0xfff0007f)
DECLARE_INSN(fcvt_d_l, 0x62000053, 0xfff0007f)
@@ -113,7 +113,7 @@ DECLARE_INSN(remu, 0x2007033, 0xfe00707f)
DECLARE_INSN(flw, 0x2007, 0x707f)
DECLARE_INSN(remw, 0x200603b, 0xfe00707f)
DECLARE_INSN(sltu, 0x3033, 0xfe00707f)
-DECLARE_INSN(slli, 0x40001013, 0xfc00707f)
+DECLARE_INSN(slli, 0x1013, 0xfc00707f)
DECLARE_INSN(amoor_w, 0x4000202f, 0xf800707f)
DECLARE_INSN(beq, 0x63, 0x707f)
DECLARE_INSN(fld, 0x3007, 0x707f)