Hi Aleksandar, On 7/7/20 6:26 PM, Aleksandar Markovic wrote: > On Fri, Jul 3, 2020 at 6:33 PM Alex Richardson > <alexander.richard...@cl.cam.ac.uk> wrote: >> >> After merging latest QEMU upstream into our CHERI fork, I noticed that >> some of the FPU tests in our MIPS baremetal testsuite >> (https://github.com/CTSRD-CHERI/cheritest) started failing. It turns out >> this commit accidentally changed add.s into a subtract. >> >> Signed-off-by: Alex Richardson <alexander.richard...@cl.cam.ac.uk> >> --- > > Applied to MIPS + TCG Continuous Benchmarking queue.
If you don't mind I'll include this patch for the mips pull request I plan to send before hard freeze (on the list). I'm keeping your S-o-b. > >> target/mips/fpu_helper.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/target/mips/fpu_helper.c b/target/mips/fpu_helper.c >> index 7a3a61cab3..56beda49d8 100644 >> --- a/target/mips/fpu_helper.c >> +++ b/target/mips/fpu_helper.c >> @@ -1221,7 +1221,7 @@ uint32_t helper_float_add_s(CPUMIPSState *env, >> { >> uint32_t wt2; >> >> - wt2 = float32_sub(fst0, fst1, &env->active_fpu.fp_status); >> + wt2 = float32_add(fst0, fst1, &env->active_fpu.fp_status); >> update_fcr31(env, GETPC()); >> return wt2; >> } >> -- >> 2.27.0 >> >> >