@@ -1421,6 +1421,31 @@ float64_math (SIM_CPU *cpu, int rd, int rs1, int rs2, int rs3, int rm,
frd_name, frs1_name, frs2_name, frs3_name, rm);
result = -((a * b) + c);
break;
+ case FADD:
+ TRACE_INSN (cpu, "fadd.d %s, %s, %s, rm=%d;",
+ frd_name, frs1_name, frs2_name, rm);
+ result = a + b;
+ break;
+ case FSUB:
+ TRACE_INSN (cpu, "fsub.d %s, %s, %s, rm=%d;",
+ frd_name, frs1_name, frs2_name, rm);
+ result = a - b;
+ break;
+ case FMUL:
+ TRACE_INSN (cpu, "fmul.d %s, %s, %s, rm=%d;",
+ frd_name, frs1_name, frs2_name, rm);
+ result = a * b;
+ break;
+ case FDIV:
+ TRACE_INSN (cpu, "fdiv.d %s, %s, %s, rm=%d;",
+ frd_name, frs1_name, frs2_name, rm);
+ result = a / b;
+ break;
+ case FSQRT:
+ TRACE_INSN (cpu, "fsqrt.d %s, %s, rm=%d;",
+ frd_name, frs1_name, rm);
+ result = sqrtf (a);
+ break;
}
if (rm == RMM)
@@ -1840,6 +1865,26 @@ execute_d (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op)
case MATCH_FNMSUB_D | MASK_RM:
float64_math (cpu, rd, rs1, rs2, rs3, rm, FNMSUB);
break;
+ case MATCH_FADD_D:
+ case MATCH_FADD_D | MASK_RM:
+ float64_math (cpu, rd, rs1, rs2, 0, rm, FADD);
+ break;
+ case MATCH_FSUB_D:
+ case MATCH_FSUB_D | MASK_RM:
+ float64_math (cpu, rd, rs1, rs2, 0, rm, FSUB);
+ break;
+ case MATCH_FMUL_D:
+ case MATCH_FMUL_D | MASK_RM:
+ float64_math (cpu, rd, rs1, rs2, 0, rm, FMUL);
+ break;
+ case MATCH_FDIV_D:
+ case MATCH_FDIV_D | MASK_RM:
+ float64_math (cpu, rd, rs1, rs2, 0, rm, FDIV);
+ break;
+ case MATCH_FSQRT_D:
+ case MATCH_FSQRT_D | MASK_RM:
+ float64_math (cpu, rd, rs1, rs2, 0, rm, FSQRT);
+ break;
default:
TRACE_INSN (cpu, "UNHANDLED INSN: %s", op->name);
sim_engine_halt (sd, cpu, NULL, riscv_cpu->pc, sim_signalled, SIM_SIGILL);
@@ -11,9 +11,16 @@
_arg1:
.double -12.5
+ .double 1.5
+ .double 2.2
+ .double 18.5
+ .double 5.0
_arg2:
.double 2.5
+ .double 0.5
+ .double 1.1
+ .double 0.1
_arg3:
.double 7.45
@@ -23,6 +30,11 @@ _result:
.double 38.7000008
.double -38.7000008
.double 23.7999992
+ .double 2.0
+ .double 1.1
+ .double 1.85
+ .double 185
+ .double 2.2360680103302002
start
.option push
@@ -70,6 +82,44 @@ _result:
feq.d a5,fa4,fa4
bne a5,a4,test_fail
+ # Test fadd instruction.
+ fld fa0,8(a0)
+ fld fa1,8(a1)
+ fld fa2,32(a3)
+ fadd.d fa4,fa0,fa1,rne
+ feq.d a5,fa4,fa2
+ bne a5,a4,test_fail
+
+ # Test fsub instruction.
+ fld fa0,16(a0)
+ fld fa1,16(a1)
+ fld fa2,40(a3)
+ fsub.d fa4,fa0,fa1,rne
+ feq.d a5,fa4,fa2
+ bne a5,a4,test_fail
+
+ # Test fmul instruction.
+ fld fa0,24(a0)
+ fld fa1,24(a1)
+ fld fa2,48(a3)
+ fmul.d fa4,fa0,fa1,rne
+ feq.d a5,fa4,fa2
+ bne a5,a4,test_fail
+
+ # Test fdiv instruction.
+ fld fa0,24(a0) # Use same input values as of fmul
+ fld fa1,24(a1)
+ fld fa2,56(a3)
+ fdiv.d fa4,fa0,fa1,rne
+ feq.d a5,fa4,fa2
+ bne a5,a4,test_fail
+
+ # Test fsqrt instruction.
+ fld fa0,32(a0)
+ fld fa2,64(a3)
+ fsqrt.d fa4,fa0,rne
+ feq.d a5,fa4,fa2
+ bne a5,a4,test_fail
test_pass:
pass