|
From: <sv...@va...> - 2006-01-27 21:52:23
|
Author: sewardj
Date: 2006-01-27 21:52:19 +0000 (Fri, 27 Jan 2006)
New Revision: 1556
Log:
Unbreak ppc32 following recent hw-capabilities hackery.
Modified:
trunk/priv/guest-ppc/toIR.c
trunk/priv/host-ppc/isel.c
Modified: trunk/priv/guest-ppc/toIR.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/priv/guest-ppc/toIR.c 2006-01-27 21:20:15 UTC (rev 1555)
+++ trunk/priv/guest-ppc/toIR.c 2006-01-27 21:52:19 UTC (rev 1556)
@@ -9103,12 +9103,12 @@
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 @@
mask32 =3D VEX_HWCAPS_PPC32_F | VEX_HWCAPS_PPC32_V
| VEX_HWCAPS_PPC32_FX | VEX_HWCAPS_PPC32_GX;
=20
- is32 =3D (hwcaps_guest & ~mask32) > 0;
+ is32 =3D (hwcaps_guest & mask32) > 0;
=20
mask64 =3D VEX_HWCAPS_PPC64_V
| VEX_HWCAPS_PPC64_FX | VEX_HWCAPS_PPC64_GX;
=20
- is64 =3D (hwcaps_guest & ~mask64) > 0;
+ is64 =3D (hwcaps_guest & mask64) > 0;
=20
if (is32 && !is64)
mode64 =3D False;
Modified: trunk/priv/host-ppc/isel.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/priv/host-ppc/isel.c 2006-01-27 21:20:15 UTC (rev 1555)
+++ trunk/priv/host-ppc/isel.c 2006-01-27 21:52:19 UTC (rev 1556)
@@ -3654,12 +3654,12 @@
mask32 =3D VEX_HWCAPS_PPC32_F | VEX_HWCAPS_PPC32_V
| VEX_HWCAPS_PPC32_FX | VEX_HWCAPS_PPC32_GX;
=20
- is32 =3D (hwcaps_host & ~mask32) > 0;
+ is32 =3D (hwcaps_host & mask32) > 0;
=20
mask64 =3D VEX_HWCAPS_PPC64_V
| VEX_HWCAPS_PPC64_FX | VEX_HWCAPS_PPC64_GX;
=20
- is64 =3D (hwcaps_host & ~mask64) > 0;
+ is64 =3D (hwcaps_host & mask64) > 0;
=20
if (is32 && !is64)
mode64 =3D False;
|