mips32: small cleanup in show_hwcaps_mips32

Small cleanup in show_hwcaps_mips32(). More will follow as we need to add
support for Cavium boards too.

git-svn-id: svn://svn.valgrind.org/vex/trunk@2763

diff --git a/VEX/priv/main_main.c b/VEX/priv/main_main.c
index 5bb762f8ddf8d728925ae3067051e86b360b92e2..ceb83769511174bbfc1f20d7b266b7c1107f7814 100644 (file)
--- a/VEX/priv/main_main.c
+++ b/VEX/priv/main_main.c
@@ -1428,41 +1428,25 @@ static const HChar* show_hwcaps_s390x ( UInt hwcaps )
 static const HChar* show_hwcaps_mips32 ( UInt hwcaps )
 {
    /* MIPS baseline. */
-   if (hwcaps && VEX_PRID_COMP_MIPS == VEX_PRID_COMP_MIPS) {
+   if (hwcaps & VEX_PRID_COMP_MIPS == VEX_PRID_COMP_MIPS) {
       /* MIPS baseline with dspr2. */
-      if (hwcaps && VEX_MIPS_ASE_DSP2P == VEX_MIPS_ASE_DSP2P) {
+      if (hwcaps & VEX_MIPS_ASE_DSP2P == VEX_MIPS_ASE_DSP2P) {
          return "MIPS-baseline-dspr2";
       }
       /* MIPS baseline with dsp. */
-      if (hwcaps && VEX_MIPS_ASE_DSP == VEX_MIPS_ASE_DSP) {
+      if (hwcaps & VEX_MIPS_ASE_DSP == VEX_MIPS_ASE_DSP) {
          return "MIPS-baseline-dsp";
       }
       return "MIPS-baseline";
    }
 
    /* Broadcom baseline. */
-   if (hwcaps && VEX_PRID_COMP_BROADCOM == VEX_PRID_COMP_BROADCOM) {
-      /* Broadcom baseline with dspr2. */
-      if (hwcaps && VEX_MIPS_ASE_DSP2P == VEX_MIPS_ASE_DSP2P) {
-         return "Broadcom-baseline-dspr2";
-      }
-      /* Broadcom baseline with dsp. */
-      if (hwcaps && VEX_MIPS_ASE_DSP == VEX_MIPS_ASE_DSP) {
-         return "Broadcom-baseline-dsp";
-      }
+   if (hwcaps & VEX_PRID_COMP_BROADCOM == VEX_PRID_COMP_BROADCOM) {
       return "Broadcom-baseline";
    }
 
    /* Netlogic baseline. */
-   if (hwcaps && VEX_PRID_COMP_NETLOGIC == VEX_PRID_COMP_NETLOGIC) {
-      /* Netlogic baseline with dspr2. */
-      if (hwcaps && VEX_MIPS_ASE_DSP2P == VEX_MIPS_ASE_DSP2P) {
-         return "Netlogic-baseline-dspr2";
-      }
-      /* Netlogic baseline with dsp. */
-      if (hwcaps && VEX_MIPS_ASE_DSP == VEX_MIPS_ASE_DSP) {
-         return "Netlogic-baseline-dsp";
-      }
+   if (hwcaps & VEX_PRID_COMP_NETLOGIC == VEX_PRID_COMP_NETLOGIC) {
       return "Netlogic-baseline";
    }