commit 8e70cdcb8d9a8597c524d3fd8af30e529ac70ffe
author petarj <petarj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Sat Sep 21 01:47:18 2013 +0000
committer petarj <petarj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Sat Sep 21 01:47:18 2013 +0000
tree b4a05d2f9b7be0316ef466383bd31fb2a1b688b1
parent 1c5601347b69f523df09e753b329a1a0fbff8b5d

mips32: protect mips32r2 instructions with a flag

Regression issue that came when mips_dirtyhelper_calculate_FCSR was added.
Inline assembly with MIPS32r2 instructions needs to be protected by flags
that disable it for non-MIPS32r2 platforms such as some Broadcom boards.

Fixes the issue: Bugzilla 325124.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2773 8f6e269a-dfd6-0310-a8e1-e2731360e62c

priv/guest_mips_helpers.c

diff --git a/priv/guest_mips_helpers.c b/priv/guest_mips_helpers.c
index df19d5f..c166b4d 100644
--- a/priv/guest_mips_helpers.c
+++ b/priv/guest_mips_helpers.c
@@ -1155,12 +1155,52 @@
       case CEILWD:
          ASM_VOLATILE_ROUND(fs, ceil.w.d)
          break;
+      case CVTDS:
+         ASM_VOLATILE_ROUND(fs, cvt.d.s)
+         break;
+      case CVTDW:
+         ASM_VOLATILE_ROUND(fs, cvt.d.w)
+         break;
+      case CVTSW:
+         ASM_VOLATILE_ROUND(fs, cvt.s.w)
+         break;
+      case CVTSD:
+         ASM_VOLATILE_ROUND(fs, cvt.s.d)
+         break;
+      case CVTWS:
+         ASM_VOLATILE_ROUND(fs, cvt.w.s)
+         break;
+      case CVTWD:
+         ASM_VOLATILE_ROUND(fs, cvt.w.d)
+         break;
+      case ROUNDWS:
+         ASM_VOLATILE_ROUND(fs, round.w.s)
+         break;
+#if defined(__mips_isa_rev) && (__mips_isa_rev >= 2)
       case CEILLS:
          ASM_VOLATILE_ROUND(fs, ceil.l.s)
          break;
       case CEILLD:
          ASM_VOLATILE_ROUND(fs, ceil.l.d)
          break;
+      case CVTDL:
+         ASM_VOLATILE_ROUND(fs, cvt.d.l)
+         break;
+      case CVTLS:
+         ASM_VOLATILE_ROUND(fs, cvt.l.s)
+         break;
+      case CVTLD:
+         ASM_VOLATILE_ROUND(fs, cvt.l.d)
+         break;
+      case CVTSL:
+         ASM_VOLATILE_ROUND(fs, cvt.s.l)
+         break;
+      case FLOORLS:
+         ASM_VOLATILE_ROUND(fs, floor.l.s)
+         break;
+      case FLOORLD:
+         ASM_VOLATILE_ROUND(fs, floor.l.d)
+         break;
       case ROUNDLS:
          ASM_VOLATILE_ROUND(fs, round.l.s)
          break;
@@ -1173,45 +1213,7 @@
       case TRUNCLD:
          ASM_VOLATILE_ROUND(fs, trunc.l.d)
          break;
-      case CVTDS:
-         ASM_VOLATILE_ROUND(fs, cvt.d.s)
-         break;
-      case CVTDW:
-         ASM_VOLATILE_ROUND(fs, cvt.d.w)
-         break;
-      case CVTDL:
-         ASM_VOLATILE_ROUND(fs, cvt.d.l)
-         break;
-      case CVTSW:
-         ASM_VOLATILE_ROUND(fs, cvt.s.w)
-         break;
-      case CVTSD:
-         ASM_VOLATILE_ROUND(fs, cvt.s.d)
-         break;
-      case CVTSL:
-         ASM_VOLATILE_ROUND(fs, cvt.s.l)
-         break;
-      case CVTWS:
-         ASM_VOLATILE_ROUND(fs, cvt.w.s)
-         break;
-      case CVTWD:
-         ASM_VOLATILE_ROUND(fs, cvt.w.d)
-         break;
-      case CVTLS:
-         ASM_VOLATILE_ROUND(fs, cvt.l.s)
-         break;
-      case CVTLD:
-         ASM_VOLATILE_ROUND(fs, cvt.l.d)
-         break;
-      case FLOORLS:
-         ASM_VOLATILE_ROUND(fs, floor.l.s)
-         break;
-      case FLOORLD:
-         ASM_VOLATILE_ROUND(fs, floor.l.d)
-         break;
-      case ROUNDWS:
-         ASM_VOLATILE_ROUND(fs, round.w.s)
-         break;
+#endif
       default:
          vassert(0);
          break;