From 311a0efaffec12b422d6e277d058475b2d3984cb Mon Sep 17 00:00:00 2001 From: Petar Jovanovic Date: Tue, 24 Sep 2013 22:27:23 +0000 Subject: [PATCH] mips64: finetune mips_dirtyhelper_calculate_FCSR Several MIPS32 Revision 2 instructions also belong to Revision 1 of MIPS64. Modifing parts of mips_dirtyhelper_calculate_FCSR to be active for MIPS64R1. This fixes none/tests/mips64/round when Valgrind is compiled for MIPS64 R1. git-svn-id: svn://svn.valgrind.org/vex/trunk@2774 --- VEX/priv/guest_mips_helpers.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/VEX/priv/guest_mips_helpers.c b/VEX/priv/guest_mips_helpers.c index c166b4dd81..675fd47d1f 100644 --- a/VEX/priv/guest_mips_helpers.c +++ b/VEX/priv/guest_mips_helpers.c @@ -1176,7 +1176,8 @@ extern UInt mips_dirtyhelper_calculate_FCSR ( void* gs, UInt fs, flt_op inst ) case ROUNDWS: ASM_VOLATILE_ROUND(fs, round.w.s) break; -#if defined(__mips_isa_rev) && (__mips_isa_rev >= 2) +#if ((__mips == 32) && defined(__mips_isa_rev) && (__mips_isa_rev >= 2)) \ + || (__mips == 64) case CEILLS: ASM_VOLATILE_ROUND(fs, ceil.l.s) break; -- 2.47.2