From: Julian Seward <jseward@acm.org>
Date: Fri, 27 Jan 2006 21:52:19 +0000 (+0000)
Subject: Unbreak ppc32 following recent hw-capabilities hackery.
X-Git-Tag: svn/VALGRIND_3_2_3^2~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d85379e094b637bdf894974617df894358dcd4ee;p=thirdparty%2Fvalgrind.git

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 9fe7189f3f..7ed319cb20 100644
--- 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 4d46477e12..68e44c5c98 100644
--- 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;