Unbreak ppc32 following recent hw-capabilities hackery.

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

diff --git a/VEX/priv/guest-ppc/toIR.c b/VEX/priv/guest-ppc/toIR.c
index 9fe7189f3f06b45c776a59a94c3f58a5ad278478..7ed319cb20d6ed635f94082c8e659e2a842e8b8c 100644 (file)
--- a/VEX/priv/guest-ppc/toIR.c
+++ b/VEX/priv/guest-ppc/toIR.c
@@ -9103,12 +9103,12 @@ DisResult disInstr_PPC_WRK (
       vex_printf("disInstr(ppc): declined to decode an AltiVec insn.\n");
       goto decode_failure;
    decode_noFX:
-      vassert(!allow_V);
+      vassert(!allow_FX);
       vex_printf("disInstr(ppc): "
                  "declined to decode an GeneralPurpose-Optional insn.\n");
       goto decode_failure;
    decode_noGX:
-      vassert(!allow_V);
+      vassert(!allow_GX);
       vex_printf("disInstr(ppc): "
                  "declined to decode a Graphics-Optional insn.\n");
       goto decode_failure;
@@ -9181,12 +9181,12 @@ DisResult disInstr_PPC ( IRBB*        irbb_IN,
    mask32 = VEX_HWCAPS_PPC32_F | VEX_HWCAPS_PPC32_V
             | VEX_HWCAPS_PPC32_FX | VEX_HWCAPS_PPC32_GX;
 
-   is32 = (hwcaps_guest & ~mask32) > 0;
+   is32 = (hwcaps_guest & mask32) > 0;
 
    mask64 = VEX_HWCAPS_PPC64_V
             | VEX_HWCAPS_PPC64_FX | VEX_HWCAPS_PPC64_GX;
 
-   is64 = (hwcaps_guest & ~mask64) > 0;
+   is64 = (hwcaps_guest & mask64) > 0;
 
    if (is32 && !is64)
       mode64 = False;

diff --git a/VEX/priv/host-ppc/isel.c b/VEX/priv/host-ppc/isel.c
index 4d46477e12514f9fcd4917be4bd71c79e5136891..68e44c5c98fdc484d8ace1b8a5b46cfbf42f1d35 100644 (file)
--- a/VEX/priv/host-ppc/isel.c
+++ b/VEX/priv/host-ppc/isel.c
@@ -3654,12 +3654,12 @@ HInstrArray* iselBB_PPC ( IRBB* bb, VexArchInfo* archinfo_host )
    mask32 = VEX_HWCAPS_PPC32_F | VEX_HWCAPS_PPC32_V
             | VEX_HWCAPS_PPC32_FX | VEX_HWCAPS_PPC32_GX;
 
-   is32 = (hwcaps_host & ~mask32) > 0;
+   is32 = (hwcaps_host & mask32) > 0;
 
    mask64 = VEX_HWCAPS_PPC64_V
             | VEX_HWCAPS_PPC64_FX | VEX_HWCAPS_PPC64_GX;
 
-   is64 = (hwcaps_host & ~mask64) > 0;
+   is64 = (hwcaps_host & mask64) > 0;
 
    if (is32 && !is64)
       mode64 = False;