redirect sreg_t casts through function

diff --git a/riscv/insns/auipc.h b/riscv/insns/auipc.h
index 1a2b169b59a4b46ecb2976bb7ae427ae0fe49c48..0169786f2029ba5d442ef69b991580875f7a7763 100644 (file)
--- a/riscv/insns/auipc.h
+++ b/riscv/insns/auipc.h
@@ -1 +1 @@
-WRITE_RD(sext_xlen(insn.u_imm() + pc));
+WRITE_RD(sext_xlen(rv_add(insn.u_imm(), pc)));

diff --git a/riscv/insns/bge.h b/riscv/insns/bge.h
index 8cd7e318c49d79a17981afdde54badd225b2a7e4..dd8969f6c4b9e66b5beb75a31ba2fa3b8504ba87 100644 (file)
--- a/riscv/insns/bge.h
+++ b/riscv/insns/bge.h
@@ -1,2 +1,2 @@
-if(rv_ge(sreg_t(RS1), sreg_t(RS2)))
+if(rv_ge(sv_reg_to_sreg(RS1), sv_reg_to_sreg(RS2)))
   set_pc(BRANCH_TARGET);

diff --git a/riscv/insns/blt.h b/riscv/insns/blt.h
index 85b0be61fd95f933cb12119ff3db9b841e085da5..9e8d1c37a5f1d7252cc70995edb9103054213318 100644 (file)
--- a/riscv/insns/blt.h
+++ b/riscv/insns/blt.h
@@ -1,2 +1,2 @@
-if(rv_lt(sreg_t(RS1), sreg_t(RS2)))
+if(rv_lt(sv_reg_to_sreg(RS1), sv_reg_to_sreg(RS2)))
   set_pc(BRANCH_TARGET);