|
From: <sv...@va...> - 2006-01-27 22:05:59
|
Author: sewardj
Date: 2006-01-27 22:05:55 +0000 (Fri, 27 Jan 2006)
New Revision: 1557
Log:
Un-break ppc64 following recent hw-capabilities hackery. (sigh)
Modified:
trunk/priv/main/vex_main.c
Modified: trunk/priv/main/vex_main.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/main/vex_main.c 2006-01-27 21:52:19 UTC (rev 1556)
+++ trunk/priv/main/vex_main.c 2006-01-27 22:05:55 UTC (rev 1557)
@@ -398,9 +398,10 @@
offB_TILEN =3D offsetof(VexGuestPPC64State,guest_TILEN);
vassert(are_valid_hwcaps(VexArchPPC64, vta->archinfo_guest.hwca=
ps));
vassert(0 =3D=3D sizeof(VexGuestPPC64State) % 16);
- vassert(sizeof( ((VexGuestPPC64State*)0)->guest_TISTART ) =3D=3D=
8);
- vassert(sizeof( ((VexGuestPPC64State*)0)->guest_TILEN ) =3D=3D=
8);
- vassert(sizeof( ((VexGuestPPC64State*)0)->guest_NRADDR ) =3D=3D=
8);
+ vassert(sizeof( ((VexGuestPPC64State*)0)->guest_TISTART ) =3D=
=3D 8);
+ vassert(sizeof( ((VexGuestPPC64State*)0)->guest_TILEN ) =3D=
=3D 8);
+ vassert(sizeof( ((VexGuestPPC64State*)0)->guest_NRADDR ) =3D=
=3D 8);
+ vassert(sizeof( ((VexGuestPPC64State*)0)->guest_NRADDR_GPR2) =3D=
=3D 8);
break;
=20
default:
@@ -757,9 +758,9 @@
{
/* Monotonic with complications. Basically V > baseline(=3D=3DF),
but once you have F then you can have FX or GX too. */
- const UInt V =3D VEX_HWCAPS_PPC32_V;
- const UInt FX =3D VEX_HWCAPS_PPC32_FX;
- const UInt GX =3D VEX_HWCAPS_PPC32_GX;
+ const UInt V =3D VEX_HWCAPS_PPC64_V;
+ const UInt FX =3D VEX_HWCAPS_PPC64_FX;
+ const UInt GX =3D VEX_HWCAPS_PPC64_GX;
UInt c =3D hwcaps;
if (c =3D=3D 0) return "ppc64-int-flt";
if (c =3D=3D FX) return "ppc64-int-flt-FX";
@@ -782,11 +783,11 @@
static HChar* show_hwcaps ( VexArch arch, UInt hwcaps )
{
switch (arch) {
- case VexArchX86: return show_hwcaps_x86(hwcaps);
+ case VexArchX86: return show_hwcaps_x86(hwcaps);
case VexArchAMD64: return show_hwcaps_amd64(hwcaps);
case VexArchPPC32: return show_hwcaps_ppc32(hwcaps);
case VexArchPPC64: return show_hwcaps_ppc64(hwcaps);
- case VexArchARM: return show_hwcaps_arm(hwcaps);
+ case VexArchARM: return show_hwcaps_arm(hwcaps);
default: return NULL;
}
}
|