aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure49
-rw-r--r--configure.ac3
-rw-r--r--hwacha/README2
-rw-r--r--hwacha/cvt16.cc128
-rw-r--r--hwacha/cvt16.h9
-rw-r--r--hwacha/decode_hwacha.h106
-rw-r--r--hwacha/decode_hwacha_ut.h90
-rw-r--r--hwacha/encodings_hwacha.h167
-rw-r--r--hwacha/hwacha.ac0
-rw-r--r--hwacha/hwacha.cc107
-rw-r--r--hwacha/hwacha.h62
-rw-r--r--hwacha/hwacha.mk.in45
-rw-r--r--hwacha/hwacha_disasm.cc203
-rw-r--r--hwacha/hwacha_xcpt.h19
-rw-r--r--hwacha/insn_template_hwacha.cc17
-rw-r--r--hwacha/insn_template_hwacha.h5
-rw-r--r--hwacha/insn_template_hwacha_ut.cc15
-rw-r--r--hwacha/insn_template_hwacha_ut.h7
-rw-r--r--hwacha/insns/vf.h38
-rw-r--r--hwacha/insns/vflsegd.h1
-rw-r--r--hwacha/insns/vflsegstd.h1
-rw-r--r--hwacha/insns/vflsegstw.h1
-rw-r--r--hwacha/insns/vflsegw.h1
-rw-r--r--hwacha/insns/vfmsv_d.h3
-rw-r--r--hwacha/insns/vfmsv_s.h3
-rw-r--r--hwacha/insns/vfmvv.h3
-rw-r--r--hwacha/insns/vfssegd.h1
-rw-r--r--hwacha/insns/vfssegstd.h1
-rw-r--r--hwacha/insns/vfssegstw.h1
-rw-r--r--hwacha/insns/vfssegw.h1
-rw-r--r--hwacha/insns/vgetcfg.h1
-rw-r--r--hwacha/insns/vgetvl.h1
-rw-r--r--hwacha/insns/vlsegb.h1
-rw-r--r--hwacha/insns/vlsegbu.h1
-rw-r--r--hwacha/insns/vlsegd.h1
-rw-r--r--hwacha/insns/vlsegh.h1
-rw-r--r--hwacha/insns/vlseghu.h1
-rw-r--r--hwacha/insns/vlsegstb.h1
-rw-r--r--hwacha/insns/vlsegstbu.h1
-rw-r--r--hwacha/insns/vlsegstd.h1
-rw-r--r--hwacha/insns/vlsegsth.h1
-rw-r--r--hwacha/insns/vlsegsthu.h1
-rw-r--r--hwacha/insns/vlsegstw.h1
-rw-r--r--hwacha/insns/vlsegstwu.h1
-rw-r--r--hwacha/insns/vlsegw.h1
-rw-r--r--hwacha/insns/vlsegwu.h1
-rw-r--r--hwacha/insns/vmsv.h2
-rw-r--r--hwacha/insns/vmvv.h3
-rw-r--r--hwacha/insns/vsetcfg.h15
-rw-r--r--hwacha/insns/vsetucfg.h1
-rw-r--r--hwacha/insns/vsetvl.h3
-rw-r--r--hwacha/insns/vssegb.h1
-rw-r--r--hwacha/insns/vssegd.h1
-rw-r--r--hwacha/insns/vssegh.h1
-rw-r--r--hwacha/insns/vssegstb.h1
-rw-r--r--hwacha/insns/vssegstd.h1
-rw-r--r--hwacha/insns/vssegsth.h1
-rw-r--r--hwacha/insns/vssegstw.h1
-rw-r--r--hwacha/insns/vssegw.h1
-rw-r--r--hwacha/insns/vxcptaux.h2
-rw-r--r--hwacha/insns/vxcptcause.h3
-rw-r--r--hwacha/insns/vxcptevac.h48
-rw-r--r--hwacha/insns/vxcpthold.h42
-rw-r--r--hwacha/insns/vxcptkill.h4
l---------hwacha/insns_ut/ut_add.h1
l---------hwacha/insns_ut/ut_addi.h1
l---------hwacha/insns_ut/ut_addiw.h1
l---------hwacha/insns_ut/ut_addw.h1
l---------hwacha/insns_ut/ut_amoadd_d.h1
l---------hwacha/insns_ut/ut_amoadd_w.h1
l---------hwacha/insns_ut/ut_amoand_d.h1
l---------hwacha/insns_ut/ut_amoand_w.h1
l---------hwacha/insns_ut/ut_amomax_d.h1
l---------hwacha/insns_ut/ut_amomax_w.h1
l---------hwacha/insns_ut/ut_amomaxu_d.h1
l---------hwacha/insns_ut/ut_amomaxu_w.h1
l---------hwacha/insns_ut/ut_amomin_d.h1
l---------hwacha/insns_ut/ut_amomin_w.h1
l---------hwacha/insns_ut/ut_amominu_d.h1
l---------hwacha/insns_ut/ut_amominu_w.h1
l---------hwacha/insns_ut/ut_amoor_d.h1
l---------hwacha/insns_ut/ut_amoor_w.h1
l---------hwacha/insns_ut/ut_amoswap_d.h1
l---------hwacha/insns_ut/ut_amoswap_w.h1
l---------hwacha/insns_ut/ut_amoxor_d.h1
l---------hwacha/insns_ut/ut_amoxor_w.h1
l---------hwacha/insns_ut/ut_and.h1
l---------hwacha/insns_ut/ut_andi.h1
l---------hwacha/insns_ut/ut_auipc.h1
l---------hwacha/insns_ut/ut_div.h1
l---------hwacha/insns_ut/ut_divu.h1
l---------hwacha/insns_ut/ut_divuw.h1
l---------hwacha/insns_ut/ut_divw.h1
l---------hwacha/insns_ut/ut_fadd_d.h1
-rw-r--r--hwacha/insns_ut/ut_fadd_h.h4
l---------hwacha/insns_ut/ut_fadd_s.h1
l---------hwacha/insns_ut/ut_fclass_d.h1
l---------hwacha/insns_ut/ut_fclass_s.h1
-rw-r--r--hwacha/insns_ut/ut_fcvt_d_h.h4
l---------hwacha/insns_ut/ut_fcvt_d_l.h1
l---------hwacha/insns_ut/ut_fcvt_d_lu.h1
l---------hwacha/insns_ut/ut_fcvt_d_s.h1
l---------hwacha/insns_ut/ut_fcvt_d_w.h1
l---------hwacha/insns_ut/ut_fcvt_d_wu.h1
-rw-r--r--hwacha/insns_ut/ut_fcvt_h_d.h4
-rw-r--r--hwacha/insns_ut/ut_fcvt_h_l.h5
-rw-r--r--hwacha/insns_ut/ut_fcvt_h_lu.h5
-rw-r--r--hwacha/insns_ut/ut_fcvt_h_s.h3
-rw-r--r--hwacha/insns_ut/ut_fcvt_h_w.h4
-rw-r--r--hwacha/insns_ut/ut_fcvt_h_wu.h4
l---------hwacha/insns_ut/ut_fcvt_l_d.h1
-rw-r--r--hwacha/insns_ut/ut_fcvt_l_h.h5
l---------hwacha/insns_ut/ut_fcvt_l_s.h1
l---------hwacha/insns_ut/ut_fcvt_lu_d.h1
-rw-r--r--hwacha/insns_ut/ut_fcvt_lu_h.h5
l---------hwacha/insns_ut/ut_fcvt_lu_s.h1
l---------hwacha/insns_ut/ut_fcvt_s_d.h1
-rw-r--r--hwacha/insns_ut/ut_fcvt_s_h.h3
l---------hwacha/insns_ut/ut_fcvt_s_l.h1
l---------hwacha/insns_ut/ut_fcvt_s_lu.h1
l---------hwacha/insns_ut/ut_fcvt_s_w.h1
l---------hwacha/insns_ut/ut_fcvt_s_wu.h1
l---------hwacha/insns_ut/ut_fcvt_w_d.h1
-rw-r--r--hwacha/insns_ut/ut_fcvt_w_h.h4
l---------hwacha/insns_ut/ut_fcvt_w_s.h1
l---------hwacha/insns_ut/ut_fcvt_wu_d.h1
-rw-r--r--hwacha/insns_ut/ut_fcvt_wu_h.h4
l---------hwacha/insns_ut/ut_fcvt_wu_s.h1
l---------hwacha/insns_ut/ut_fdiv_d.h1
-rw-r--r--hwacha/insns_ut/ut_fdiv_h.h4
l---------hwacha/insns_ut/ut_fdiv_s.h1
l---------hwacha/insns_ut/ut_fence.h1
l---------hwacha/insns_ut/ut_feq_d.h1
-rw-r--r--hwacha/insns_ut/ut_feq_h.h3
l---------hwacha/insns_ut/ut_feq_s.h1
l---------hwacha/insns_ut/ut_fld.h1
l---------hwacha/insns_ut/ut_fle_d.h1
-rw-r--r--hwacha/insns_ut/ut_fle_h.h3
l---------hwacha/insns_ut/ut_fle_s.h1
-rw-r--r--hwacha/insns_ut/ut_flh.h2
l---------hwacha/insns_ut/ut_flt_d.h1
-rw-r--r--hwacha/insns_ut/ut_flt_h.h3
l---------hwacha/insns_ut/ut_flt_s.h1
l---------hwacha/insns_ut/ut_flw.h1
l---------hwacha/insns_ut/ut_fmadd_d.h1
-rw-r--r--hwacha/insns_ut/ut_fmadd_h.h4
l---------hwacha/insns_ut/ut_fmadd_s.h1
l---------hwacha/insns_ut/ut_fmax_d.h1
-rw-r--r--hwacha/insns_ut/ut_fmax_h.h4
l---------hwacha/insns_ut/ut_fmax_s.h1
l---------hwacha/insns_ut/ut_fmin_d.h1
-rw-r--r--hwacha/insns_ut/ut_fmin_h.h4
l---------hwacha/insns_ut/ut_fmin_s.h1
-rw-r--r--hwacha/insns_ut/ut_fmovn.h1
-rw-r--r--hwacha/insns_ut/ut_fmovz.h1
l---------hwacha/insns_ut/ut_fmsub_d.h1
-rw-r--r--hwacha/insns_ut/ut_fmsub_h.h4
l---------hwacha/insns_ut/ut_fmsub_s.h1
l---------hwacha/insns_ut/ut_fmul_d.h1
-rw-r--r--hwacha/insns_ut/ut_fmul_h.h4
l---------hwacha/insns_ut/ut_fmul_s.h1
l---------hwacha/insns_ut/ut_fmv_d_x.h1
-rw-r--r--hwacha/insns_ut/ut_fmv_h_x.h2
l---------hwacha/insns_ut/ut_fmv_s_x.h1
l---------hwacha/insns_ut/ut_fmv_x_d.h1
-rw-r--r--hwacha/insns_ut/ut_fmv_x_h.h2
l---------hwacha/insns_ut/ut_fmv_x_s.h1
l---------hwacha/insns_ut/ut_fnmadd_d.h1
-rw-r--r--hwacha/insns_ut/ut_fnmadd_h.h4
l---------hwacha/insns_ut/ut_fnmadd_s.h1
l---------hwacha/insns_ut/ut_fnmsub_d.h1
-rw-r--r--hwacha/insns_ut/ut_fnmsub_h.h4
l---------hwacha/insns_ut/ut_fnmsub_s.h1
l---------hwacha/insns_ut/ut_fsd.h1
l---------hwacha/insns_ut/ut_fsgnj_d.h1
-rw-r--r--hwacha/insns_ut/ut_fsgnj_h.h2
l---------hwacha/insns_ut/ut_fsgnj_s.h1
l---------hwacha/insns_ut/ut_fsgnjn_d.h1
-rw-r--r--hwacha/insns_ut/ut_fsgnjn_h.h2
l---------hwacha/insns_ut/ut_fsgnjn_s.h1
l---------hwacha/insns_ut/ut_fsgnjx_d.h1
-rw-r--r--hwacha/insns_ut/ut_fsgnjx_h.h2
l---------hwacha/insns_ut/ut_fsgnjx_s.h1
-rw-r--r--hwacha/insns_ut/ut_fsh.h2
l---------hwacha/insns_ut/ut_fsqrt_d.h1
-rw-r--r--hwacha/insns_ut/ut_fsqrt_h.h4
l---------hwacha/insns_ut/ut_fsqrt_s.h1
l---------hwacha/insns_ut/ut_fsub_d.h1
-rw-r--r--hwacha/insns_ut/ut_fsub_h.h4
l---------hwacha/insns_ut/ut_fsub_s.h1
l---------hwacha/insns_ut/ut_fsw.h1
l---------hwacha/insns_ut/ut_lb.h1
l---------hwacha/insns_ut/ut_lbu.h1
l---------hwacha/insns_ut/ut_ld.h1
l---------hwacha/insns_ut/ut_lh.h1
l---------hwacha/insns_ut/ut_lhu.h1
l---------hwacha/insns_ut/ut_lui.h1
l---------hwacha/insns_ut/ut_lw.h1
l---------hwacha/insns_ut/ut_lwu.h1
-rw-r--r--hwacha/insns_ut/ut_movn.h1
-rw-r--r--hwacha/insns_ut/ut_movz.h1
l---------hwacha/insns_ut/ut_mul.h1
l---------hwacha/insns_ut/ut_mulh.h1
l---------hwacha/insns_ut/ut_mulhsu.h1
l---------hwacha/insns_ut/ut_mulhu.h1
l---------hwacha/insns_ut/ut_mulw.h1
l---------hwacha/insns_ut/ut_or.h1
l---------hwacha/insns_ut/ut_ori.h1
l---------hwacha/insns_ut/ut_rem.h1
l---------hwacha/insns_ut/ut_remu.h1
l---------hwacha/insns_ut/ut_remuw.h1
l---------hwacha/insns_ut/ut_remw.h1
l---------hwacha/insns_ut/ut_sb.h1
l---------hwacha/insns_ut/ut_sd.h1
l---------hwacha/insns_ut/ut_sh.h1
l---------hwacha/insns_ut/ut_sll.h1
l---------hwacha/insns_ut/ut_slli.h1
l---------hwacha/insns_ut/ut_slliw.h1
l---------hwacha/insns_ut/ut_sllw.h1
l---------hwacha/insns_ut/ut_slt.h1
l---------hwacha/insns_ut/ut_slti.h1
l---------hwacha/insns_ut/ut_sltiu.h1
l---------hwacha/insns_ut/ut_sltu.h1
l---------hwacha/insns_ut/ut_sra.h1
l---------hwacha/insns_ut/ut_srai.h1
l---------hwacha/insns_ut/ut_sraiw.h1
l---------hwacha/insns_ut/ut_sraw.h1
l---------hwacha/insns_ut/ut_srl.h1
l---------hwacha/insns_ut/ut_srli.h1
l---------hwacha/insns_ut/ut_srliw.h1
l---------hwacha/insns_ut/ut_srlw.h1
-rw-r--r--hwacha/insns_ut/ut_stop.h1
l---------hwacha/insns_ut/ut_sub.h1
l---------hwacha/insns_ut/ut_subw.h1
l---------hwacha/insns_ut/ut_sw.h1
-rw-r--r--hwacha/insns_ut/ut_utidx.h1
l---------hwacha/insns_ut/ut_xor.h1
l---------hwacha/insns_ut/ut_xori.h1
-rw-r--r--hwacha/opcodes_hwacha.h47
-rw-r--r--hwacha/opcodes_hwacha_ut.h174
-rw-r--r--riscv-hwacha.pc.in11
-rw-r--r--riscv-spike.pc.in2
-rw-r--r--riscv-spike_main.pc.in2
243 files changed, 3 insertions, 1727 deletions
diff --git a/configure b/configure
index 5ef634d..dcc3a55 100755
--- a/configure
+++ b/configure
@@ -4195,51 +4195,6 @@ fi
# Add subproject to our running list
- subprojects="$subprojects hwacha"
-
- # Process the subproject appropriately. If enabled add it to the
- # $enabled_subprojects running shell variable, set a
- # SUBPROJECT_ENABLED C define, and include the appropriate
- # 'subproject.ac'.
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: configuring default subproject : hwacha" >&5
-$as_echo "$as_me: configuring default subproject : hwacha" >&6;}
- ac_config_files="$ac_config_files hwacha.mk:hwacha/hwacha.mk.in"
-
- enable_hwacha_sproj="yes"
- subprojects_enabled="$subprojects_enabled hwacha"
-
-$as_echo "#define HWACHA_ENABLED /**/" >>confdefs.h
-
-
-
-
-
-
- # Determine if this is a required or an optional subproject
-
-
-
- # Determine if there is a group with the same name
-
-
-
- # Create variations of the subproject name suitable for use as a CPP
- # enabled define, a shell enabled variable, and a shell function
-
-
-
-
-
-
-
-
-
-
-
- # Add subproject to our running list
-
subprojects="$subprojects dummy_rocc"
# Process the subproject appropriately. If enabled add it to the
@@ -4382,8 +4337,6 @@ ac_config_files="$ac_config_files riscv-spike.pc"
ac_config_files="$ac_config_files riscv-riscv.pc"
-ac_config_files="$ac_config_files riscv-hwacha.pc"
-
ac_config_files="$ac_config_files riscv-softfloat.pc"
ac_config_files="$ac_config_files riscv-dummy_rocc.pc"
@@ -5081,7 +5034,6 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"riscv.mk") CONFIG_FILES="$CONFIG_FILES riscv.mk:riscv/riscv.mk.in" ;;
- "hwacha.mk") CONFIG_FILES="$CONFIG_FILES hwacha.mk:hwacha/hwacha.mk.in" ;;
"dummy_rocc.mk") CONFIG_FILES="$CONFIG_FILES dummy_rocc.mk:dummy_rocc/dummy_rocc.mk.in" ;;
"softfloat.mk") CONFIG_FILES="$CONFIG_FILES softfloat.mk:softfloat/softfloat.mk.in" ;;
"spike_main.mk") CONFIG_FILES="$CONFIG_FILES spike_main.mk:spike_main/spike_main.mk.in" ;;
@@ -5089,7 +5041,6 @@ do
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"riscv-spike.pc") CONFIG_FILES="$CONFIG_FILES riscv-spike.pc" ;;
"riscv-riscv.pc") CONFIG_FILES="$CONFIG_FILES riscv-riscv.pc" ;;
- "riscv-hwacha.pc") CONFIG_FILES="$CONFIG_FILES riscv-hwacha.pc" ;;
"riscv-softfloat.pc") CONFIG_FILES="$CONFIG_FILES riscv-softfloat.pc" ;;
"riscv-dummy_rocc.pc") CONFIG_FILES="$CONFIG_FILES riscv-dummy_rocc.pc" ;;
"riscv-spike_main.pc") CONFIG_FILES="$CONFIG_FILES riscv-spike_main.pc" ;;
diff --git a/configure.ac b/configure.ac
index d0c26b6..5a8e65f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,7 @@ AC_SUBST([CXXFLAGS],["-Wall -Wno-unused -O2 -std=c++11"])
# The '*' suffix indicates an optional subproject. The '**' suffix
# indicates an optional subproject which is also the name of a group.
-MCPPBS_SUBPROJECTS([ riscv, hwacha, dummy_rocc, softfloat, spike_main ])
+MCPPBS_SUBPROJECTS([ riscv, dummy_rocc, softfloat, spike_main ])
#-------------------------------------------------------------------------
# MCPPBS subproject groups
@@ -102,7 +102,6 @@ AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([riscv-spike.pc])
AC_CONFIG_FILES([riscv-riscv.pc])
-AC_CONFIG_FILES([riscv-hwacha.pc])
AC_CONFIG_FILES([riscv-softfloat.pc])
AC_CONFIG_FILES([riscv-dummy_rocc.pc])
AC_CONFIG_FILES([riscv-spike_main.pc])
diff --git a/hwacha/README b/hwacha/README
deleted file mode 100644
index 4e87c55..0000000
--- a/hwacha/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory contains work in progress on Hwacha, a data-parallel
-accelerator.
diff --git a/hwacha/cvt16.cc b/hwacha/cvt16.cc
deleted file mode 100644
index 0176822..0000000
--- a/hwacha/cvt16.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-#include "cvt16.h"
-
-#define H_BIAS (UINT16_C(0xf))
-#define H_F_MASK (UINT16_C(0x03FF))
-#define H_E_MASK (UINT16_C(0x7C00))
-#define H_E_SHIFT (10)
-#define H_S_MASK (UINT16_C(0x8000))
-
-#define H_QNAN (H_F_MASK)
-
-#define S_BIAS (UINT32_C(0x7F))
-#define S_F_MASK (UINT32_C(0x007fffff))
-#define S_E_MASK (UINT32_C(0x7f800000))
-#define S_E_SHIFT (23)
-#define S_S_MASK (UINT32_C(0x80000000))
-
-#define S_QNAN (S_F_MASK)
-
-#define PAD (S_E_SHIFT - H_E_SHIFT)
-
-uint_fast32_t cvt_hs(uint_fast16_t x)
-{
-#define MSB (UINT32_C(0x00800000))
- uint_fast32_t frac, exp, sign;
- frac = (x & H_F_MASK) << PAD;
- exp = (x & H_E_MASK);
- sign = (x & H_S_MASK);
-
- switch (exp) {
- case 0:
- if (frac) { /* Denormal */
- exp = S_BIAS - 14;
- /* Adjust fraction for implicit leading 1-bit */
- for (; !(frac & MSB); frac <<= 1, exp--);
- frac &= ~(MSB);
- exp <<= S_E_SHIFT;
- }
- break;
-
- case H_E_MASK: /* Infinity and NaN */
- exp = S_E_MASK;
- if (frac) { /* Set padding bits for NaN */
- frac |= (1 << PAD) - 1;
- }
- break;
- default:
- exp += (S_BIAS - H_BIAS) << H_E_SHIFT; /* Re-bias */
- exp <<= PAD;
- }
- return (sign << 16) | exp | frac;
-#undef MSB
-}
-
-enum riscv_rm {
- RNE = 0, /* Round to nearest; ties to even */
- RTZ = 1, /* Round towards zero (truncate) */
- RDN = 2, /* Round towards negative infinity (down) */
- RUP = 3, /* Round towards positive infinity (up) */
- RMM = 4, /* Round to nearest; ties to max magnitude */
-};
-
-/*
- * LSB : frac[13]
- * Guard bit (G): frac[12]
- * Round bit (R): frac[11]
- * Sticky bit (S): OR of frac[10..0]
- *
- * RTZ:
- * truncate
- * RUP:
- * 000 : exact
- * else : round up
- * RDN:
- * 000 : exact
- * else : round down
- * RNE:
- * 0xx : round down
- * 100 : tie; round up if LSB is 1
- * 101 : round up
- * 110 : round up
- * 111 : round up
- */
-uint_fast16_t cvt_sh(uint_fast32_t x, int rm)
-{
-#define MSB UINT16_C(0x0400)
- uint_fast32_t frac, exp, sign;
- int e;
- sign = (x & S_S_MASK) >> 16;
- exp = (x & S_E_MASK);
- if (exp && exp != S_E_MASK) {
- int inc;
- inc = 0;
- switch (rm) {
- case RNE:
- /* Round up if G is set and either R, S,
- or the bit before G is non-zero */
- inc = (x & 0x1000) && (x & 0x2fff);
- break;
- case RUP:
- inc = ((x & 0x1fff) != 0) && (!sign);
- break;
- case RDN:
- inc = ((x & 0x1fff) != 0) && sign;
- break;
- }
- x += inc << PAD;
- exp = (x & S_E_MASK);
- }
- frac = (x & S_F_MASK) >> PAD;
-
- e = (exp >> S_E_SHIFT) - S_BIAS;
- if (e < -24) { /* Round to zero */
- return sign;
- } else if (e < -14) { /* Denormal */
- frac = (frac | MSB) >> (-e - 14);
- return sign | frac;
- } else if (e < 16) {
- exp = (e + H_BIAS) << H_E_SHIFT;
- } else if (e < 127) { /* Round to infinity */
- exp = H_E_MASK;
- frac = 0;
- } else {
- /* Infinity and NaN */
- }
- return sign | exp | frac;
-#undef MSB
-}
-
diff --git a/hwacha/cvt16.h b/hwacha/cvt16.h
deleted file mode 100644
index 1132f3f..0000000
--- a/hwacha/cvt16.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _CVT16_H
-#define _CVT16_H
-
-#include <cstdint>
-
-extern uint_fast32_t cvt_hs(uint_fast16_t);
-extern uint_fast16_t cvt_sh(uint_fast32_t, int);
-
-#endif
diff --git a/hwacha/decode_hwacha.h b/hwacha/decode_hwacha.h
deleted file mode 100644
index 1541758..0000000
--- a/hwacha/decode_hwacha.h
+++ /dev/null
@@ -1,106 +0,0 @@
-#ifndef _DECODE_HWACHA_H
-#define _DECODE_HWACHA_H
-
-#include "hwacha.h"
-#include "hwacha_xcpt.h"
-#include "mmu.h"
-
-#define XS1 (xs1)
-#define XS2 (xs2)
-#define WRITE_XRD(value) (xd = value)
-
-#define NXPR (h->get_ct_state()->nxpr)
-#define NFPR (h->get_ct_state()->nfpr)
-#define MAXVL (h->get_ct_state()->maxvl)
-#define VL (h->get_ct_state()->vl)
-#define UTIDX (h->get_ct_state()->count)
-#define PREC (h->get_ct_state()->prec)
-#define VF_PC (h->get_ct_state()->vf_pc)
-#define WRITE_NXPR(nxprnext) (h->get_ct_state()->nxpr = (nxprnext))
-#define WRITE_NFPR(nfprnext) (h->get_ct_state()->nfpr = (nfprnext))
-#define WRITE_MAXVL(maxvlnext) (h->get_ct_state()->maxvl = (maxvlnext))
-#define WRITE_VL(vlnext) (h->get_ct_state()->vl = (vlnext))
-#define WRITE_UTIDX(value) (h->get_ct_state()->count = (value))
-#define WRITE_VF_PC(pcnext) (h->get_ct_state()->vf_pc = (pcnext))
-#define WRITE_PREC(precision) (h->get_ct_state()->prec = (precision))
-
-#define INSN_RS1 (insn.rs1())
-#define INSN_RS2 (insn.rs2())
-#define INSN_RS3 (insn.rs3())
-#define INSN_RD (insn.rd())
-#define INSN_SEG (((reg_t)insn.i_imm() >> 9)+1)
-
-static inline reg_t read_xpr(hwacha_t* h, insn_t insn, uint32_t idx, size_t src)
-{
- if (src >= h->get_ct_state()->nxpr)
- h->take_exception(HWACHA_CAUSE_TVEC_ILLEGAL_REGID, uint32_t(insn.bits()));
- return (h->get_ut_state(idx)->XPR[src]);
-}
-
-static inline void write_xpr(hwacha_t* h, insn_t insn, uint32_t idx, size_t dst, reg_t value)
-{
- if (dst >= h->get_ct_state()->nxpr)
- h->take_exception(HWACHA_CAUSE_TVEC_ILLEGAL_REGID, uint32_t(insn.bits()));
- h->get_ut_state(idx)->XPR.write(dst, value);
-}
-
-#define UT_READ_XPR(idx, src) read_xpr(h, insn, idx, src)
-#define UT_WRITE_XPR(idx, dst, value) write_xpr(h, insn, idx, dst, value)
-#define UT_RS1(idx) (UT_READ_XPR(idx, INSN_RS1))
-#define UT_RS2(idx) (UT_READ_XPR(idx, INSN_RS2))
-#define UT_WRITE_RD(idx, value) (UT_WRITE_XPR(idx, INSN_RD, value))
-
-static inline reg_t read_fpr(hwacha_t* h, insn_t insn, uint32_t idx, size_t src)
-{
- if (src >= h->get_ct_state()->nfpr)
- h->take_exception(HWACHA_CAUSE_TVEC_ILLEGAL_REGID, uint32_t(insn.bits()));
- return (h->get_ut_state(idx)->FPR[src]);
-}
-
-static inline void write_fpr(hwacha_t* h, insn_t insn, uint32_t idx, size_t dst, reg_t value)
-{
- if (dst >= h->get_ct_state()->nfpr)
- h->take_exception(HWACHA_CAUSE_TVEC_ILLEGAL_REGID, uint32_t(insn.bits()));
- h->get_ut_state(idx)->FPR.write(dst, value);
-}
-
-#define UT_READ_FPR(idx, src) read_fpr(h, insn, idx, src)
-#define UT_WRITE_FPR(idx, dst, value) write_fpr(h, insn, idx, dst, value)
-#define UT_FRS1(idx) (UT_READ_FPR(idx, INSN_RS1))
-#define UT_FRS2(idx) (UT_READ_FPR(idx, INSN_RS2))
-#define UT_FRS3(idx) (UT_READ_FPR(idx, INSN_RS3))
-#define UT_WRITE_FRD(idx, value) (UT_WRITE_FPR(idx, INSN_RD, value))
-
-#define VEC_SEG_LOAD(dst, func, inc) \
- VEC_SEG_ST_LOAD(dst, func, INSN_SEG*inc, inc)
-
-#define VEC_SEG_ST_LOAD(dst, func, stride, inc) \
- reg_t seg_addr = XS1; \
- for (uint32_t i=0; i<VL; i++) { \
- reg_t addr = seg_addr; \
- seg_addr += stride; \
- for (uint32_t j=0; j<INSN_SEG; j++) { \
- UT_WRITE_##dst(i, INSN_RD+j, p->get_mmu()->func(addr)); \
- addr += inc; \
- } \
- }
-
-#define VEC_SEG_STORE(src, func, inc) \
- VEC_SEG_ST_STORE(src, func, INSN_SEG*inc, inc)
-
-#define VEC_SEG_ST_STORE(src, func, stride, inc) \
- reg_t seg_addr = XS1; \
- for (uint32_t i=0; i<VL; i++) { \
- reg_t addr = seg_addr; \
- seg_addr += stride; \
- for (uint32_t j=0; j<INSN_SEG; j++) { \
- p->get_mmu()->func(addr, UT_READ_##src(i, INSN_RD+j)); \
- addr += inc; \
- } \
- }
-
-#define require_supervisor_hwacha \
- if (get_field(p->get_state()->mstatus, MSTATUS_PRV) < PRV_S) \
- h->take_exception(HWACHA_CAUSE_PRIVILEGED_INSTRUCTION, uint32_t(insn.bits()));
-
-#endif
diff --git a/hwacha/decode_hwacha_ut.h b/hwacha/decode_hwacha_ut.h
deleted file mode 100644
index a9c069a..0000000
--- a/hwacha/decode_hwacha_ut.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifndef _DECODE_HWACHA_UT_H
-#define _DECODE_HWACHA_UT_H
-
-#include "decode.h"
-#include "decode_hwacha.h"
-#include "hwacha.h"
-#include "hwacha_xcpt.h"
-
-#undef RS1
-#undef RS2
-#undef WRITE_RD
-
-static inline reg_t read_rs1(hwacha_t* h, insn_t insn, uint32_t idx)
-{
- if (INSN_RS1 >= h->get_ct_state()->nxpr)
- h->take_exception(HWACHA_CAUSE_VF_ILLEGAL_REGID, VF_PC);
- return UT_RS1(idx);
-}
-
-static inline reg_t read_rs2(hwacha_t* h, insn_t insn, uint32_t idx)
-{
- if (INSN_RS2 >= h->get_ct_state()->nxpr)
- h->take_exception(HWACHA_CAUSE_VF_ILLEGAL_REGID, VF_PC);
- return UT_RS2(idx);
-}
-
-static inline void write_rd(hwacha_t* h, insn_t insn, uint32_t idx, reg_t value)
-{
- if (INSN_RD >= h->get_ct_state()->nxpr)
- h->take_exception(HWACHA_CAUSE_VF_ILLEGAL_REGID, VF_PC);
- UT_WRITE_RD(idx, value);
-}
-
-#define RS1 read_rs1(h, insn, UTIDX)
-#define RS2 read_rs2(h, insn, UTIDX)
-#define WRITE_RD(value) write_rd(h, insn, UTIDX, value)
-
-#undef FRS1
-#undef FRS2
-#undef FRS3
-#undef WRITE_FRD
-
-static inline reg_t read_frs1(hwacha_t* h, insn_t insn, uint32_t idx)
-{
- if (INSN_RS1 >= h->get_ct_state()->nfpr)
- h->take_exception(HWACHA_CAUSE_VF_ILLEGAL_REGID, VF_PC);
- return UT_FRS1(idx);
-}
-
-static inline reg_t read_frs2(hwacha_t* h, insn_t insn, uint32_t idx)
-{
- if (INSN_RS2 >= h->get_ct_state()->nfpr)
- h->take_exception(HWACHA_CAUSE_VF_ILLEGAL_REGID, VF_PC);
- return UT_FRS2(idx);
-}
-
-static inline reg_t read_frs3(hwacha_t* h, insn_t insn, uint32_t idx)
-{
- if (INSN_RS3 >= h->get_ct_state()->nfpr)
- h->take_exception(HWACHA_CAUSE_VF_ILLEGAL_REGID, VF_PC);
- return UT_FRS3(idx);
-}
-
-static inline void write_frd(hwacha_t* h, insn_t insn, uint32_t idx, reg_t value)
-{
- if (INSN_RD >= h->get_ct_state()->nfpr)
- h->take_exception(HWACHA_CAUSE_VF_ILLEGAL_REGID, VF_PC);
- UT_WRITE_FRD(idx, value);
-}
-
-#define FRS1 read_frs1(h, insn, UTIDX)
-#define FRS2 read_frs2(h, insn, UTIDX)
-#define FRS3 read_frs3(h, insn, UTIDX)
-#define WRITE_FRD(value) write_frd(h, insn, UTIDX, value)
-
-// we assume the vector unit has floating-point alus
-#undef require_fp
-#define require_fp
-
-#include "cvt16.h"
-
-#define HFRS1 cvt_hs(FRS1)
-#define HFRS2 cvt_hs(FRS2)
-#define HFRS3 cvt_hs(FRS3)
-
-#define WRITE_HFRD(value) write_frd(h, insn, UTIDX, cvt_sh(value, RM))
-
-#define sext16(x) ((sreg_t)(int16_t)(x))
-
-#endif
diff --git a/hwacha/encodings_hwacha.h b/hwacha/encodings_hwacha.h
deleted file mode 100644
index 433748f..0000000
--- a/hwacha/encodings_hwacha.h
+++ /dev/null
@@ -1,167 +0,0 @@
-#ifndef ENCODINGS_HWACHA
-#define ENCODINGS_HWACHA
-
-#define MATCH_FCVT_H_LU 0x6c000053
-#define MASK_FCVT_H_LU 0xfff0007f
-#define MATCH_FMIN_H 0xc4000053
-#define MASK_FMIN_H 0xfe00707f
-#define MATCH_FCVT_WU_H 0x5c000053
-#define MASK_FCVT_WU_H 0xfff0007f
-#define MATCH_FDIV_H 0x1c000053
-#define MASK_FDIV_H 0xfe00007f
-#define MATCH_FCVT_H_WU 0x7c000053
-#define MASK_FCVT_H_WU 0xfff0007f
-#define MATCH_FSGNJ_H 0x2c000053
-#define MASK_FSGNJ_H 0xfe00707f
-#define MATCH_FNMSUB_H 0x400004b
-#define MASK_FNMSUB_H 0x600007f
-#define MATCH_FLE_H 0xbc000053
-#define MASK_FLE_H 0xfe00707f
-#define MATCH_FCVT_L_H 0x44000053
-#define MASK_FCVT_L_H 0xfff0007f
-#define MATCH_FNMADD_H 0x400004f
-#define MASK_FNMADD_H 0x600007f
-#define MATCH_FCVT_H_S 0x90000053
-#define MASK_FCVT_H_S 0xfff0007f
-#define MATCH_FCVT_H_W 0x74000053
-#define MASK_FCVT_H_W 0xfff0007f
-#define MATCH_FCVT_D_H 0x8c000053
-#define MASK_FCVT_D_H 0xfff0007f
-#define MATCH_FMAX_H 0xcc000053
-#define MASK_FMAX_H 0xfe00707f
-#define MATCH_FCVT_LU_H 0x4c000053
-#define MASK_FCVT_LU_H 0xfff0007f
-#define MATCH_FCVT_H_L 0x64000053
-#define MASK_FCVT_H_L 0xfff0007f
-#define MATCH_FMV_X_H 0xe4000053
-#define MASK_FMV_X_H 0xfff0707f
-#define MATCH_FCVT_H_D 0x92000053
-#define MASK_FCVT_H_D 0xfff0007f
-#define MATCH_FLT_H 0xb4000053
-#define MASK_FLT_H 0xfe00707f
-#define MATCH_FADD_H 0x4000053
-#define MASK_FADD_H 0xfe00007f
-#define MATCH_FCVT_S_H 0x84000053
-#define MASK_FCVT_S_H 0xfff0007f
-#define MATCH_FCVT_W_H 0x54000053
-#define MASK_FCVT_W_H 0xfff0007f
-#define MATCH_FMUL_H 0x14000053
-#define MASK_FMUL_H 0xfe00007f
-#define MATCH_FMADD_H 0x4000043
-#define MASK_FMADD_H 0x600007f
-#define MATCH_FSQRT_H 0x24000053
-#define MASK_FSQRT_H 0xfff0007f
-#define MATCH_FSGNJN_H 0x34000053
-#define MASK_FSGNJN_H 0xfe00707f
-#define MATCH_FSUB_H 0xc000053
-#define MASK_FSUB_H 0xfe00007f
-#define MATCH_FSH 0x1027
-#define MASK_FSH 0x707f
-#define MATCH_FSGNJX_H 0x3c000053
-#define MASK_FSGNJX_H 0xfe00707f
-#define MATCH_FLH 0x1007
-#define MASK_FLH 0x707f
-#define MATCH_FMSUB_H 0x4000047
-#define MASK_FMSUB_H 0x600007f
-#define MATCH_FEQ_H 0xac000053
-#define MASK_FEQ_H 0xfe00707f
-#define MATCH_FMV_H_X 0xf4000053
-#define MASK_FMV_H_X 0xfff0707f
-
-#define MASK_VF 0x1f0707f
-#define MASK_VFLSEGD 0x1ff0707f
-#define MASK_VFLSEGSTD 0x1e00707f
-#define MASK_VFLSEGSTW 0x1e00707f
-#define MASK_VFLSEGW 0x1ff0707f
-#define MASK_VFMVV 0xfff0707f
-#define MASK_VFMSV_S 0xfff0707f
-#define MASK_VFMSV_D 0xfff0707f
-#define MASK_VFSSEGD 0x1ff0707f
-#define MASK_VFSSEGSTD 0x1e00707f
-#define MASK_VFSSEGSTW 0x1e00707f
-#define MASK_VFSSEGW 0x1ff0707f
-#define MASK_VGETCFG 0xfffff07f
-#define MASK_VGETVL 0xfffff07f
-#define MASK_VLSEGB 0x1ff0707f
-#define MASK_VLSEGBU 0x1ff0707f
-#define MASK_VLSEGD 0x1ff0707f
-#define MASK_VLSEGH 0x1ff0707f
-#define MASK_VLSEGHU 0x1ff0707f
-#define MASK_VLSEGSTB 0x1e00707f
-#define MASK_VLSEGSTBU 0x1e00707f
-#define MASK_VLSEGSTD 0x1e00707f
-#define MASK_VLSEGSTH 0x1e00707f
-#define MASK_VLSEGSTHU 0x1e00707f
-#define MASK_VLSEGSTW 0x1e00707f
-#define MASK_VLSEGSTWU 0x1e00707f
-#define MASK_VLSEGW 0x1ff0707f
-#define MASK_VLSEGWU 0x1ff0707f
-#define MASK_VMSV 0xfff0707f
-#define MASK_VMVV 0xfff0707f
-#define MASK_VSETCFG 0x7fff
-#define MASK_VSETVL 0xfff0707f
-#define MASK_VSSEGB 0x1ff0707f
-#define MASK_VSSEGD 0x1ff0707f
-#define MASK_VSSEGH 0x1ff0707f
-#define MASK_VSSEGSTB 0x1e00707f
-#define MASK_VSSEGSTD 0x1e00707f
-#define MASK_VSSEGSTH 0x1e00707f
-#define MASK_VSSEGSTW 0x1e00707f
-#define MASK_VSSEGW 0x1ff0707f
-#define MASK_VXCPTAUX 0xfffff07f
-#define MASK_VXCPTCAUSE 0xfffff07f
-#define MASK_VXCPTEVAC 0xfff07fff
-#define MASK_VXCPTHOLD 0xfff07fff
-#define MASK_VXCPTKILL 0xffffffff
-#define MASK_VXCPTRESTORE 0xfff07fff
-#define MASK_VXCPTSAVE 0xfff07fff
-
-#define MATCH_VF 0x10202b
-#define MATCH_VFLSEGD 0x1600205b
-#define MATCH_VFLSEGSTD 0x1600305b
-#define MATCH_VFLSEGSTW 0x1400305b
-#define MATCH_VFLSEGW 0x1400205b
-#define MATCH_VFMVV 0x1000002b
-#define MATCH_VFMSV_S 0x1000202b
-#define MATCH_VFMSV_D 0x1200202b
-#define MATCH_VFSSEGD 0x1600207b
-#define MATCH_VFSSEGSTD 0x1600307b
-#define MATCH_VFSSEGSTW 0x1400307b
-#define MATCH_VFSSEGW 0x1400207b
-#define MATCH_VGETCFG 0x400b
-#define MATCH_VGETVL 0x200400b
-#define MATCH_VLSEGB 0x205b
-#define MATCH_VLSEGBU 0x800205b
-#define MATCH_VLSEGD 0x600205b
-#define MATCH_VLSEGH 0x200205b
-#define MATCH_VLSEGHU 0xa00205b
-#define MATCH_VLSEGSTB 0x305b
-#define MATCH_VLSEGSTBU 0x800305b
-#define MATCH_VLSEGSTD 0x600305b
-#define MATCH_VLSEGSTH 0x200305b
-#define MATCH_VLSEGSTHU 0xa00305b
-#define MATCH_VLSEGSTW 0x400305b
-#define MATCH_VLSEGSTWU 0xc00305b
-#define MATCH_VLSEGW 0x400205b
-#define MATCH_VLSEGWU 0xc00205b
-#define MATCH_VMSV 0x200202b
-#define MATCH_VMVV 0x200002b
-#define MATCH_VSETCFG 0x200b
-#define MATCH_VSETVL 0x600b
-#define MATCH_VSSEGB 0x207b
-#define MATCH_VSSEGD 0x600207b
-#define MATCH_VSSEGH 0x200207b
-#define MATCH_VSSEGSTB 0x307b
-#define MATCH_VSSEGSTD 0x600307b
-#define MATCH_VSSEGSTH 0x200307b
-#define MATCH_VSSEGSTW 0x400307b
-#define MATCH_VSSEGW 0x400207b
-#define MATCH_VXCPTAUX 0x200402b
-#define MATCH_VXCPTCAUSE 0x402b
-#define MATCH_VXCPTEVAC 0x600302b
-#define MATCH_VXCPTHOLD 0x800302b
-#define MATCH_VXCPTKILL 0x400302b
-#define MATCH_VXCPTRESTORE 0x200302b
-#define MATCH_VXCPTSAVE 0x302b
-
-#endif /* ENCODINGS_HWACHA */
diff --git a/hwacha/hwacha.ac b/hwacha/hwacha.ac
deleted file mode 100644
index e69de29..0000000
--- a/hwacha/hwacha.ac
+++ /dev/null
diff --git a/hwacha/hwacha.cc b/hwacha/hwacha.cc
deleted file mode 100644
index 820faab..0000000
--- a/hwacha/hwacha.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-#include "hwacha.h"
-#include "hwacha_xcpt.h"
-#include "mmu.h"
-#include "trap.h"
-#include <stdexcept>
-
-REGISTER_EXTENSION(hwacha, []() { return new hwacha_t; })
-
-void ct_state_t::reset()
-{
- nxpr = 32;
- nfpr = 32;
- maxvl = 32;
- vl = 0;
- count = 0;
- prec = 64;
-
- vf_pc = -1;
-}
-
-void ut_state_t::reset()
-{
- memset(this, 0, sizeof(*this));
-}
-
-void hwacha_t::reset()
-{
- ct_state.reset();
- for (int i=0; i<max_uts; i++)
- ut_state[i].reset();
-}
-
-static reg_t custom(processor_t* p, insn_t insn, reg_t pc)
-{
- require_accelerator;
- hwacha_t* h = static_cast<hwacha_t*>(p->get_extension());
- bool matched = false;
- reg_t npc = -1;
-
- try
- {
- #define DECLARE_INSN(name, match, mask) \
- extern reg_t hwacha_##name(processor_t*, insn_t, reg_t); \
- if ((insn.bits() & mask) == match) { \
- npc = hwacha_##name(p, insn, pc); \
- matched = true; \
- }
- #include "opcodes_hwacha.h"
- #undef DECLARE_INSN
- }
- catch (trap_instruction_access_fault& t)
- {
- h->take_exception(HWACHA_CAUSE_VF_FAULT_FETCH, h->get_ct_state()->vf_pc);
- }
- catch (trap_illegal_instruction& t)
- {
- h->take_exception(HWACHA_CAUSE_VF_ILLEGAL_INSTRUCTION, h->get_ct_state()->vf_pc);
- }
- catch (trap_load_address_misaligned& t)
- {
- h->take_exception(HWACHA_CAUSE_MISALIGNED_LOAD, t.get_badvaddr());
- }
- catch (trap_store_address_misaligned& t)
- {
- h->take_exception(HWACHA_CAUSE_MISALIGNED_STORE, t.get_badvaddr());
- }
- catch (trap_load_access_fault& t)
- {
- h->take_exception(HWACHA_CAUSE_FAULT_LOAD, t.get_badvaddr());
- }
- catch (trap_store_access_fault& t)
- {
- h->take_exception(HWACHA_CAUSE_FAULT_STORE, t.get_badvaddr());
- }
-
- if (!matched)
- h->take_exception(HWACHA_CAUSE_ILLEGAL_INSTRUCTION, uint32_t(insn.bits()));
-
- return npc;
-}
-
-std::vector<insn_desc_t> hwacha_t::get_instructions()
-{
- std::vector<insn_desc_t> insns;
- insns.push_back((insn_desc_t){0x0b, 0x7f, &::illegal_instruction, custom});
- insns.push_back((insn_desc_t){0x2b, 0x7f, &::illegal_instruction, custom});
- insns.push_back((insn_desc_t){0x5b, 0x7f, &::illegal_instruction, custom});
- insns.push_back((insn_desc_t){0x7b, 0x7f, &::illegal_instruction, custom});
- return insns;
-}
-
-bool hwacha_t::vf_active()
-{
- for (uint32_t i=0; i<get_ct_state()->vl; i++) {
- if (get_ut_state(i)->run)
- return true;
- }
- return false;
-}
-
-void hwacha_t::take_exception(reg_t c, reg_t a)
-{
- cause = c;
- aux = a;
- raise_interrupt();
- throw std::logic_error("unreachable!");
-}
diff --git a/hwacha/hwacha.h b/hwacha/hwacha.h
deleted file mode 100644
index 8b27f96..0000000
--- a/hwacha/hwacha.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef _HWACHA_H
-#define _HWACHA_H
-
-#include "extension.h"
-
-struct ct_state_t
-{
- void reset();
-
- uint32_t nxpr;
- uint32_t nfpr;
- uint32_t maxvl;
- uint32_t vl;
- uint32_t count;
- uint32_t prec;
-
- reg_t vf_pc;
-};
-
-struct ut_state_t
-{
- void reset();
-
- bool run;
- regfile_t<reg_t, 32, true> XPR;
- regfile_t<reg_t, 32, false> FPR;
-};
-
-class hwacha_t : public extension_t
-{
-public:
- hwacha_t() : cause(0), aux(0), debug(false) {}
- std::vector<insn_desc_t> get_instructions();
- std::vector<disasm_insn_t*> get_disasms();
- const char* name() { return "hwacha"; }
- void reset();
- void set_debug(bool value) { debug = value; }
-
- ct_state_t* get_ct_state() { return &ct_state; }
- ut_state_t* get_ut_state(int idx) { return &ut_state[idx]; }
- bool vf_active();
- reg_t get_cause() { return cause; }
- reg_t get_aux() { return aux; }
- void take_exception(reg_t, reg_t);
- void clear_exception() { clear_interrupt(); }
-
- bool get_debug() { return debug; }
- disassembler_t* get_ut_disassembler() { return &ut_disassembler; }
-
- static const int max_uts = 2048;
-
-private:
- ct_state_t ct_state;
- ut_state_t ut_state[max_uts];
- reg_t cause;
- reg_t aux;
-
- disassembler_t ut_disassembler;
- bool debug;
-};
-
-#endif
diff --git a/hwacha/hwacha.mk.in b/hwacha/hwacha.mk.in
deleted file mode 100644
index 6b258a0..0000000
--- a/hwacha/hwacha.mk.in
+++ /dev/null
@@ -1,45 +0,0 @@
-hwacha_subproject_deps = \
- spike_main \
- riscv \
- softfloat \
-
-hwacha_install_prog_srcs = \
-
-hwacha_hdrs = \
- hwacha.h \
- hwacha_xcpt.h \
- decode_hwacha.h \
- decode_hwacha_ut.h \
- opcodes_hwacha.h \
- opcodes_hwacha_ut.h \
- insn_template_hwacha.h \
- insn_template_hwacha_ut.h \
-
-hwacha_precompiled_hdrs = \
- insn_template_hwacha.h \
- insn_template_hwacha_ut.h \
-
-hwacha_srcs = \
- hwacha.cc \
- hwacha_disasm.cc \
- cvt16.cc \
- $(hwacha_gen_srcs) \
- $(hwacha_ut_gen_srcs) \
-
-hwacha_test_srcs =
-
-hwacha_gen_srcs = \
- $(addsuffix .cc, $(call get_insn_list,$(src_dir)/hwacha/opcodes_hwacha.h))
-
-$(hwacha_gen_srcs): %.cc: insns/%.h insn_template_hwacha.cc
- sed 's/NAME/$(subst .cc,,$@)/' $(src_dir)/hwacha/insn_template_hwacha.cc | sed 's/OPCODE/$(call get_opcode,$(src_dir)/hwacha/opcodes_hwacha.h,$(subst .cc,,$@))/' > $@
-
-hwacha_ut_gen_srcs = \
- $(addsuffix .cc, $(call get_insn_list,$(src_dir)/hwacha/opcodes_hwacha_ut.h))
-
-$(hwacha_ut_gen_srcs): %.cc: insns_ut/%.h insn_template_hwacha_ut.cc
- sed 's/NAME/$(subst .cc,,$@)/' $(src_dir)/hwacha/insn_template_hwacha_ut.cc | sed 's/OPCODE/$(call get_opcode,$(src_dir)/hwacha/opcodes_hwacha_ut.h,$(subst .cc,,$@))/' > $@
-
-hwacha_junk = \
- $(hwacha_gen_srcs) \
- $(hwacha_ut_gen_srcs) \
diff --git a/hwacha/hwacha_disasm.cc b/hwacha/hwacha_disasm.cc
deleted file mode 100644
index a950cd5..0000000
--- a/hwacha/hwacha_disasm.cc
+++ /dev/null
@@ -1,203 +0,0 @@
-#include "hwacha.h"
-
-static const char* xpr[] = {
- "zero", "ra", "s0", "s1", "s2", "s3", "s4", "s5",
- "s6", "s7", "s8", "s9", "s10", "s11", "sp", "tp",
- "v0", "v1", "a0", "a1", "a2", "a3", "a4", "a5",
- "a6", "a7", "t0", "t1", "t2", "t3", "t4", "gp"
-};
-
-static const char* fpr[] = {
- "fs0", "fs1", "fs2", "fs3", "fs4", "fs5", "fs6", "fs7",
- "fs8", "fs9", "fs10", "fs11", "fs12", "fs13", "fs14", "fs15",
- "fv0", "fv1", "fa0", "fa1", "fa2", "fa3", "fa4", "fa5",
- "fa6", "fa7", "ft0", "ft1", "ft2", "ft3", "ft4", "ft5"
-};
-
-static const char* vxpr[] = {
- "vx0", "vx1", "vx2", "vx3", "vx4", "vx5", "vx6", "vx7",
- "vx8", "vx9", "vx10", "vx11", "vx12", "vx13", "vx14", "vx15",
- "vx16", "vx17", "vx18", "vx19", "vx20", "vx21", "vx22", "vx23",
- "vx24", "vx25", "vx26", "vx27", "vx28", "vx29", "vx30", "vx31"
-};
-
-static const char* vfpr[] = {
- "vf0", "vf1", "vf2", "vf3", "vf4", "vf5", "vf6", "vf7",
- "vf8", "vf9", "vf10", "vf11", "vf12", "vf13", "vf14", "vf15",
- "vf16", "vf17", "vf18", "vf19", "vf20", "vf21", "vf22", "vf23",
- "vf24", "vf25", "vf26", "vf27", "vf28", "vf29", "vf30", "vf31"
-};
-
-struct : public arg_t {
- std::string to_string(insn_t insn) const {
- return xpr[insn.rs1()];
- }
-} xrs1;
-
-struct : public arg_t {
- std::string to_string(insn_t insn) const {
- return xpr[insn.rs2()];
- }
-} xrs2;
-
-struct : public arg_t {
- std::string to_string(insn_t insn) const {
- return xpr[insn.rd()];
- }
-} xrd;
-
-struct : public arg_t {
- std::string to_string(insn_t insn) const {
- return fpr[insn.rd()];
- }
-} frd;
-
-struct : public arg_t {
- std::string to_string(insn_t insn) const {
- return fpr[insn.rs1()];
- }
-} frs1;
-
-struct : public arg_t {
- std::string to_string(insn_t insn) const {
- return fpr[insn.rs2()];
- }
-} frs2;
-
-struct : public arg_t {
- std::string to_string(insn_t insn) const {
- return fpr[insn.rs3()];
- }
-} frs3;
-
-struct : public arg_t {
- std::string to_string(insn_t insn) const {
- return vxpr[insn.rd()];
- }
-} vxrd;
-
-struct : public arg_t {
- std::string to_string(insn_t insn) const {
- return vxpr[insn.rs1()];
- }
-} vxrs1;
-
-struct : public arg_t {
- std::string to_string(insn_t insn) const {
- return vfpr[insn.rd()];
- }
-} vfrd;
-
-struct : public arg_t {
- std::string to_string(insn_t insn) const {
- return vfpr[insn.rs1()];
- }
-} vfrs1;
-
-struct : public arg_t {
- std::string to_string(insn_t insn) const {
- return std::to_string(insn.i_imm() & 0x3f);
- }
-} nxregs;
-
-struct : public arg_t {
- std::string to_string(insn_t insn) const {
- return std::to_string((insn.i_imm() >> 6) & 0x3f);
- }
-} nfregs;
-
-struct : public arg_t {
- std::string to_string(insn_t insn) const {
- return std::to_string((int)insn.s_imm()) + '(' + xpr[insn.rs1()] + ')';
- }
-} vf_addr;
-
-std::vector<disasm_insn_t*> hwacha_t::get_disasms()
-{
- std::vector<disasm_insn_t*> insns;
-
- #define DECLARE_INSN(code, match, mask) \
- const uint32_t match_##code = match; \
- const uint32_t mask_##code = mask;
- #include "opcodes_hwacha.h"
- #undef DECLARE_INSN
-
- #define DISASM_INSN(name, code, extra, ...) \
- insns.push_back(new disasm_insn_t(name, match_##code, mask_##code | (extra), __VA_ARGS__));
-
- DISASM_INSN("vsetcfg", vsetcfg, 0, {&xrs1, &nxregs, &nfregs});
- DISASM_INSN("vsetvl", vsetvl, 0, {&xrd, &xrs1});
- DISASM_INSN("vgetcfg", vgetcfg, 0, {&xrd});
- DISASM_INSN("vgetvl", vgetvl, 0, {&xrd});
-
- DISASM_INSN("vmvv", vmvv, 0, {&vxrd, &vxrs1});
- DISASM_INSN("vmsv", vmsv, 0, {&vxrd, &xrs1});
- DISASM_INSN("vfmvv", vfmvv, 0, {&vfrd, &vfrs1});
- DISASM_INSN("vfmsv.s", vfmsv_s, 0, {&vfrd, &xrs1});
- DISASM_INSN("vfmsv.d", vfmsv_d, 0, {&vfrd, &xrs1});
- DISASM_INSN("vf", vf, 0, {&vf_addr});
-
- DISASM_INSN("vxcptcause", vxcptcause, 0, {&xrd});
- DISASM_INSN("vxcptaux", vxcptaux, 0, {&xrd});
- DISASM_INSN("vxcptevac", vxcptevac, 0, {&xrs1});
- DISASM_INSN("vxcpthold", vxcpthold, 0, {&xrs1});
- DISASM_INSN("vxcptkill", vxcptkill, 0, {});
-
- const uint32_t mask_vseglen = 0x7UL << 29;
-
- #define DISASM_VMEM_INSN(name1, name2, code, ...) \
- DISASM_INSN(name1, code, mask_vseglen, __VA_ARGS__) \
- DISASM_INSN(name2, code, 0, __VA_ARGS__) \
-
- DISASM_VMEM_INSN("vld", "vlsegd", vlsegd, {&vxrd, &xrs1});
- DISASM_VMEM_INSN("vlw", "vlsegw", vlsegw, {&vxrd, &xrs1});
- DISASM_VMEM_INSN("vlwu", "vlsegwu", vlsegwu, {&vxrd, &xrs1});
- DISASM_VMEM_INSN("vlh", "vlsegh", vlsegh, {&vxrd, &xrs1});
- DISASM_VMEM_INSN("vlhu", "vlseghu", vlseghu, {&vxrd, &xrs1});
- DISASM_VMEM_INSN("vlb", "vlsegb", vlsegb, {&vxrd, &xrs1});
- DISASM_VMEM_INSN("vlbu", "vlsegbu", vlsegbu, {&vxrd, &xrs1});
- DISASM_VMEM_INSN("vfld", "vflsegd", vflsegd, {&vfrd, &xrs1});
- DISASM_VMEM_INSN("vflw", "vflsegw", vflsegw, {&vfrd, &xrs1});
-
- DISASM_VMEM_INSN("vlstd", "vlsegstd", vlsegstd, {&vxrd, &xrs1, &xrs2});
- DISASM_VMEM_INSN("vlstw", "vlsegstw", vlsegstw, {&vxrd, &xrs1, &xrs2});
- DISASM_VMEM_INSN("vlstwu", "vlsegstwu", vlsegstwu, {&vxrd, &xrs1, &xrs2});
- DISASM_VMEM_INSN("vlsth", "vlsegsth", vlsegsth, {&vxrd, &xrs1, &xrs2});
- DISASM_VMEM_INSN("vlsthu", "vlsegsthu", vlsegsthu, {&vxrd, &xrs1, &xrs2});
- DISASM_VMEM_INSN("vlstb", "vlsegstb", vlsegstb, {&vxrd, &xrs1, &xrs2});
- DISASM_VMEM_INSN("vlstbu", "vlsegstbu", vlsegstbu, {&vxrd, &xrs1, &xrs2});
- DISASM_VMEM_INSN("vflstd", "vflsegstd", vflsegstd, {&vfrd, &xrs1, &xrs2});
- DISASM_VMEM_INSN("vflstw", "vflsegstw", vflsegstw, {&vfrd, &xrs1, &xrs2});
-
- DISASM_VMEM_INSN("vsd", "vssegd", vssegd, {&vxrd, &xrs1});
- DISASM_VMEM_INSN("vsw", "vssegw", vssegw, {&vxrd, &xrs1});
- DISASM_VMEM_INSN("vsh", "vssegh", vssegh, {&vxrd, &xrs1});
- DISASM_VMEM_INSN("vsb", "vssegb", vssegb, {&vxrd, &xrs1});
- DISASM_VMEM_INSN("vfsd", "vfssegd", vfssegd, {&vfrd, &xrs1});
- DISASM_VMEM_INSN("vfsw", "vfssegw", vfssegw, {&vfrd, &xrs1});
-
- DISASM_VMEM_INSN("vsstd", "vssegstd", vssegstd, {&vxrd, &xrs1, &xrs2});
- DISASM_VMEM_INSN("vsstw", "vssegstw", vssegstw, {&vxrd, &xrs1, &xrs2});
- DISASM_VMEM_INSN("vssth", "vssegsth", vssegsth, {&vxrd, &xrs1, &xrs2});
- DISASM_VMEM_INSN("vsstb", "vssegstb", vssegstb, {&vxrd, &xrs1, &xrs2});
- DISASM_VMEM_INSN("vfsstd", "vfssegstd", vfssegstd, {&vfrd, &xrs1, &xrs2});
- DISASM_VMEM_INSN("vfsstw", "vfssegstw", vfssegstw, {&vfrd, &xrs1, &xrs2});
-
- #define DECLARE_INSN(code, match, mask) \
- const uint32_t match_##code = match; \
- const uint32_t mask_##code = mask;
- #include "opcodes_hwacha_ut.h"
- #undef DECLARE_INSN
-
- #define DISASM_UT_INSN(name, code, extra, ...) \
- ut_disassembler.add_insn(new disasm_insn_t(name, match_##code, mask_##code | (extra), __VA_ARGS__));
-
- DISASM_UT_INSN("stop", ut_stop, 0, {});
- DISASM_UT_INSN("utidx", ut_utidx, 0, {&xrd});
- DISASM_UT_INSN("movz", ut_movz, 0, {&xrd, &xrs1, &xrs2});
- DISASM_UT_INSN("movn", ut_movn, 0, {&xrd, &xrs1, &xrs2});
- DISASM_UT_INSN("fmovz", ut_fmovz, 0, {&frd, &xrs1, &frs2});
- DISASM_UT_INSN("fmovn", ut_fmovn, 0, {&frd, &xrs1, &frs2});
-
- return insns;
-}
diff --git a/hwacha/hwacha_xcpt.h b/hwacha/hwacha_xcpt.h
deleted file mode 100644
index 3f56c3c..0000000
--- a/hwacha/hwacha_xcpt.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _HWACHA_XCPT_H
-#define _HWACHA_XCPT_H
-
-#include "encoding.h"
-
-#define HWACHA_CAUSE_ILLEGAL_CFG CAUSE_ILLEGAL_INSTRUCTION // AUX: 0=illegal nxpr, 1=illegal nfpr
-#define HWACHA_CAUSE_ILLEGAL_INSTRUCTION CAUSE_ILLEGAL_INSTRUCTION // AUX: instruction
-#define HWACHA_CAUSE_PRIVILEGED_INSTRUCTION CAUSE_ILLEGAL_INSTRUCTION // AUX: instruction
-#define HWACHA_CAUSE_TVEC_ILLEGAL_REGID CAUSE_ILLEGAL_INSTRUCTION // AUX: instruction
-#define HWACHA_CAUSE_VF_MISALIGNED_FETCH CAUSE_MISALIGNED_FETCH // AUX: pc
-#define HWACHA_CAUSE_VF_FAULT_FETCH CAUSE_FAULT_FETCH // AUX: pc
-#define HWACHA_CAUSE_VF_ILLEGAL_INSTRUCTION CAUSE_ILLEGAL_INSTRUCTION // AUX: pc
-#define HWACHA_CAUSE_VF_ILLEGAL_REGID CAUSE_ILLEGAL_INSTRUCTION // AUX: pc
-#define HWACHA_CAUSE_MISALIGNED_LOAD CAUSE_MISALIGNED_LOAD // AUX: badvaddr
-#define HWACHA_CAUSE_MISALIGNED_STORE CAUSE_MISALIGNED_STORE // AUX: badvaddr
-#define HWACHA_CAUSE_FAULT_LOAD CAUSE_FAULT_LOAD // AUX: badvaddr
-#define HWACHA_CAUSE_FAULT_STORE CAUSE_FAULT_STORE // AUX: badvaddr
-
-#endif
diff --git a/hwacha/insn_template_hwacha.cc b/hwacha/insn_template_hwacha.cc
deleted file mode 100644
index d225949..0000000
--- a/hwacha/insn_template_hwacha.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-// See LICENSE for license details.
-#include "insn_template_hwacha.h"
-
-reg_t hwacha_NAME(processor_t* p, insn_t insn, reg_t pc)
-{
- int xlen = 64;
- reg_t npc = sext_xlen(pc + insn_length(OPCODE));
- hwacha_t* h = static_cast<hwacha_t*>(p->get_extension());
- rocc_insn_union_t u;
- u.i = insn;
- reg_t xs1 = u.r.xs1 ? RS1 : -1;
- reg_t xs2 = u.r.xs2 ? RS2 : -1;
- reg_t xd = -1;
- #include "insns/NAME.h"
- if (u.r.xd) WRITE_RD(xd);
- return npc;
-}
diff --git a/hwacha/insn_template_hwacha.h b/hwacha/insn_template_hwacha.h
deleted file mode 100644
index b4704da..0000000
--- a/hwacha/insn_template_hwacha.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "hwacha.h"
-#include "decode_hwacha.h"
-#include "encodings_hwacha.h"
-#include "rocc.h"
-#include <assert.h>
diff --git a/hwacha/insn_template_hwacha_ut.cc b/hwacha/insn_template_hwacha_ut.cc
deleted file mode 100644
index 7f5dc0e..0000000
--- a/hwacha/insn_template_hwacha_ut.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-// See LICENSE for license details.
-#include "insn_template_hwacha_ut.h"
-
-reg_t hwacha_NAME(processor_t* p, insn_t insn, reg_t pc)
-{
- int xlen = 64;
- reg_t npc = sext_xlen(pc + insn_length(OPCODE));
- hwacha_t* h = static_cast<hwacha_t*>(p->get_extension());
- do {
- #include "insns_ut/NAME.h"
- WRITE_UTIDX(UTIDX+1);
- } while (UTIDX < VL);
- WRITE_UTIDX(0);
- return npc;
-}
diff --git a/hwacha/insn_template_hwacha_ut.h b/hwacha/insn_template_hwacha_ut.h
deleted file mode 100644
index d585f9b..0000000
--- a/hwacha/insn_template_hwacha_ut.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "hwacha.h"
-#include "mulhi.h"
-#include "decode_hwacha_ut.h"
-#include "softfloat.h"
-#include "platform.h" // softfloat isNaNF32UI, etc.
-#include "internals.h" // ditto
-#include <assert.h>
diff --git a/hwacha/insns/vf.h b/hwacha/insns/vf.h
deleted file mode 100644
index 395ef1e..0000000
--- a/hwacha/insns/vf.h
+++ /dev/null
@@ -1,38 +0,0 @@
-if (VL) {
- if (!h->vf_active()) {
- WRITE_VF_PC(XS1 + insn.s_imm());
- for (uint32_t i=0; i<VL; i++)
- h->get_ut_state(i)->run = true;
- }
-
-vf_loop:
-
- if (VF_PC & 3)
- h->take_exception(HWACHA_CAUSE_VF_MISALIGNED_FETCH, VF_PC);
-
- insn_t ut_insn = p->get_mmu()->load_insn(VF_PC).insn;
-
- bool matched = false;
-
- #define DECLARE_INSN(name, match, mask) \
- extern reg_t hwacha_##name(processor_t*, insn_t, reg_t); \
- if ((ut_insn.bits() & mask) == match) { \
- WRITE_VF_PC(hwacha_##name(p, ut_insn, VF_PC)); \
- matched = true; \
- }
- #include "opcodes_hwacha_ut.h"
- #undef DECLARE_INSN
-
- if (!matched)
- h->take_exception(HWACHA_CAUSE_VF_ILLEGAL_INSTRUCTION, VF_PC);
-
- if (!h->get_debug()) {
- if (h->vf_active())
- goto vf_loop;
- } else {
- fprintf(stderr, "vf block: 0x%016" PRIx64 " (0x%08" PRIx64 ") %s\n",
- VF_PC, ut_insn.bits(), h->get_ut_disassembler()->disassemble(ut_insn).c_str());
- if (h->vf_active())
- npc = pc;
- }
-}
diff --git a/hwacha/insns/vflsegd.h b/hwacha/insns/vflsegd.h
deleted file mode 100644
index 1e12ad2..0000000
--- a/hwacha/insns/vflsegd.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_LOAD(FPR, load_int64, 8);
diff --git a/hwacha/insns/vflsegstd.h b/hwacha/insns/vflsegstd.h
deleted file mode 100644
index 0d866c6..0000000
--- a/hwacha/insns/vflsegstd.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_ST_LOAD(FPR, load_int64, XS2, 8);
diff --git a/hwacha/insns/vflsegstw.h b/hwacha/insns/vflsegstw.h
deleted file mode 100644
index ee57575..0000000
--- a/hwacha/insns/vflsegstw.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_ST_LOAD(FPR, load_int32, XS2, 4);
diff --git a/hwacha/insns/vflsegw.h b/hwacha/insns/vflsegw.h
deleted file mode 100644
index 50dcb2b..0000000
--- a/hwacha/insns/vflsegw.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_LOAD(FPR, load_int32, 4);
diff --git a/hwacha/insns/vfmsv_d.h b/hwacha/insns/vfmsv_d.h
deleted file mode 100644
index d1df3a1..0000000
--- a/hwacha/insns/vfmsv_d.h
+++ /dev/null
@@ -1,3 +0,0 @@
-for (uint32_t i=0; i<VL; i++) {
- UT_WRITE_FRD(i, XS1);
-}
diff --git a/hwacha/insns/vfmsv_s.h b/hwacha/insns/vfmsv_s.h
deleted file mode 100644
index d1df3a1..0000000
--- a/hwacha/insns/vfmsv_s.h
+++ /dev/null
@@ -1,3 +0,0 @@
-for (uint32_t i=0; i<VL; i++) {
- UT_WRITE_FRD(i, XS1);
-}
diff --git a/hwacha/insns/vfmvv.h b/hwacha/insns/vfmvv.h
deleted file mode 100644
index c7f194d..0000000
--- a/hwacha/insns/vfmvv.h
+++ /dev/null
@@ -1,3 +0,0 @@
-for (uint32_t i=0; i<VL; i++) {
- UT_WRITE_FRD(i, UT_FRS1(i));
-}
diff --git a/hwacha/insns/vfssegd.h b/hwacha/insns/vfssegd.h
deleted file mode 100644
index c09159b..0000000
--- a/hwacha/insns/vfssegd.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_STORE(FPR, store_uint64, 8);
diff --git a/hwacha/insns/vfssegstd.h b/hwacha/insns/vfssegstd.h
deleted file mode 100644
index f3dc6da..0000000
--- a/hwacha/insns/vfssegstd.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_ST_STORE(FPR, store_uint64, XS2, 8);
diff --git a/hwacha/insns/vfssegstw.h b/hwacha/insns/vfssegstw.h
deleted file mode 100644
index 922cc3d..0000000
--- a/hwacha/insns/vfssegstw.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_ST_STORE(FPR, store_uint32, XS2, 4);
diff --git a/hwacha/insns/vfssegw.h b/hwacha/insns/vfssegw.h
deleted file mode 100644
index efd162e..0000000
--- a/hwacha/insns/vfssegw.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_STORE(FPR, store_uint32, 4);
diff --git a/hwacha/insns/vgetcfg.h b/hwacha/insns/vgetcfg.h
deleted file mode 100644
index 7bd1765..0000000
--- a/hwacha/insns/vgetcfg.h
+++ /dev/null
@@ -1 +0,0 @@
-WRITE_XRD((NXPR & 0x3f) | ((NFPR & 0x3f) << 6));
diff --git a/hwacha/insns/vgetvl.h b/hwacha/insns/vgetvl.h
deleted file mode 100644
index 11df2f9..0000000
--- a/hwacha/insns/vgetvl.h
+++ /dev/null
@@ -1 +0,0 @@
-WRITE_XRD(VL);
diff --git a/hwacha/insns/vlsegb.h b/hwacha/insns/vlsegb.h
deleted file mode 100644
index 6228b70..0000000
--- a/hwacha/insns/vlsegb.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_LOAD(XPR, load_int8, 1);
diff --git a/hwacha/insns/vlsegbu.h b/hwacha/insns/vlsegbu.h
deleted file mode 100644
index aeee563..0000000
--- a/hwacha/insns/vlsegbu.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_LOAD(XPR, load_uint8, 1);
diff --git a/hwacha/insns/vlsegd.h b/hwacha/insns/vlsegd.h
deleted file mode 100644
index 8e0006d..0000000
--- a/hwacha/insns/vlsegd.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_LOAD(XPR, load_int64, 8);
diff --git a/hwacha/insns/vlsegh.h b/hwacha/insns/vlsegh.h
deleted file mode 100644
index 057a296..0000000
--- a/hwacha/insns/vlsegh.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_LOAD(XPR, load_int16, 2);
diff --git a/hwacha/insns/vlseghu.h b/hwacha/insns/vlseghu.h
deleted file mode 100644
index 6d00649..0000000
--- a/hwacha/insns/vlseghu.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_LOAD(XPR, load_uint16, 2);
diff --git a/hwacha/insns/vlsegstb.h b/hwacha/insns/vlsegstb.h
deleted file mode 100644
index 468c623..0000000
--- a/hwacha/insns/vlsegstb.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_ST_LOAD(XPR, load_int8, XS2, 1);
diff --git a/hwacha/insns/vlsegstbu.h b/hwacha/insns/vlsegstbu.h
deleted file mode 100644
index ebc1bb0..0000000
--- a/hwacha/insns/vlsegstbu.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_ST_LOAD(XPR, load_uint8, XS2, 1);
diff --git a/hwacha/insns/vlsegstd.h b/hwacha/insns/vlsegstd.h
deleted file mode 100644
index f4582b9..0000000
--- a/hwacha/insns/vlsegstd.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_ST_LOAD(XPR, load_int64, XS2, 8);
diff --git a/hwacha/insns/vlsegsth.h b/hwacha/insns/vlsegsth.h
deleted file mode 100644
index 72d18e7..0000000
--- a/hwacha/insns/vlsegsth.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_ST_LOAD(XPR, load_int16, XS2, 2);
diff --git a/hwacha/insns/vlsegsthu.h b/hwacha/insns/vlsegsthu.h
deleted file mode 100644
index 0ac9e98..0000000
--- a/hwacha/insns/vlsegsthu.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_ST_LOAD(XPR, load_uint16, XS2, 2);
diff --git a/hwacha/insns/vlsegstw.h b/hwacha/insns/vlsegstw.h
deleted file mode 100644
index 0269bfa..0000000
--- a/hwacha/insns/vlsegstw.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_ST_LOAD(XPR, load_int32, XS2, 4);
diff --git a/hwacha/insns/vlsegstwu.h b/hwacha/insns/vlsegstwu.h
deleted file mode 100644
index f6b52ae..0000000
--- a/hwacha/insns/vlsegstwu.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_ST_LOAD(XPR, load_uint32, XS2, 4);
diff --git a/hwacha/insns/vlsegw.h b/hwacha/insns/vlsegw.h
deleted file mode 100644
index 312056a..0000000
--- a/hwacha/insns/vlsegw.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_LOAD(XPR, load_int32, 4);
diff --git a/hwacha/insns/vlsegwu.h b/hwacha/insns/vlsegwu.h
deleted file mode 100644
index 7037aad..0000000
--- a/hwacha/insns/vlsegwu.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_LOAD(XPR, load_uint32, 4);
diff --git a/hwacha/insns/vmsv.h b/hwacha/insns/vmsv.h
deleted file mode 100644
index 3995194..0000000
--- a/hwacha/insns/vmsv.h
+++ /dev/null
@@ -1,2 +0,0 @@
-for (uint32_t i=0; i<VL; i++)
- UT_WRITE_RD(i, XS1);
diff --git a/hwacha/insns/vmvv.h b/hwacha/insns/vmvv.h
deleted file mode 100644
index 831ed2c..0000000
--- a/hwacha/insns/vmvv.h
+++ /dev/null
@@ -1,3 +0,0 @@
-for (uint32_t i=0; i<VL; i++) {
- UT_WRITE_RD(i, UT_RS1(i));
-}
diff --git a/hwacha/insns/vsetcfg.h b/hwacha/insns/vsetcfg.h
deleted file mode 100644
index c18812d..0000000
--- a/hwacha/insns/vsetcfg.h
+++ /dev/null
@@ -1,15 +0,0 @@
-uint32_t nxpr = (XS1 & 0x3f) + (insn.i_imm() & 0x3f);
-uint32_t nfpr = ((XS1 >> 6) & 0x3f) + ((insn.i_imm() >> 6) & 0x3f);
-if (nxpr > 32)
- h->take_exception(HWACHA_CAUSE_ILLEGAL_CFG, 0);
-if (nfpr > 32)
- h->take_exception(HWACHA_CAUSE_ILLEGAL_CFG, 1);
-WRITE_NXPR(nxpr);
-WRITE_NFPR(nfpr);
-uint32_t maxvl;
-if (nxpr + nfpr < 2)
- maxvl = 8 * 256;
-else
- maxvl = 8 * (256 / (nxpr-1 + nfpr));
-WRITE_MAXVL(maxvl);
-WRITE_VL(0);
diff --git a/hwacha/insns/vsetucfg.h b/hwacha/insns/vsetucfg.h
deleted file mode 100644
index c7b5264..0000000
--- a/hwacha/insns/vsetucfg.h
+++ /dev/null
@@ -1 +0,0 @@
-WRITE_RD(insn.u_imm());
diff --git a/hwacha/insns/vsetvl.h b/hwacha/insns/vsetvl.h
deleted file mode 100644
index 7c8db36..0000000
--- a/hwacha/insns/vsetvl.h
+++ /dev/null
@@ -1,3 +0,0 @@
-uint32_t vl = std::min(MAXVL, (uint32_t)XS1);
-WRITE_VL(vl);
-WRITE_XRD(vl);
diff --git a/hwacha/insns/vssegb.h b/hwacha/insns/vssegb.h
deleted file mode 100644
index 2043661..0000000
--- a/hwacha/insns/vssegb.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_STORE(XPR, store_uint8, 1);
diff --git a/hwacha/insns/vssegd.h b/hwacha/insns/vssegd.h
deleted file mode 100644
index c3c6cbe..0000000
--- a/hwacha/insns/vssegd.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_STORE(XPR, store_uint64, 8);
diff --git a/hwacha/insns/vssegh.h b/hwacha/insns/vssegh.h
deleted file mode 100644
index 16ddf20..0000000
--- a/hwacha/insns/vssegh.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_STORE(XPR, store_uint16, 2);
diff --git a/hwacha/insns/vssegstb.h b/hwacha/insns/vssegstb.h
deleted file mode 100644
index bb8d85f..0000000
--- a/hwacha/insns/vssegstb.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_ST_STORE(XPR, store_uint8, XS2, 1);
diff --git a/hwacha/insns/vssegstd.h b/hwacha/insns/vssegstd.h
deleted file mode 100644
index 87bd455..0000000
--- a/hwacha/insns/vssegstd.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_ST_STORE(XPR, store_uint64, XS2, 8);
diff --git a/hwacha/insns/vssegsth.h b/hwacha/insns/vssegsth.h
deleted file mode 100644
index 02c1ff7..0000000
--- a/hwacha/insns/vssegsth.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_ST_STORE(XPR, store_uint16, XS2, 2);
diff --git a/hwacha/insns/vssegstw.h b/hwacha/insns/vssegstw.h
deleted file mode 100644
index 71fa4a1..0000000
--- a/hwacha/insns/vssegstw.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_ST_STORE(XPR, store_uint32, XS2, 4);
diff --git a/hwacha/insns/vssegw.h b/hwacha/insns/vssegw.h
deleted file mode 100644
index 076ee5f..0000000
--- a/hwacha/insns/vssegw.h
+++ /dev/null
@@ -1 +0,0 @@
-VEC_SEG_STORE(XPR, store_uint32, 4);
diff --git a/hwacha/insns/vxcptaux.h b/hwacha/insns/vxcptaux.h
deleted file mode 100644
index 77318c3..0000000
--- a/hwacha/insns/vxcptaux.h
+++ /dev/null
@@ -1,2 +0,0 @@
-require_supervisor_hwacha;
-xd = h->get_aux();
diff --git a/hwacha/insns/vxcptcause.h b/hwacha/insns/vxcptcause.h
deleted file mode 100644
index 3054ff9..0000000
--- a/hwacha/insns/vxcptcause.h
+++ /dev/null
@@ -1,3 +0,0 @@
-require_supervisor_hwacha;
-h->clear_exception();
-xd = h->get_cause();
diff --git a/hwacha/insns/vxcptevac.h b/hwacha/insns/vxcptevac.h
deleted file mode 100644
index 607e352..0000000
--- a/hwacha/insns/vxcptevac.h
+++ /dev/null
@@ -1,48 +0,0 @@
-require_supervisor_hwacha;
-reg_t addr = XS1;
-
-#define STORE_B(addr, value) \
- p->get_mmu()->store_uint8(addr, value); \
- addr += 1; \
-
-#define STORE_W(addr, value) \
- p->get_mmu()->store_uint32(addr, value); \
- addr += 4; \
-
-#define STORE_D(addr, value) \
- p->get_mmu()->store_uint64(addr, value); \
- addr += 8; \
-
-// to be compliant with the evac structure
-STORE_D(addr, (uint64_t)-1);
-
-STORE_W(addr, NXPR);
-STORE_W(addr, NFPR);
-STORE_W(addr, MAXVL);
-STORE_W(addr, VL);
-STORE_W(addr, UTIDX);
-STORE_W(addr, PREC);
-
-STORE_D(addr, VF_PC);
-
-for (uint32_t x=1; x<NXPR; x++) {
- for (uint32_t i=0; i<VL; i++) {
- STORE_D(addr, UT_READ_XPR(i, x));
- }
-}
-
-for (uint32_t f=0; f<NFPR; f++) {
- for (uint32_t i=0; i<VL; i++) {
- STORE_D(addr, UT_READ_FPR(i, f));
- }
-}
-
-for (uint32_t i=0; i<VL; i++) {
- STORE_B(addr, h->get_ut_state(i)->run);
-}
-
-#undef STORE_B
-#undef STORE_W
-#undef STORE_D
-
-#include "insns/vxcptkill.h"
diff --git a/hwacha/insns/vxcpthold.h b/hwacha/insns/vxcpthold.h
deleted file mode 100644
index adefd75..0000000
--- a/hwacha/insns/vxcpthold.h
+++ /dev/null
@@ -1,42 +0,0 @@
-require_supervisor_hwacha;
-reg_t addr = XS1;
-
-#define LOAD_B(addr) \
- (addr += 1, p->get_mmu()->load_uint8(addr-1))
-
-#define LOAD_W(addr) \
- (addr += 4, p->get_mmu()->load_uint32(addr-4))
-
-#define LOAD_D(addr) \
- (addr += 8, p->get_mmu()->load_uint64(addr-8))
-
-// to be compliant with the evac structure
-addr += 8;
-
-WRITE_NXPR(LOAD_W(addr));
-WRITE_NFPR(LOAD_W(addr));
-WRITE_MAXVL(LOAD_W(addr));
-WRITE_VL(LOAD_W(addr));
-WRITE_UTIDX(LOAD_W(addr));
-WRITE_PREC(LOAD_W(addr));
-WRITE_VF_PC(LOAD_D(addr));
-
-for (uint32_t x=1; x<NXPR; x++) {
- for (uint32_t i=0; i<VL; i++) {
- UT_WRITE_XPR(i, x, LOAD_D(addr));
- }
-}
-
-for (uint32_t f=0; f<NFPR; f++) {
- for (uint32_t i=0; i<VL; i++) {
- UT_WRITE_FPR(i, f, LOAD_D(addr));
- }
-}
-
-for (uint32_t i=0; i<VL; i++) {
- h->get_ut_state(i)->run = LOAD_B(addr);
-}
-
-#undef LOAD_B
-#undef LOAD_W
-#undef LOAD_D
diff --git a/hwacha/insns/vxcptkill.h b/hwacha/insns/vxcptkill.h
deleted file mode 100644
index 08efc12..0000000
--- a/hwacha/insns/vxcptkill.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_supervisor_hwacha;
-h->get_ct_state()->reset();
-for (uint32_t i=0; i<h->max_uts; i++)
- h->get_ut_state(i)->reset();
diff --git a/hwacha/insns_ut/ut_add.h b/hwacha/insns_ut/ut_add.h
deleted file mode 120000
index c918484..0000000
--- a/hwacha/insns_ut/ut_add.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/add.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_addi.h b/hwacha/insns_ut/ut_addi.h
deleted file mode 120000
index 8c7cce2..0000000
--- a/hwacha/insns_ut/ut_addi.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/addi.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_addiw.h b/hwacha/insns_ut/ut_addiw.h
deleted file mode 120000
index 5a1ffda..0000000
--- a/hwacha/insns_ut/ut_addiw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/addiw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_addw.h b/hwacha/insns_ut/ut_addw.h
deleted file mode 120000
index e594986..0000000
--- a/hwacha/insns_ut/ut_addw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/addw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amoadd_d.h b/hwacha/insns_ut/ut_amoadd_d.h
deleted file mode 120000
index 3f08289..0000000
--- a/hwacha/insns_ut/ut_amoadd_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amoadd_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amoadd_w.h b/hwacha/insns_ut/ut_amoadd_w.h
deleted file mode 120000
index a45ed76..0000000
--- a/hwacha/insns_ut/ut_amoadd_w.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amoadd_w.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amoand_d.h b/hwacha/insns_ut/ut_amoand_d.h
deleted file mode 120000
index fc6c7d2..0000000
--- a/hwacha/insns_ut/ut_amoand_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amoand_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amoand_w.h b/hwacha/insns_ut/ut_amoand_w.h
deleted file mode 120000
index c1a3433..0000000
--- a/hwacha/insns_ut/ut_amoand_w.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amoand_w.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amomax_d.h b/hwacha/insns_ut/ut_amomax_d.h
deleted file mode 120000
index 36d16e7..0000000
--- a/hwacha/insns_ut/ut_amomax_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amomax_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amomax_w.h b/hwacha/insns_ut/ut_amomax_w.h
deleted file mode 120000
index c8033c0..0000000
--- a/hwacha/insns_ut/ut_amomax_w.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amomax_w.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amomaxu_d.h b/hwacha/insns_ut/ut_amomaxu_d.h
deleted file mode 120000
index 2a38c71..0000000
--- a/hwacha/insns_ut/ut_amomaxu_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amomaxu_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amomaxu_w.h b/hwacha/insns_ut/ut_amomaxu_w.h
deleted file mode 120000
index b6d752e..0000000
--- a/hwacha/insns_ut/ut_amomaxu_w.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amomaxu_w.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amomin_d.h b/hwacha/insns_ut/ut_amomin_d.h
deleted file mode 120000
index 62b831f..0000000
--- a/hwacha/insns_ut/ut_amomin_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amomin_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amomin_w.h b/hwacha/insns_ut/ut_amomin_w.h
deleted file mode 120000
index 3af34f1..0000000
--- a/hwacha/insns_ut/ut_amomin_w.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amomin_w.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amominu_d.h b/hwacha/insns_ut/ut_amominu_d.h
deleted file mode 120000
index b4b6fb8..0000000
--- a/hwacha/insns_ut/ut_amominu_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amominu_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amominu_w.h b/hwacha/insns_ut/ut_amominu_w.h
deleted file mode 120000
index 9f7f1b7..0000000
--- a/hwacha/insns_ut/ut_amominu_w.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amominu_w.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amoor_d.h b/hwacha/insns_ut/ut_amoor_d.h
deleted file mode 120000
index c8cf47c..0000000
--- a/hwacha/insns_ut/ut_amoor_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amoor_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amoor_w.h b/hwacha/insns_ut/ut_amoor_w.h
deleted file mode 120000
index 0a85136..0000000
--- a/hwacha/insns_ut/ut_amoor_w.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amoor_w.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amoswap_d.h b/hwacha/insns_ut/ut_amoswap_d.h
deleted file mode 120000
index 97d4c3e..0000000
--- a/hwacha/insns_ut/ut_amoswap_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amoswap_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amoswap_w.h b/hwacha/insns_ut/ut_amoswap_w.h
deleted file mode 120000
index f97be68..0000000
--- a/hwacha/insns_ut/ut_amoswap_w.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amoswap_w.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amoxor_d.h b/hwacha/insns_ut/ut_amoxor_d.h
deleted file mode 120000
index 684663f..0000000
--- a/hwacha/insns_ut/ut_amoxor_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amoxor_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_amoxor_w.h b/hwacha/insns_ut/ut_amoxor_w.h
deleted file mode 120000
index 553e587..0000000
--- a/hwacha/insns_ut/ut_amoxor_w.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/amoxor_w.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_and.h b/hwacha/insns_ut/ut_and.h
deleted file mode 120000
index 270e31e..0000000
--- a/hwacha/insns_ut/ut_and.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/and.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_andi.h b/hwacha/insns_ut/ut_andi.h
deleted file mode 120000
index c3a8424..0000000
--- a/hwacha/insns_ut/ut_andi.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/andi.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_auipc.h b/hwacha/insns_ut/ut_auipc.h
deleted file mode 120000
index 2c0a9e5..0000000
--- a/hwacha/insns_ut/ut_auipc.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/auipc.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_div.h b/hwacha/insns_ut/ut_div.h
deleted file mode 120000
index 5e43e33..0000000
--- a/hwacha/insns_ut/ut_div.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/div.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_divu.h b/hwacha/insns_ut/ut_divu.h
deleted file mode 120000
index 9726ad2..0000000
--- a/hwacha/insns_ut/ut_divu.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/divu.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_divuw.h b/hwacha/insns_ut/ut_divuw.h
deleted file mode 120000
index a67a2e1..0000000
--- a/hwacha/insns_ut/ut_divuw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/divuw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_divw.h b/hwacha/insns_ut/ut_divw.h
deleted file mode 120000
index 5345781..0000000
--- a/hwacha/insns_ut/ut_divw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/divw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fadd_d.h b/hwacha/insns_ut/ut_fadd_d.h
deleted file mode 120000
index 90443b6..0000000
--- a/hwacha/insns_ut/ut_fadd_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fadd_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fadd_h.h b/hwacha/insns_ut/ut_fadd_h.h
deleted file mode 100644
index 8192562..0000000
--- a/hwacha/insns_ut/ut_fadd_h.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_HFRD(f32_mulAdd(HFRS1, 0x3f800000, HFRS2));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fadd_s.h b/hwacha/insns_ut/ut_fadd_s.h
deleted file mode 120000
index a97aea9..0000000
--- a/hwacha/insns_ut/ut_fadd_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fadd_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fclass_d.h b/hwacha/insns_ut/ut_fclass_d.h
deleted file mode 120000
index b3fea7f..0000000
--- a/hwacha/insns_ut/ut_fclass_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fclass_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fclass_s.h b/hwacha/insns_ut/ut_fclass_s.h
deleted file mode 120000
index 7df8a5a..0000000
--- a/hwacha/insns_ut/ut_fclass_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fclass_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_d_h.h b/hwacha/insns_ut/ut_fcvt_d_h.h
deleted file mode 100644
index 9251ae9..0000000
--- a/hwacha/insns_ut/ut_fcvt_d_h.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_FRD(f32_to_f64(HFRS1));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fcvt_d_l.h b/hwacha/insns_ut/ut_fcvt_d_l.h
deleted file mode 120000
index 56a699e..0000000
--- a/hwacha/insns_ut/ut_fcvt_d_l.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_d_l.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_d_lu.h b/hwacha/insns_ut/ut_fcvt_d_lu.h
deleted file mode 120000
index 9f1eefd..0000000
--- a/hwacha/insns_ut/ut_fcvt_d_lu.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_d_lu.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_d_s.h b/hwacha/insns_ut/ut_fcvt_d_s.h
deleted file mode 120000
index 0814b48..0000000
--- a/hwacha/insns_ut/ut_fcvt_d_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_d_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_d_w.h b/hwacha/insns_ut/ut_fcvt_d_w.h
deleted file mode 120000
index 7006dc2..0000000
--- a/hwacha/insns_ut/ut_fcvt_d_w.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_d_w.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_d_wu.h b/hwacha/insns_ut/ut_fcvt_d_wu.h
deleted file mode 120000
index 5b9a63c..0000000
--- a/hwacha/insns_ut/ut_fcvt_d_wu.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_d_wu.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_h_d.h b/hwacha/insns_ut/ut_fcvt_h_d.h
deleted file mode 100644
index 89dc473..0000000
--- a/hwacha/insns_ut/ut_fcvt_h_d.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_HFRD(f64_to_f32(FRS1));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fcvt_h_l.h b/hwacha/insns_ut/ut_fcvt_h_l.h
deleted file mode 100644
index 69f39ec..0000000
--- a/hwacha/insns_ut/ut_fcvt_h_l.h
+++ /dev/null
@@ -1,5 +0,0 @@
-require_rv64;
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_HFRD(i64_to_f32(RS1));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fcvt_h_lu.h b/hwacha/insns_ut/ut_fcvt_h_lu.h
deleted file mode 100644
index ab74977..0000000
--- a/hwacha/insns_ut/ut_fcvt_h_lu.h
+++ /dev/null
@@ -1,5 +0,0 @@
-require_rv64;
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_HFRD(ui64_to_f32(RS1));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fcvt_h_s.h b/hwacha/insns_ut/ut_fcvt_h_s.h
deleted file mode 100644
index ee49e1b..0000000
--- a/hwacha/insns_ut/ut_fcvt_h_s.h
+++ /dev/null
@@ -1,3 +0,0 @@
-require_fp;
-WRITE_FRD(cvt_sh(FRS1, RM));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fcvt_h_w.h b/hwacha/insns_ut/ut_fcvt_h_w.h
deleted file mode 100644
index 383a3c0..0000000
--- a/hwacha/insns_ut/ut_fcvt_h_w.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_HFRD(i32_to_f32((int32_t)RS1));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fcvt_h_wu.h b/hwacha/insns_ut/ut_fcvt_h_wu.h
deleted file mode 100644
index 228b25a..0000000
--- a/hwacha/insns_ut/ut_fcvt_h_wu.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_HFRD(ui32_to_f32((uint32_t)RS1));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fcvt_l_d.h b/hwacha/insns_ut/ut_fcvt_l_d.h
deleted file mode 120000
index e738c00..0000000
--- a/hwacha/insns_ut/ut_fcvt_l_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_l_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_l_h.h b/hwacha/insns_ut/ut_fcvt_l_h.h
deleted file mode 100644
index d3128d6..0000000
--- a/hwacha/insns_ut/ut_fcvt_l_h.h
+++ /dev/null
@@ -1,5 +0,0 @@
-require_rv64;
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_RD(f32_to_i64(HFRS1, RM, true));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fcvt_l_s.h b/hwacha/insns_ut/ut_fcvt_l_s.h
deleted file mode 120000
index 087c5f7..0000000
--- a/hwacha/insns_ut/ut_fcvt_l_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_l_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_lu_d.h b/hwacha/insns_ut/ut_fcvt_lu_d.h
deleted file mode 120000
index 14d02c0..0000000
--- a/hwacha/insns_ut/ut_fcvt_lu_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_lu_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_lu_h.h b/hwacha/insns_ut/ut_fcvt_lu_h.h
deleted file mode 100644
index a1cedea..0000000
--- a/hwacha/insns_ut/ut_fcvt_lu_h.h
+++ /dev/null
@@ -1,5 +0,0 @@
-require_rv64;
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_RD(f32_to_ui64(HFRS1, RM, true));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fcvt_lu_s.h b/hwacha/insns_ut/ut_fcvt_lu_s.h
deleted file mode 120000
index 8cd7c72..0000000
--- a/hwacha/insns_ut/ut_fcvt_lu_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_lu_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_s_d.h b/hwacha/insns_ut/ut_fcvt_s_d.h
deleted file mode 120000
index 02ab869..0000000
--- a/hwacha/insns_ut/ut_fcvt_s_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_s_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_s_h.h b/hwacha/insns_ut/ut_fcvt_s_h.h
deleted file mode 100644
index f779da8..0000000
--- a/hwacha/insns_ut/ut_fcvt_s_h.h
+++ /dev/null
@@ -1,3 +0,0 @@
-require_fp;
-WRITE_FRD(HFRS1);
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fcvt_s_l.h b/hwacha/insns_ut/ut_fcvt_s_l.h
deleted file mode 120000
index 1c37ef8..0000000
--- a/hwacha/insns_ut/ut_fcvt_s_l.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_s_l.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_s_lu.h b/hwacha/insns_ut/ut_fcvt_s_lu.h
deleted file mode 120000
index ee9e992..0000000
--- a/hwacha/insns_ut/ut_fcvt_s_lu.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_s_lu.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_s_w.h b/hwacha/insns_ut/ut_fcvt_s_w.h
deleted file mode 120000
index f9492c4..0000000
--- a/hwacha/insns_ut/ut_fcvt_s_w.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_s_w.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_s_wu.h b/hwacha/insns_ut/ut_fcvt_s_wu.h
deleted file mode 120000
index b8cc0b3..0000000
--- a/hwacha/insns_ut/ut_fcvt_s_wu.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_s_wu.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_w_d.h b/hwacha/insns_ut/ut_fcvt_w_d.h
deleted file mode 120000
index 9be0029..0000000
--- a/hwacha/insns_ut/ut_fcvt_w_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_w_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_w_h.h b/hwacha/insns_ut/ut_fcvt_w_h.h
deleted file mode 100644
index 5a2f084..0000000
--- a/hwacha/insns_ut/ut_fcvt_w_h.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_RD(sext32(f32_to_i32(HFRS1, RM, true)));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fcvt_w_s.h b/hwacha/insns_ut/ut_fcvt_w_s.h
deleted file mode 120000
index 66050c8..0000000
--- a/hwacha/insns_ut/ut_fcvt_w_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_w_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_wu_d.h b/hwacha/insns_ut/ut_fcvt_wu_d.h
deleted file mode 120000
index 2f7807b..0000000
--- a/hwacha/insns_ut/ut_fcvt_wu_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_wu_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fcvt_wu_h.h b/hwacha/insns_ut/ut_fcvt_wu_h.h
deleted file mode 100644
index 537f50a..0000000
--- a/hwacha/insns_ut/ut_fcvt_wu_h.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_RD(sext32(f32_to_ui32(HFRS1, RM, true)));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fcvt_wu_s.h b/hwacha/insns_ut/ut_fcvt_wu_s.h
deleted file mode 120000
index aa141ac..0000000
--- a/hwacha/insns_ut/ut_fcvt_wu_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fcvt_wu_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fdiv_d.h b/hwacha/insns_ut/ut_fdiv_d.h
deleted file mode 120000
index 3e6c162..0000000
--- a/hwacha/insns_ut/ut_fdiv_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fdiv_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fdiv_h.h b/hwacha/insns_ut/ut_fdiv_h.h
deleted file mode 100644
index 924b0c7..0000000
--- a/hwacha/insns_ut/ut_fdiv_h.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_HFRD(f32_div(HFRS1, HFRS2));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fdiv_s.h b/hwacha/insns_ut/ut_fdiv_s.h
deleted file mode 120000
index ab1f1f6..0000000
--- a/hwacha/insns_ut/ut_fdiv_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fdiv_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fence.h b/hwacha/insns_ut/ut_fence.h
deleted file mode 120000
index c3ebdd4..0000000
--- a/hwacha/insns_ut/ut_fence.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fence.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_feq_d.h b/hwacha/insns_ut/ut_feq_d.h
deleted file mode 120000
index 3c2b873..0000000
--- a/hwacha/insns_ut/ut_feq_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/feq_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_feq_h.h b/hwacha/insns_ut/ut_feq_h.h
deleted file mode 100644
index a6b4707..0000000
--- a/hwacha/insns_ut/ut_feq_h.h
+++ /dev/null
@@ -1,3 +0,0 @@
-require_fp;
-WRITE_RD(f32_eq(HFRS1, HFRS2));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_feq_s.h b/hwacha/insns_ut/ut_feq_s.h
deleted file mode 120000
index e3b0e29..0000000
--- a/hwacha/insns_ut/ut_feq_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/feq_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fld.h b/hwacha/insns_ut/ut_fld.h
deleted file mode 120000
index 4368897..0000000
--- a/hwacha/insns_ut/ut_fld.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fld.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fle_d.h b/hwacha/insns_ut/ut_fle_d.h
deleted file mode 120000
index 8a6170a..0000000
--- a/hwacha/insns_ut/ut_fle_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fle_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fle_h.h b/hwacha/insns_ut/ut_fle_h.h
deleted file mode 100644
index 2c17204..0000000
--- a/hwacha/insns_ut/ut_fle_h.h
+++ /dev/null
@@ -1,3 +0,0 @@
-require_fp;
-WRITE_RD(f32_le(HFRS1, HFRS2));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fle_s.h b/hwacha/insns_ut/ut_fle_s.h
deleted file mode 120000
index 46b1ac3..0000000
--- a/hwacha/insns_ut/ut_fle_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fle_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_flh.h b/hwacha/insns_ut/ut_flh.h
deleted file mode 100644
index 90872ed..0000000
--- a/hwacha/insns_ut/ut_flh.h
+++ /dev/null
@@ -1,2 +0,0 @@
-require_fp;
-WRITE_FRD(MMU.load_int16(RS1 + insn.i_imm()));
diff --git a/hwacha/insns_ut/ut_flt_d.h b/hwacha/insns_ut/ut_flt_d.h
deleted file mode 120000
index fd77b3b..0000000
--- a/hwacha/insns_ut/ut_flt_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/flt_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_flt_h.h b/hwacha/insns_ut/ut_flt_h.h
deleted file mode 100644
index 39a0393..0000000
--- a/hwacha/insns_ut/ut_flt_h.h
+++ /dev/null
@@ -1,3 +0,0 @@
-require_fp;
-WRITE_RD(f32_lt(HFRS1, HFRS2));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_flt_s.h b/hwacha/insns_ut/ut_flt_s.h
deleted file mode 120000
index 3c665e5..0000000
--- a/hwacha/insns_ut/ut_flt_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/flt_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_flw.h b/hwacha/insns_ut/ut_flw.h
deleted file mode 120000
index 056f569..0000000
--- a/hwacha/insns_ut/ut_flw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/flw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fmadd_d.h b/hwacha/insns_ut/ut_fmadd_d.h
deleted file mode 120000
index 1df086c..0000000
--- a/hwacha/insns_ut/ut_fmadd_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fmadd_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fmadd_h.h b/hwacha/insns_ut/ut_fmadd_h.h
deleted file mode 100644
index cfbd82e..0000000
--- a/hwacha/insns_ut/ut_fmadd_h.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_HFRD(f32_mulAdd(HFRS1, HFRS2, HFRS3));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fmadd_s.h b/hwacha/insns_ut/ut_fmadd_s.h
deleted file mode 120000
index 4283c41..0000000
--- a/hwacha/insns_ut/ut_fmadd_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fmadd_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fmax_d.h b/hwacha/insns_ut/ut_fmax_d.h
deleted file mode 120000
index e095874..0000000
--- a/hwacha/insns_ut/ut_fmax_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fmax_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fmax_h.h b/hwacha/insns_ut/ut_fmax_h.h
deleted file mode 100644
index 32d3aa6..0000000
--- a/hwacha/insns_ut/ut_fmax_h.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-WRITE_HFRD(isNaNF32UI(HFRS2) || f32_le_quiet(HFRS2,HFRS1) /* && FRS1 not NaN */
- ? HFRS1 : HFRS2);
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fmax_s.h b/hwacha/insns_ut/ut_fmax_s.h
deleted file mode 120000
index ec86ec5..0000000
--- a/hwacha/insns_ut/ut_fmax_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fmax_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fmin_d.h b/hwacha/insns_ut/ut_fmin_d.h
deleted file mode 120000
index 3df7a1c..0000000
--- a/hwacha/insns_ut/ut_fmin_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fmin_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fmin_h.h b/hwacha/insns_ut/ut_fmin_h.h
deleted file mode 100644
index a6a7cc3..0000000
--- a/hwacha/insns_ut/ut_fmin_h.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-WRITE_HFRD(isNaNF32UI(HFRS2) || f32_lt_quiet(HFRS1,HFRS2) /* && FRS1 not NaN */
- ? HFRS1 : HFRS2);
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fmin_s.h b/hwacha/insns_ut/ut_fmin_s.h
deleted file mode 120000
index 2950bb6..0000000
--- a/hwacha/insns_ut/ut_fmin_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fmin_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fmovn.h b/hwacha/insns_ut/ut_fmovn.h
deleted file mode 100644
index 6bd5e9d..0000000
--- a/hwacha/insns_ut/ut_fmovn.h
+++ /dev/null
@@ -1 +0,0 @@
-if (RS1 & 0x1) WRITE_FRD(FRS2);
diff --git a/hwacha/insns_ut/ut_fmovz.h b/hwacha/insns_ut/ut_fmovz.h
deleted file mode 100644
index c070d2c..0000000
--- a/hwacha/insns_ut/ut_fmovz.h
+++ /dev/null
@@ -1 +0,0 @@
-if (~RS1 & 0x1) WRITE_FRD(FRS2);
diff --git a/hwacha/insns_ut/ut_fmsub_d.h b/hwacha/insns_ut/ut_fmsub_d.h
deleted file mode 120000
index a1f5ba1..0000000
--- a/hwacha/insns_ut/ut_fmsub_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fmsub_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fmsub_h.h b/hwacha/insns_ut/ut_fmsub_h.h
deleted file mode 100644
index 323a8d0..0000000
--- a/hwacha/insns_ut/ut_fmsub_h.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_HFRD(f32_mulAdd(HFRS1, HFRS2, HFRS3 ^ (uint32_t)INT32_MIN));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fmsub_s.h b/hwacha/insns_ut/ut_fmsub_s.h
deleted file mode 120000
index 1e898cf..0000000
--- a/hwacha/insns_ut/ut_fmsub_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fmsub_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fmul_d.h b/hwacha/insns_ut/ut_fmul_d.h
deleted file mode 120000
index 9147067..0000000
--- a/hwacha/insns_ut/ut_fmul_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fmul_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fmul_h.h b/hwacha/insns_ut/ut_fmul_h.h
deleted file mode 100644
index 669dd0e..0000000
--- a/hwacha/insns_ut/ut_fmul_h.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_HFRD(f32_mulAdd(HFRS1, HFRS2, (HFRS1 ^ HFRS2) & (uint32_t)INT32_MIN));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fmul_s.h b/hwacha/insns_ut/ut_fmul_s.h
deleted file mode 120000
index 7c98e0a..0000000
--- a/hwacha/insns_ut/ut_fmul_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fmul_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fmv_d_x.h b/hwacha/insns_ut/ut_fmv_d_x.h
deleted file mode 120000
index 9e43c93..0000000
--- a/hwacha/insns_ut/ut_fmv_d_x.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fmv_d_x.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fmv_h_x.h b/hwacha/insns_ut/ut_fmv_h_x.h
deleted file mode 100644
index f3eac82..0000000
--- a/hwacha/insns_ut/ut_fmv_h_x.h
+++ /dev/null
@@ -1,2 +0,0 @@
-require_fp;
-WRITE_FRD(RS1);
diff --git a/hwacha/insns_ut/ut_fmv_s_x.h b/hwacha/insns_ut/ut_fmv_s_x.h
deleted file mode 120000
index 4106ef4..0000000
--- a/hwacha/insns_ut/ut_fmv_s_x.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fmv_s_x.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fmv_x_d.h b/hwacha/insns_ut/ut_fmv_x_d.h
deleted file mode 120000
index 6de3157..0000000
--- a/hwacha/insns_ut/ut_fmv_x_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fmv_x_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fmv_x_h.h b/hwacha/insns_ut/ut_fmv_x_h.h
deleted file mode 100644
index d0a84bc..0000000
--- a/hwacha/insns_ut/ut_fmv_x_h.h
+++ /dev/null
@@ -1,2 +0,0 @@
-require_fp;
-WRITE_RD(sext16(FRS1));
diff --git a/hwacha/insns_ut/ut_fmv_x_s.h b/hwacha/insns_ut/ut_fmv_x_s.h
deleted file mode 120000
index 4d26ecc..0000000
--- a/hwacha/insns_ut/ut_fmv_x_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fmv_x_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fnmadd_d.h b/hwacha/insns_ut/ut_fnmadd_d.h
deleted file mode 120000
index 439c088..0000000
--- a/hwacha/insns_ut/ut_fnmadd_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fnmadd_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fnmadd_h.h b/hwacha/insns_ut/ut_fnmadd_h.h
deleted file mode 100644
index f17cd8e..0000000
--- a/hwacha/insns_ut/ut_fnmadd_h.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_HFRD(f32_mulAdd(HFRS1 ^ (uint32_t)INT32_MIN, HFRS2, HFRS3 ^ (uint32_t)INT32_MIN));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fnmadd_s.h b/hwacha/insns_ut/ut_fnmadd_s.h
deleted file mode 120000
index 4b3d954..0000000
--- a/hwacha/insns_ut/ut_fnmadd_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fnmadd_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fnmsub_d.h b/hwacha/insns_ut/ut_fnmsub_d.h
deleted file mode 120000
index 5c33936..0000000
--- a/hwacha/insns_ut/ut_fnmsub_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fnmsub_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fnmsub_h.h b/hwacha/insns_ut/ut_fnmsub_h.h
deleted file mode 100644
index 9a3161a..0000000
--- a/hwacha/insns_ut/ut_fnmsub_h.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_HFRD(f32_mulAdd(HFRS1 ^ (uint32_t)INT32_MIN, HFRS2, HFRS3));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fnmsub_s.h b/hwacha/insns_ut/ut_fnmsub_s.h
deleted file mode 120000
index ffd0f1d..0000000
--- a/hwacha/insns_ut/ut_fnmsub_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fnmsub_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fsd.h b/hwacha/insns_ut/ut_fsd.h
deleted file mode 120000
index 0466f22..0000000
--- a/hwacha/insns_ut/ut_fsd.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fsd.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fsgnj_d.h b/hwacha/insns_ut/ut_fsgnj_d.h
deleted file mode 120000
index 39870ef..0000000
--- a/hwacha/insns_ut/ut_fsgnj_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fsgnj_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fsgnj_h.h b/hwacha/insns_ut/ut_fsgnj_h.h
deleted file mode 100644
index 152d02b..0000000
--- a/hwacha/insns_ut/ut_fsgnj_h.h
+++ /dev/null
@@ -1,2 +0,0 @@
-require_fp;
-WRITE_FRD((FRS1 &~ (uint16_t)INT16_MIN) | (FRS2 & (uint16_t)INT16_MIN));
diff --git a/hwacha/insns_ut/ut_fsgnj_s.h b/hwacha/insns_ut/ut_fsgnj_s.h
deleted file mode 120000
index b187302..0000000
--- a/hwacha/insns_ut/ut_fsgnj_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fsgnj_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fsgnjn_d.h b/hwacha/insns_ut/ut_fsgnjn_d.h
deleted file mode 120000
index 5e5af56..0000000
--- a/hwacha/insns_ut/ut_fsgnjn_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fsgnjn_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fsgnjn_h.h b/hwacha/insns_ut/ut_fsgnjn_h.h
deleted file mode 100644
index b098150..0000000
--- a/hwacha/insns_ut/ut_fsgnjn_h.h
+++ /dev/null
@@ -1,2 +0,0 @@
-require_fp;
-WRITE_FRD((FRS1 &~ (uint32_t)INT32_MIN) | ((~FRS2) & (uint32_t)INT32_MIN));
diff --git a/hwacha/insns_ut/ut_fsgnjn_s.h b/hwacha/insns_ut/ut_fsgnjn_s.h
deleted file mode 120000
index d833f76..0000000
--- a/hwacha/insns_ut/ut_fsgnjn_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fsgnjn_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fsgnjx_d.h b/hwacha/insns_ut/ut_fsgnjx_d.h
deleted file mode 120000
index 6e53ea4..0000000
--- a/hwacha/insns_ut/ut_fsgnjx_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fsgnjx_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fsgnjx_h.h b/hwacha/insns_ut/ut_fsgnjx_h.h
deleted file mode 100644
index 2b6d7ac..0000000
--- a/hwacha/insns_ut/ut_fsgnjx_h.h
+++ /dev/null
@@ -1,2 +0,0 @@
-require_fp;
-WRITE_FRD(FRS1 ^ (FRS2 & (uint16_t)INT16_MIN));
diff --git a/hwacha/insns_ut/ut_fsgnjx_s.h b/hwacha/insns_ut/ut_fsgnjx_s.h
deleted file mode 120000
index 6792056..0000000
--- a/hwacha/insns_ut/ut_fsgnjx_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fsgnjx_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fsh.h b/hwacha/insns_ut/ut_fsh.h
deleted file mode 100644
index 945d3e3..0000000
--- a/hwacha/insns_ut/ut_fsh.h
+++ /dev/null
@@ -1,2 +0,0 @@
-require_fp;
-MMU.store_uint16(RS1 + insn.s_imm(), FRS2);
diff --git a/hwacha/insns_ut/ut_fsqrt_d.h b/hwacha/insns_ut/ut_fsqrt_d.h
deleted file mode 120000
index 72bfaf4..0000000
--- a/hwacha/insns_ut/ut_fsqrt_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fsqrt_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fsqrt_h.h b/hwacha/insns_ut/ut_fsqrt_h.h
deleted file mode 100644
index f8b83fb..0000000
--- a/hwacha/insns_ut/ut_fsqrt_h.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_HFRD(f32_sqrt(HFRS1));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fsqrt_s.h b/hwacha/insns_ut/ut_fsqrt_s.h
deleted file mode 120000
index 36eca16..0000000
--- a/hwacha/insns_ut/ut_fsqrt_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fsqrt_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fsub_d.h b/hwacha/insns_ut/ut_fsub_d.h
deleted file mode 120000
index 098fad0..0000000
--- a/hwacha/insns_ut/ut_fsub_d.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fsub_d.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fsub_h.h b/hwacha/insns_ut/ut_fsub_h.h
deleted file mode 100644
index 39cebbe..0000000
--- a/hwacha/insns_ut/ut_fsub_h.h
+++ /dev/null
@@ -1,4 +0,0 @@
-require_fp;
-softfloat_roundingMode = RM;
-WRITE_HFRD(f32_mulAdd(HFRS1, 0x3f800000, HFRS2 ^ (uint32_t)INT32_MIN));
-set_fp_exceptions;
diff --git a/hwacha/insns_ut/ut_fsub_s.h b/hwacha/insns_ut/ut_fsub_s.h
deleted file mode 120000
index 6b01668..0000000
--- a/hwacha/insns_ut/ut_fsub_s.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fsub_s.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_fsw.h b/hwacha/insns_ut/ut_fsw.h
deleted file mode 120000
index 0079240..0000000
--- a/hwacha/insns_ut/ut_fsw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/fsw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_lb.h b/hwacha/insns_ut/ut_lb.h
deleted file mode 120000
index 0b0d8ef..0000000
--- a/hwacha/insns_ut/ut_lb.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/lb.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_lbu.h b/hwacha/insns_ut/ut_lbu.h
deleted file mode 120000
index 857c658..0000000
--- a/hwacha/insns_ut/ut_lbu.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/lbu.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_ld.h b/hwacha/insns_ut/ut_ld.h
deleted file mode 120000
index 6da0f61..0000000
--- a/hwacha/insns_ut/ut_ld.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/ld.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_lh.h b/hwacha/insns_ut/ut_lh.h
deleted file mode 120000
index c12eb1d..0000000
--- a/hwacha/insns_ut/ut_lh.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/lh.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_lhu.h b/hwacha/insns_ut/ut_lhu.h
deleted file mode 120000
index 1bde33f..0000000
--- a/hwacha/insns_ut/ut_lhu.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/lhu.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_lui.h b/hwacha/insns_ut/ut_lui.h
deleted file mode 120000
index 723da3d..0000000
--- a/hwacha/insns_ut/ut_lui.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/lui.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_lw.h b/hwacha/insns_ut/ut_lw.h
deleted file mode 120000
index 05d6159..0000000
--- a/hwacha/insns_ut/ut_lw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/lw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_lwu.h b/hwacha/insns_ut/ut_lwu.h
deleted file mode 120000
index 4f446ae..0000000
--- a/hwacha/insns_ut/ut_lwu.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/lwu.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_movn.h b/hwacha/insns_ut/ut_movn.h
deleted file mode 100644
index 90a6cd9..0000000
--- a/hwacha/insns_ut/ut_movn.h
+++ /dev/null
@@ -1 +0,0 @@
-if (RS1 & 0x1) WRITE_RD(RS2);
diff --git a/hwacha/insns_ut/ut_movz.h b/hwacha/insns_ut/ut_movz.h
deleted file mode 100644
index ce14162..0000000
--- a/hwacha/insns_ut/ut_movz.h
+++ /dev/null
@@ -1 +0,0 @@
-if (~RS1 & 0x1) WRITE_RD(RS2);
diff --git a/hwacha/insns_ut/ut_mul.h b/hwacha/insns_ut/ut_mul.h
deleted file mode 120000
index 8b0ef35..0000000
--- a/hwacha/insns_ut/ut_mul.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/mul.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_mulh.h b/hwacha/insns_ut/ut_mulh.h
deleted file mode 120000
index b631d76..0000000
--- a/hwacha/insns_ut/ut_mulh.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/mulh.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_mulhsu.h b/hwacha/insns_ut/ut_mulhsu.h
deleted file mode 120000
index 50db4ea..0000000
--- a/hwacha/insns_ut/ut_mulhsu.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/mulhsu.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_mulhu.h b/hwacha/insns_ut/ut_mulhu.h
deleted file mode 120000
index 0551583..0000000
--- a/hwacha/insns_ut/ut_mulhu.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/mulhu.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_mulw.h b/hwacha/insns_ut/ut_mulw.h
deleted file mode 120000
index e23b6dd..0000000
--- a/hwacha/insns_ut/ut_mulw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/mulw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_or.h b/hwacha/insns_ut/ut_or.h
deleted file mode 120000
index ec31003..0000000
--- a/hwacha/insns_ut/ut_or.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/or.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_ori.h b/hwacha/insns_ut/ut_ori.h
deleted file mode 120000
index c816d3a..0000000
--- a/hwacha/insns_ut/ut_ori.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/ori.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_rem.h b/hwacha/insns_ut/ut_rem.h
deleted file mode 120000
index 6ecd10d..0000000
--- a/hwacha/insns_ut/ut_rem.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/rem.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_remu.h b/hwacha/insns_ut/ut_remu.h
deleted file mode 120000
index a211846..0000000
--- a/hwacha/insns_ut/ut_remu.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/remu.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_remuw.h b/hwacha/insns_ut/ut_remuw.h
deleted file mode 120000
index 62d0679..0000000
--- a/hwacha/insns_ut/ut_remuw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/remuw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_remw.h b/hwacha/insns_ut/ut_remw.h
deleted file mode 120000
index af976fa..0000000
--- a/hwacha/insns_ut/ut_remw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/remw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_sb.h b/hwacha/insns_ut/ut_sb.h
deleted file mode 120000
index a86f0b1..0000000
--- a/hwacha/insns_ut/ut_sb.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/sb.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_sd.h b/hwacha/insns_ut/ut_sd.h
deleted file mode 120000
index 3b7e0af..0000000
--- a/hwacha/insns_ut/ut_sd.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/sd.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_sh.h b/hwacha/insns_ut/ut_sh.h
deleted file mode 120000
index db646db..0000000
--- a/hwacha/insns_ut/ut_sh.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/sh.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_sll.h b/hwacha/insns_ut/ut_sll.h
deleted file mode 120000
index ef52f87..0000000
--- a/hwacha/insns_ut/ut_sll.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/sll.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_slli.h b/hwacha/insns_ut/ut_slli.h
deleted file mode 120000
index 31e63d4..0000000
--- a/hwacha/insns_ut/ut_slli.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/slli.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_slliw.h b/hwacha/insns_ut/ut_slliw.h
deleted file mode 120000
index 62565f3..0000000
--- a/hwacha/insns_ut/ut_slliw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/slliw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_sllw.h b/hwacha/insns_ut/ut_sllw.h
deleted file mode 120000
index 0977579..0000000
--- a/hwacha/insns_ut/ut_sllw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/sllw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_slt.h b/hwacha/insns_ut/ut_slt.h
deleted file mode 120000
index 5b36a82..0000000
--- a/hwacha/insns_ut/ut_slt.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/slt.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_slti.h b/hwacha/insns_ut/ut_slti.h
deleted file mode 120000
index a5eda3b..0000000
--- a/hwacha/insns_ut/ut_slti.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/slti.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_sltiu.h b/hwacha/insns_ut/ut_sltiu.h
deleted file mode 120000
index 5ce2315..0000000
--- a/hwacha/insns_ut/ut_sltiu.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/sltiu.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_sltu.h b/hwacha/insns_ut/ut_sltu.h
deleted file mode 120000
index 0d42166..0000000
--- a/hwacha/insns_ut/ut_sltu.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/sltu.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_sra.h b/hwacha/insns_ut/ut_sra.h
deleted file mode 120000
index ff64ebb..0000000
--- a/hwacha/insns_ut/ut_sra.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/sra.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_srai.h b/hwacha/insns_ut/ut_srai.h
deleted file mode 120000
index 458c697..0000000
--- a/hwacha/insns_ut/ut_srai.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/srai.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_sraiw.h b/hwacha/insns_ut/ut_sraiw.h
deleted file mode 120000
index 652cc61..0000000
--- a/hwacha/insns_ut/ut_sraiw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/sraiw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_sraw.h b/hwacha/insns_ut/ut_sraw.h
deleted file mode 120000
index b1f279f..0000000
--- a/hwacha/insns_ut/ut_sraw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/sraw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_srl.h b/hwacha/insns_ut/ut_srl.h
deleted file mode 120000
index 0b7119c..0000000
--- a/hwacha/insns_ut/ut_srl.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/srl.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_srli.h b/hwacha/insns_ut/ut_srli.h
deleted file mode 120000
index 477d500..0000000
--- a/hwacha/insns_ut/ut_srli.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/srli.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_srliw.h b/hwacha/insns_ut/ut_srliw.h
deleted file mode 120000
index 0bf24cb..0000000
--- a/hwacha/insns_ut/ut_srliw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/srliw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_srlw.h b/hwacha/insns_ut/ut_srlw.h
deleted file mode 120000
index 000c061..0000000
--- a/hwacha/insns_ut/ut_srlw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/srlw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_stop.h b/hwacha/insns_ut/ut_stop.h
deleted file mode 100644
index c8656cf..0000000
--- a/hwacha/insns_ut/ut_stop.h
+++ /dev/null
@@ -1 +0,0 @@
-h->get_ut_state(UTIDX)->run = false;
diff --git a/hwacha/insns_ut/ut_sub.h b/hwacha/insns_ut/ut_sub.h
deleted file mode 120000
index 9fcae83..0000000
--- a/hwacha/insns_ut/ut_sub.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/sub.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_subw.h b/hwacha/insns_ut/ut_subw.h
deleted file mode 120000
index c6da9f7..0000000
--- a/hwacha/insns_ut/ut_subw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/subw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_sw.h b/hwacha/insns_ut/ut_sw.h
deleted file mode 120000
index 15db598..0000000
--- a/hwacha/insns_ut/ut_sw.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/sw.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_utidx.h b/hwacha/insns_ut/ut_utidx.h
deleted file mode 100644
index f7ee7f8..0000000
--- a/hwacha/insns_ut/ut_utidx.h
+++ /dev/null
@@ -1 +0,0 @@
-WRITE_RD(UTIDX);
diff --git a/hwacha/insns_ut/ut_xor.h b/hwacha/insns_ut/ut_xor.h
deleted file mode 120000
index f112aff..0000000
--- a/hwacha/insns_ut/ut_xor.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/xor.h \ No newline at end of file
diff --git a/hwacha/insns_ut/ut_xori.h b/hwacha/insns_ut/ut_xori.h
deleted file mode 120000
index fc9d643..0000000
--- a/hwacha/insns_ut/ut_xori.h
+++ /dev/null
@@ -1 +0,0 @@
-../../riscv/insns/xori.h \ No newline at end of file
diff --git a/hwacha/opcodes_hwacha.h b/hwacha/opcodes_hwacha.h
deleted file mode 100644
index d0eb1ee..0000000
--- a/hwacha/opcodes_hwacha.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "encodings_hwacha.h"
-
-DECLARE_INSN(vf, MATCH_VF, MASK_VF)
-DECLARE_INSN(vflsegd, MATCH_VFLSEGD, MASK_VFLSEGD)
-DECLARE_INSN(vflsegstd, MATCH_VFLSEGSTD, MASK_VFLSEGSTD)
-DECLARE_INSN(vflsegstw, MATCH_VFLSEGSTW, MASK_VFLSEGSTW)
-DECLARE_INSN(vflsegw, MATCH_VFLSEGW, MASK_VFLSEGW)
-DECLARE_INSN(vfmsv_d, MATCH_VFMSV_D, MASK_VFMSV_D)
-DECLARE_INSN(vfmsv_s, MATCH_VFMSV_S, MASK_VFMSV_S)
-DECLARE_INSN(vfmvv, MATCH_VFMVV, MASK_VFMVV)
-DECLARE_INSN(vfssegd, MATCH_VFSSEGD, MASK_VFSSEGD)
-DECLARE_INSN(vfssegstd, MATCH_VFSSEGSTD, MASK_VFSSEGSTD)
-DECLARE_INSN(vfssegstw, MATCH_VFSSEGSTW, MASK_VFSSEGSTW)
-DECLARE_INSN(vfssegw, MATCH_VFSSEGW, MASK_VFSSEGW)
-DECLARE_INSN(vgetcfg, MATCH_VGETCFG, MASK_VGETCFG)
-DECLARE_INSN(vgetvl, MATCH_VGETVL, MASK_VGETVL)
-DECLARE_INSN(vlsegb, MATCH_VLSEGB, MASK_VLSEGB)
-DECLARE_INSN(vlsegbu, MATCH_VLSEGBU, MASK_VLSEGBU)
-DECLARE_INSN(vlsegd, MATCH_VLSEGD, MASK_VLSEGD)
-DECLARE_INSN(vlsegh, MATCH_VLSEGH, MASK_VLSEGH)
-DECLARE_INSN(vlseghu, MATCH_VLSEGHU, MASK_VLSEGHU)
-DECLARE_INSN(vlsegstb, MATCH_VLSEGSTB, MASK_VLSEGSTB)
-DECLARE_INSN(vlsegstbu, MATCH_VLSEGSTBU, MASK_VLSEGSTBU)
-DECLARE_INSN(vlsegstd, MATCH_VLSEGSTD, MASK_VLSEGSTD)
-DECLARE_INSN(vlsegsth, MATCH_VLSEGSTH, MASK_VLSEGSTH)
-DECLARE_INSN(vlsegsthu, MATCH_VLSEGSTHU, MASK_VLSEGSTHU)
-DECLARE_INSN(vlsegstw, MATCH_VLSEGSTW, MASK_VLSEGSTW)
-DECLARE_INSN(vlsegstwu, MATCH_VLSEGSTWU, MASK_VLSEGSTWU)
-DECLARE_INSN(vlsegw, MATCH_VLSEGW, MASK_VLSEGW)
-DECLARE_INSN(vlsegwu, MATCH_VLSEGWU, MASK_VLSEGWU)
-DECLARE_INSN(vmsv, MATCH_VMSV, MASK_VMSV)
-DECLARE_INSN(vmvv, MATCH_VMVV, MASK_VMVV)
-DECLARE_INSN(vsetcfg, MATCH_VSETCFG, MASK_VSETCFG)
-DECLARE_INSN(vsetvl, MATCH_VSETVL, MASK_VSETVL)
-DECLARE_INSN(vssegb, MATCH_VSSEGB, MASK_VSSEGB)
-DECLARE_INSN(vssegd, MATCH_VSSEGD, MASK_VSSEGD)
-DECLARE_INSN(vssegh, MATCH_VSSEGH, MASK_VSSEGH)
-DECLARE_INSN(vssegstb, MATCH_VSSEGSTB, MASK_VSSEGSTB)
-DECLARE_INSN(vssegstd, MATCH_VSSEGSTD, MASK_VSSEGSTD)
-DECLARE_INSN(vssegsth, MATCH_VSSEGSTH, MASK_VSSEGSTH)
-DECLARE_INSN(vssegstw, MATCH_VSSEGSTW, MASK_VSSEGSTW)
-DECLARE_INSN(vssegw, MATCH_VSSEGW, MASK_VSSEGW)
-DECLARE_INSN(vxcptaux, MATCH_VXCPTAUX, MASK_VXCPTAUX)
-DECLARE_INSN(vxcptcause, MATCH_VXCPTCAUSE, MASK_VXCPTCAUSE)
-DECLARE_INSN(vxcptevac, MATCH_VXCPTEVAC, MASK_VXCPTEVAC)
-DECLARE_INSN(vxcpthold, MATCH_VXCPTHOLD, MASK_VXCPTHOLD)
-DECLARE_INSN(vxcptkill, MATCH_VXCPTKILL, MASK_VXCPTKILL)
diff --git a/hwacha/opcodes_hwacha_ut.h b/hwacha/opcodes_hwacha_ut.h
deleted file mode 100644
index 6a8c326..0000000
--- a/hwacha/opcodes_hwacha_ut.h
+++ /dev/null
@@ -1,174 +0,0 @@
-DECLARE_INSN(ut_add, 0x33, 0xfe00707f)
-DECLARE_INSN(ut_addi, 0x13, 0x707f)
-DECLARE_INSN(ut_addiw, 0x1b, 0x707f)
-DECLARE_INSN(ut_addw, 0x3b, 0xfe00707f)
-DECLARE_INSN(ut_amoadd_d, 0x302f, 0xf800707f)
-DECLARE_INSN(ut_amoadd_w, 0x202f, 0xf800707f)
-DECLARE_INSN(ut_amoand_d, 0x6000302f, 0xf800707f)
-DECLARE_INSN(ut_amoand_w, 0x6000202f, 0xf800707f)
-DECLARE_INSN(ut_amomax_d, 0xa000302f, 0xf800707f)
-DECLARE_INSN(ut_amomaxu_d, 0xe000302f, 0xf800707f)
-DECLARE_INSN(ut_amomaxu_w, 0xe000202f, 0xf800707f)
-DECLARE_INSN(ut_amomax_w, 0xa000202f, 0xf800707f)
-DECLARE_INSN(ut_amomin_d, 0x8000302f, 0xf800707f)
-DECLARE_INSN(ut_amominu_d, 0xc000302f, 0xf800707f)
-DECLARE_INSN(ut_amominu_w, 0xc000202f, 0xf800707f)
-DECLARE_INSN(ut_amomin_w, 0x8000202f, 0xf800707f)
-DECLARE_INSN(ut_amoor_d, 0x4000302f, 0xf800707f)
-DECLARE_INSN(ut_amoor_w, 0x4000202f, 0xf800707f)
-DECLARE_INSN(ut_amoswap_d, 0x800302f, 0xf800707f)
-DECLARE_INSN(ut_amoswap_w, 0x800202f, 0xf800707f)
-DECLARE_INSN(ut_amoxor_d, 0x2000302f, 0xf800707f)
-DECLARE_INSN(ut_amoxor_w, 0x2000202f, 0xf800707f)
-DECLARE_INSN(ut_and, 0x7033, 0xfe00707f)
-DECLARE_INSN(ut_andi, 0x7013, 0x707f)
-DECLARE_INSN(ut_auipc, 0x17, 0x7f)
-DECLARE_INSN(ut_div, 0x2004033, 0xfe00707f)
-DECLARE_INSN(ut_divu, 0x2005033, 0xfe00707f)
-DECLARE_INSN(ut_divuw, 0x200503b, 0xfe00707f)
-DECLARE_INSN(ut_divw, 0x200403b, 0xfe00707f)
-DECLARE_INSN(ut_fadd_d, 0x2000053, 0xfe00007f)
-DECLARE_INSN(ut_fadd_h, 0x4000053, 0xfe00007f)
-DECLARE_INSN(ut_fadd_s, 0x53, 0xfe00007f)
-DECLARE_INSN(ut_fclass_d, 0xe2001053, 0xfff0707f)
-DECLARE_INSN(ut_fclass_s, 0xe0001053, 0xfff0707f)
-DECLARE_INSN(ut_fcvt_d_h, 0x8c000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_d_l, 0xd2200053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_d_lu, 0xd2300053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_d_s, 0x42000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_d_w, 0xd2000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_d_wu, 0xd2100053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_h_d, 0x92000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_h_l, 0x64000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_h_lu, 0x6c000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_h_s, 0x90000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_h_w, 0x74000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_h_wu, 0x7c000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_l_d, 0xc2200053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_l_h, 0x44000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_l_s, 0xc0200053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_lu_d, 0xc2300053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_lu_h, 0x4c000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_lu_s, 0xc0300053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_s_d, 0x40100053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_s_h, 0x84000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_s_l, 0xd0200053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_s_lu, 0xd0300053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_s_w, 0xd0000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_s_wu, 0xd0100053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_w_d, 0xc2000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_w_h, 0x54000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_w_s, 0xc0000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_wu_d, 0xc2100053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_wu_h, 0x5c000053, 0xfff0007f)
-DECLARE_INSN(ut_fcvt_wu_s, 0xc0100053, 0xfff0007f)
-DECLARE_INSN(ut_fdiv_d, 0x1a000053, 0xfe00007f)
-DECLARE_INSN(ut_fdiv_h, 0x1c000053, 0xfe00007f)
-DECLARE_INSN(ut_fdiv_s, 0x18000053, 0xfe00007f)
-DECLARE_INSN(ut_fence, 0xf, 0x707f)
-DECLARE_INSN(ut_feq_d, 0xa2002053, 0xfe00707f)
-DECLARE_INSN(ut_feq_h, 0xac000053, 0xfe00707f)
-DECLARE_INSN(ut_feq_s, 0xa0002053, 0xfe00707f)
-DECLARE_INSN(ut_fld, 0x3007, 0x707f)
-DECLARE_INSN(ut_fle_d, 0xa2000053, 0xfe00707f)
-DECLARE_INSN(ut_fle_h, 0xbc000053, 0xfe00707f)
-DECLARE_INSN(ut_fle_s, 0xa0000053, 0xfe00707f)
-DECLARE_INSN(ut_flh, 0x1007, 0x707f)
-DECLARE_INSN(ut_flt_d, 0xa2001053, 0xfe00707f)
-DECLARE_INSN(ut_flt_h, 0xb4000053, 0xfe00707f)
-DECLARE_INSN(ut_flt_s, 0xa0001053, 0xfe00707f)
-DECLARE_INSN(ut_flw, 0x2007, 0x707f)
-DECLARE_INSN(ut_fmadd_d, 0x2000043, 0x600007f)
-DECLARE_INSN(ut_fmadd_h, 0x4000043, 0x600007f)
-DECLARE_INSN(ut_fmadd_s, 0x43, 0x600007f)
-DECLARE_INSN(ut_fmax_d, 0x2a001053, 0xfe00707f)
-DECLARE_INSN(ut_fmax_h, 0xcc000053, 0xfe00707f)
-DECLARE_INSN(ut_fmax_s, 0x28001053, 0xfe00707f)
-DECLARE_INSN(ut_fmin_d, 0x2a000053, 0xfe00707f)
-DECLARE_INSN(ut_fmin_h, 0xc4000053, 0xfe00707f)
-DECLARE_INSN(ut_fmin_s, 0x28000053, 0xfe00707f)
-DECLARE_INSN(ut_fmovn, 0x6007077, 0xfe00707f)
-DECLARE_INSN(ut_fmovz, 0x4007077, 0xfe00707f)
-DECLARE_INSN(ut_fmsub_d, 0x2000047, 0x600007f)
-DECLARE_INSN(ut_fmsub_h, 0x4000047, 0x600007f)
-DECLARE_INSN(ut_fmsub_s, 0x47, 0x600007f)
-DECLARE_INSN(ut_fmul_d, 0x12000053, 0xfe00007f)
-DECLARE_INSN(ut_fmul_h, 0x14000053, 0xfe00007f)
-DECLARE_INSN(ut_fmul_s, 0x10000053, 0xfe00007f)
-DECLARE_INSN(ut_fmv_d_x, 0xf2000053, 0xfff0707f)
-DECLARE_INSN(ut_fmv_h_x, 0xf4000053, 0xfff0707f)
-DECLARE_INSN(ut_fmv_s_x, 0xf0000053, 0xfff0707f)
-DECLARE_INSN(ut_fmv_x_d, 0xe2000053, 0xfff0707f)
-DECLARE_INSN(ut_fmv_x_h, 0xe4000053, 0xfff0707f)
-DECLARE_INSN(ut_fmv_x_s, 0xe0000053, 0xfff0707f)
-DECLARE_INSN(ut_fnmadd_d, 0x200004f, 0x600007f)
-DECLARE_INSN(ut_fnmadd_h, 0x400004f, 0x600007f)
-DECLARE_INSN(ut_fnmadd_s, 0x4f, 0x600007f)
-DECLARE_INSN(ut_fnmsub_d, 0x200004b, 0x600007f)
-DECLARE_INSN(ut_fnmsub_h, 0x400004b, 0x600007f)
-DECLARE_INSN(ut_fnmsub_s, 0x4b, 0x600007f)
-DECLARE_INSN(ut_fsd, 0x3027, 0x707f)
-DECLARE_INSN(ut_fsgnj_d, 0x22000053, 0xfe00707f)
-DECLARE_INSN(ut_fsgnj_h, 0x2c000053, 0xfe00707f)
-DECLARE_INSN(ut_fsgnjn_d, 0x22001053, 0xfe00707f)
-DECLARE_INSN(ut_fsgnjn_h, 0x34000053, 0xfe00707f)
-DECLARE_INSN(ut_fsgnjn_s, 0x20001053, 0xfe00707f)
-DECLARE_INSN(ut_fsgnj_s, 0x20000053, 0xfe00707f)
-DECLARE_INSN(ut_fsgnjx_d, 0x22002053, 0xfe00707f)
-DECLARE_INSN(ut_fsgnjx_h, 0x3c000053, 0xfe00707f)
-DECLARE_INSN(ut_fsgnjx_s, 0x20002053, 0xfe00707f)
-DECLARE_INSN(ut_fsh, 0x1027, 0x707f)
-DECLARE_INSN(ut_fsqrt_d, 0x5a000053, 0xfff0007f)
-DECLARE_INSN(ut_fsqrt_h, 0x24000053, 0xfff0007f)
-DECLARE_INSN(ut_fsqrt_s, 0x58000053, 0xfff0007f)
-DECLARE_INSN(ut_fsub_d, 0xa000053, 0xfe00007f)
-DECLARE_INSN(ut_fsub_h, 0xc000053, 0xfe00007f)
-DECLARE_INSN(ut_fsub_s, 0x8000053, 0xfe00007f)
-DECLARE_INSN(ut_fsw, 0x2027, 0x707f)
-DECLARE_INSN(ut_lb, 0x3, 0x707f)
-DECLARE_INSN(ut_lbu, 0x4003, 0x707f)
-DECLARE_INSN(ut_ld, 0x3003, 0x707f)
-DECLARE_INSN(ut_lh, 0x1003, 0x707f)
-DECLARE_INSN(ut_lhu, 0x5003, 0x707f)
-DECLARE_INSN(ut_lui, 0x37, 0x7f)
-DECLARE_INSN(ut_lw, 0x2003, 0x707f)
-DECLARE_INSN(ut_lwu, 0x6003, 0x707f)
-DECLARE_INSN(ut_movn, 0x2007077, 0xfe00707f)
-DECLARE_INSN(ut_movz, 0x7077, 0xfe00707f)
-DECLARE_INSN(ut_mul, 0x2000033, 0xfe00707f)
-DECLARE_INSN(ut_mulh, 0x2001033, 0xfe00707f)
-DECLARE_INSN(ut_mulhsu, 0x2002033, 0xfe00707f)
-DECLARE_INSN(ut_mulhu, 0x2003033, 0xfe00707f)
-DECLARE_INSN(ut_mulw, 0x200003b, 0xfe00707f)
-DECLARE_INSN(ut_or, 0x6033, 0xfe00707f)
-DECLARE_INSN(ut_ori, 0x6013, 0x707f)
-DECLARE_INSN(ut_rem, 0x2006033, 0xfe00707f)
-DECLARE_INSN(ut_remu, 0x2007033, 0xfe00707f)
-DECLARE_INSN(ut_remuw, 0x200703b, 0xfe00707f)
-DECLARE_INSN(ut_remw, 0x200603b, 0xfe00707f)
-DECLARE_INSN(ut_sb, 0x23, 0x707f)
-DECLARE_INSN(ut_sd, 0x3023, 0x707f)
-DECLARE_INSN(ut_sh, 0x1023, 0x707f)
-DECLARE_INSN(ut_sll, 0x1033, 0xfe00707f)
-DECLARE_INSN(ut_slli, 0x1013, 0xfc00707f)
-DECLARE_INSN(ut_slliw, 0x101b, 0xfe00707f)
-DECLARE_INSN(ut_sllw, 0x103b, 0xfe00707f)
-DECLARE_INSN(ut_slt, 0x2033, 0xfe00707f)
-DECLARE_INSN(ut_slti, 0x2013, 0x707f)
-DECLARE_INSN(ut_sltiu, 0x3013, 0x707f)
-DECLARE_INSN(ut_sltu, 0x3033, 0xfe00707f)
-DECLARE_INSN(ut_sra, 0x40005033, 0xfe00707f)
-DECLARE_INSN(ut_srai, 0x40005013, 0xfc00707f)
-DECLARE_INSN(ut_sraiw, 0x4000501b, 0xfe00707f)
-DECLARE_INSN(ut_sraw, 0x4000503b, 0xfe00707f)
-DECLARE_INSN(ut_srl, 0x5033, 0xfe00707f)
-DECLARE_INSN(ut_srli, 0x5013, 0xfc00707f)
-DECLARE_INSN(ut_srliw, 0x501b, 0xfe00707f)
-DECLARE_INSN(ut_srlw, 0x503b, 0xfe00707f)
-DECLARE_INSN(ut_stop, 0x5077, 0xffffffff)
-DECLARE_INSN(ut_sub, 0x40000033, 0xfe00707f)
-DECLARE_INSN(ut_subw, 0x4000003b, 0xfe00707f)
-DECLARE_INSN(ut_sw, 0x2023, 0x707f)
-DECLARE_INSN(ut_utidx, 0x6077, 0xfffff07f)
-DECLARE_INSN(ut_xor, 0x4033, 0xfe00707f)
-DECLARE_INSN(ut_xori, 0x4013, 0x707f)
diff --git a/riscv-hwacha.pc.in b/riscv-hwacha.pc.in
deleted file mode 100644
index cad4e29..0000000
--- a/riscv-hwacha.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@prefix@
-libdir=${prefix}/@libdir@
-includedir=${prefix}/@includedir@
-
-Name: riscv-hwacha
-Description: RISC-V Hwacha binary library
-Version: git
-Libs: -Wl,-rpath,${libdir} -L${libdir} -lhwacha
-Cflags: -I${includedir}
-URL: http://riscv.org/download.html#tab_spike
diff --git a/riscv-spike.pc.in b/riscv-spike.pc.in
index ee2ab99..007ad39 100644
--- a/riscv-spike.pc.in
+++ b/riscv-spike.pc.in
@@ -6,5 +6,5 @@ includedir=${prefix}/@includedir@
Name: riscv-spike
Description: RISC-V spike meta library
Version: git
-Depends: riscv-spike_main riscv-riscv riscv-hwacha riscv-softfloat
+Depends: riscv-spike_main riscv-riscv riscv-softfloat
URL: http://riscv.org/download.html#tab_spike
diff --git a/riscv-spike_main.pc.in b/riscv-spike_main.pc.in
index 14a6f65..c9b0ecc 100644
--- a/riscv-spike_main.pc.in
+++ b/riscv-spike_main.pc.in
@@ -6,7 +6,7 @@ includedir=${prefix}/@includedir@
Name: riscv-spike_main
Description: RISC-V ISA simulator library
Version: git
-Depends: riscv-riscv riscv-hwacha riscv-softfloat
+Depends: riscv-riscv riscv-softfloat
Libs: -Wl,-rpath,${libdir} -L${libdir} -lspike_main
Cflags: -I${includedir}
URL: http://riscv.org/download.html#tab_spike