From: Andrew Waterman <waterman@eecs.berkeley.edu>
Date: Mon, 19 Mar 2012 03:49:31 +0000 (-0700)
Subject: update vector fences
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=128c0d6d8addf3a2edcc706373838db7e9a8fbc4;p=riscv-isa-sim.git

update vector fences
---

diff --git a/riscv/insns/fence_g_cv.h b/riscv/insns/fence_g_cv.h
deleted file mode 100644
index e69de29..0000000
diff --git a/riscv/insns/fence_g_v.h b/riscv/insns/fence_g_v.h
deleted file mode 100644
index e69de29..0000000
diff --git a/riscv/insns/fence_l_cv.h b/riscv/insns/fence_l_cv.h
deleted file mode 100644
index e69de29..0000000
diff --git a/riscv/insns/fence_l_v.h b/riscv/insns/fence_l_v.h
deleted file mode 100644
index e69de29..0000000
diff --git a/riscv/insns/fence_v_g.h b/riscv/insns/fence_v_g.h
new file mode 100644
index 0000000..e69de29
diff --git a/riscv/insns/fence_v_l.h b/riscv/insns/fence_v_l.h
new file mode 100644
index 0000000..e69de29
diff --git a/riscv/opcodes.h b/riscv/opcodes.h
index 670e0bf..feeca92 100644
--- a/riscv/opcodes.h
+++ b/riscv/opcodes.h
@@ -10,7 +10,6 @@ DECLARE_INSN(vvcfg, 0x473, 0xf801ffff)
 DECLARE_INSN(movz, 0x2f7, 0x1ffff)
 DECLARE_INSN(fcvt_lu_s, 0x9053, 0x3ff1ff)
 DECLARE_INSN(c_ld, 0x9, 0x1f)
-DECLARE_INSN(fence_l_cv, 0x32f, 0x3ff)
 DECLARE_INSN(c_srli32, 0xc19, 0x1c1f)
 DECLARE_INSN(fmin_s, 0x18053, 0x1ffff)
 DECLARE_INSN(c_lw0, 0x12, 0x801f)
@@ -24,7 +23,6 @@ DECLARE_INSN(fcvt_d_w, 0xe0d3, 0x3ff1ff)
 DECLARE_INSN(lw, 0x103, 0x3ff)
 DECLARE_INSN(add, 0x33, 0x1ffff)
 DECLARE_INSN(fcvt_d_s, 0x100d3, 0x3ff1ff)
-DECLARE_INSN(fence_g_v, 0x2af, 0x3ff)
 DECLARE_INSN(mfpcr, 0x17b, 0x7c1ffff)
 DECLARE_INSN(c_fsd, 0x18, 0x1f)
 DECLARE_INSN(fmax_d, 0x190d3, 0x1ffff)
@@ -79,6 +77,7 @@ DECLARE_INSN(fnmsub_s, 0x4b, 0x1ff)
 DECLARE_INSN(vfssegstd, 0xd8f, 0xfff)
 DECLARE_INSN(fcvt_l_s, 0x8053, 0x3ff1ff)
 DECLARE_INSN(fle_s, 0x17053, 0x1ffff)
+DECLARE_INSN(fence_v_l, 0x22f, 0x3ff)
 DECLARE_INSN(vsb, 0xf, 0x3fffff)
 DECLARE_INSN(mffsr, 0x1d053, 0x7ffffff)
 DECLARE_INSN(fdiv_s, 0x3053, 0x1f1ff)
@@ -168,7 +167,6 @@ DECLARE_INSN(vlhu, 0x28b, 0x3fffff)
 DECLARE_INSN(vfsstd, 0x158f, 0x1ffff)
 DECLARE_INSN(c_bne, 0x11, 0x1f)
 DECLARE_INSN(fnmadd_d, 0xcf, 0x1ff)
-DECLARE_INSN(fence_g_cv, 0x3af, 0x3ff)
 DECLARE_INSN(amoadd_d, 0x1ab, 0x1ffff)
 DECLARE_INSN(c_sw, 0xd, 0x1f)
 DECLARE_INSN(amomax_w, 0x152b, 0x1ffff)
@@ -181,6 +179,7 @@ DECLARE_INSN(c_sd, 0xc, 0x1f)
 DECLARE_INSN(amoadd_w, 0x12b, 0x1ffff)
 DECLARE_INSN(fcvt_d_lu, 0xd0d3, 0x3ff1ff)
 DECLARE_INSN(amomax_d, 0x15ab, 0x1ffff)
+DECLARE_INSN(fsd, 0x1a7, 0x3ff)
 DECLARE_INSN(fcvt_w_d, 0xa0d3, 0x3ff1ff)
 DECLARE_INSN(fmovz, 0xaf7, 0x1ffff)
 DECLARE_INSN(feq_d, 0x150d3, 0x1ffff)
@@ -218,7 +217,7 @@ DECLARE_INSN(vlstwu, 0x130b, 0x1ffff)
 DECLARE_INSN(c_sub3, 0x11c, 0x31f)
 DECLARE_INSN(vsh, 0x8f, 0x3fffff)
 DECLARE_INSN(vlb, 0xb, 0x3fffff)
-DECLARE_INSN(vxcptsave, 0x1007b, 0xffffffff)
+DECLARE_INSN(vxcptsave, 0x1007b, 0xf83fffff)
 DECLARE_INSN(vlsegstd, 0x98b, 0xfff)
 DECLARE_INSN(vflsegd, 0x258b, 0x1ffff)
 DECLARE_INSN(vflsegw, 0x250b, 0x1ffff)
@@ -227,11 +226,11 @@ DECLARE_INSN(fsgnj_d, 0x50d3, 0x1ffff)
 DECLARE_INSN(vflsegstw, 0xd0b, 0xfff)
 DECLARE_INSN(c_sub, 0x801a, 0x801f)
 DECLARE_INSN(mulhu, 0x5b3, 0x1ffff)
-DECLARE_INSN(fcvt_l_d, 0x80d3, 0x3ff1ff)
+DECLARE_INSN(fence_v_g, 0x2af, 0x3ff)
 DECLARE_INSN(vmsv, 0x873, 0x3fffff)
 DECLARE_INSN(vmst, 0x1073, 0x1ffff)
 DECLARE_INSN(fadd_d, 0xd3, 0x1f1ff)
-DECLARE_INSN(vxcptrestore, 0x100fb, 0xffffffff)
+DECLARE_INSN(vxcptrestore, 0x100fb, 0xf83fffff)
 DECLARE_INSN(rdnpc, 0x26b, 0x7ffffff)
 DECLARE_INSN(vxcpthold, 0x1817b, 0xffffffff)
 DECLARE_INSN(fcvt_s_l, 0xc053, 0x3ff1ff)
@@ -252,7 +251,6 @@ DECLARE_INSN(c_slli32, 0x419, 0x1c1f)
 DECLARE_INSN(vlsegwu, 0x230b, 0x1ffff)
 DECLARE_INSN(vfsw, 0x50f, 0x3fffff)
 DECLARE_INSN(amoswap_d, 0x5ab, 0x1ffff)
-DECLARE_INSN(fence_l_v, 0x22f, 0x3ff)
 DECLARE_INSN(fsqrt_d, 0x40d3, 0x3ff1ff)
 DECLARE_INSN(vflw, 0x50b, 0x3fffff)
 DECLARE_INSN(fdiv_d, 0x30d3, 0x1f1ff)
@@ -264,7 +262,7 @@ DECLARE_INSN(amoswap_w, 0x52b, 0x1ffff)
 DECLARE_INSN(vfsd, 0x58f, 0x3fffff)
 DECLARE_INSN(fadd_s, 0x53, 0x1f1ff)
 DECLARE_INSN(vlsegb, 0x200b, 0x1ffff)
-DECLARE_INSN(fsd, 0x1a7, 0x3ff)
+DECLARE_INSN(fcvt_l_d, 0x80d3, 0x3ff1ff)
 DECLARE_INSN(vlsegd, 0x218b, 0x1ffff)
 DECLARE_INSN(vlsegh, 0x208b, 0x1ffff)
 DECLARE_INSN(sw, 0x123, 0x3ff)