Fix, add ISA 3.1 check to set ISA 3.1 in Valgrind hwcaps value

diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c
index 5594923fdb3593eccaffe4a7b9909c0fec7f4056..e7877e636040743cbd87b99ef2842804960538be 100644 (file)
--- a/coregrind/m_machine.c
+++ b/coregrind/m_machine.c
@@ -1234,6 +1234,8 @@ Bool VG_(machine_get_hwcaps)( void )
         __asm__ __volatile__(".long 0x7d205434"); /* cnttzw RT, RB */
      }
 
+     // ISA 3.1 not supported on 32-bit systems
+
      /* determine dcbz/dcbzl sizes while we still have the signal
       * handlers registered */
      find_ppc_dcbz_sz(&vai);
@@ -1271,6 +1273,7 @@ Bool VG_(machine_get_hwcaps)( void )
      if (have_DFP) vai.hwcaps |= VEX_HWCAPS_PPC32_DFP;
      if (have_isa_2_07) vai.hwcaps |= VEX_HWCAPS_PPC32_ISA2_07;
      if (have_isa_3_0) vai.hwcaps |= VEX_HWCAPS_PPC32_ISA3_0;
+     /* ISA 3.1 not supported on 32-bit systems.  */
 
      VG_(machine_get_cache_info)(&vai);
 
@@ -1287,7 +1290,7 @@ Bool VG_(machine_get_hwcaps)( void )
      vki_sigaction_toK_t     tmp_sigill_act,   tmp_sigfpe_act;
 
      volatile Bool have_F, have_V, have_FX, have_GX, have_VX, have_DFP;
-     volatile Bool have_isa_2_07, have_isa_3_0;
+     volatile Bool have_isa_2_07, have_isa_3_0, have_isa_3_1;
      Int r;
 
      /* This is a kludge.  Really we ought to back-convert saved_act
@@ -1390,6 +1393,14 @@ Bool VG_(machine_get_hwcaps)( void )
         __asm__ __volatile__(".long  0x7d205434"); /* cnttzw RT, RB */
      }
 
+     /* Check for ISA 3.1 support. */
+     have_isa_3_1 = True;
+     if (VG_MINIMAL_SETJMP(env_unsup_insn)) {
+        have_isa_3_1 = False;
+     } else {
+        __asm__ __volatile__(".long 0x7f1401b6"); /* brh  RA, RS */
+     }
+
      /* determine dcbz/dcbzl sizes while we still have the signal
       * handlers registered */
      find_ppc_dcbz_sz(&vai);
@@ -1397,10 +1408,10 @@ Bool VG_(machine_get_hwcaps)( void )
      VG_(sigaction)(VKI_SIGILL, &saved_sigill_act, NULL);
      VG_(sigaction)(VKI_SIGFPE, &saved_sigfpe_act, NULL);
      VG_(sigprocmask)(VKI_SIG_SETMASK, &saved_set, NULL);
-     VG_(debugLog)(1, "machine", "F %d V %d FX %d GX %d VX %d DFP %d ISA2.07 %d ISA3.0 %d\n",
+     VG_(debugLog)(1, "machine", "F %d V %d FX %d GX %d VX %d DFP %d ISA2.07 %d ISA3.0 %d ISA3.1 %d\n",
                     (Int)have_F, (Int)have_V, (Int)have_FX,
                     (Int)have_GX, (Int)have_VX, (Int)have_DFP,
-                    (Int)have_isa_2_07, (int)have_isa_3_0);
+                    (Int)have_isa_2_07, (int)have_isa_3_0, (int)have_isa_3_1);
      /* on ppc64be, if we don't even have FP, just give up. */
      if (!have_F)
         return False;
@@ -1424,6 +1435,7 @@ Bool VG_(machine_get_hwcaps)( void )
      if (have_DFP) vai.hwcaps |= VEX_HWCAPS_PPC64_DFP;
      if (have_isa_2_07) vai.hwcaps |= VEX_HWCAPS_PPC64_ISA2_07;
      if (have_isa_3_0) vai.hwcaps |= VEX_HWCAPS_PPC64_ISA3_0;
+     if (have_isa_3_1) vai.hwcaps |= VEX_HWCAPS_PPC64_ISA3_1;
 
      VG_(machine_get_cache_info)(&vai);