|
From: <sv...@va...> - 2005-08-05 02:55:43
|
Author: sewardj
Date: 2005-08-05 03:55:36 +0100 (Fri, 05 Aug 2005)
New Revision: 1317
Log:
Get rid of ludicrously over-paranoid assertion that caused all last
night's x86 regtests to fail.
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 2005-08-04 18:32:19 UTC (rev 1316)
+++ trunk/priv/main/vex_main.c 2005-08-05 02:55:36 UTC (rev 1317)
@@ -131,12 +131,6 @@
vassert(vcon->guest_chase_thresh >=3D 0);
vassert(vcon->guest_chase_thresh < vcon->guest_max_insns);
=20
- /* All the guest state structs must have an 8-aligned size. */
- vassert(0 =3D=3D sizeof(VexGuestX86State) % 8);
- vassert(0 =3D=3D sizeof(VexGuestAMD64State) % 8);
- vassert(0 =3D=3D sizeof(VexGuestPPC32State) % 8);
- vassert(0 =3D=3D sizeof(VexGuestARMState) % 8);
-
/* Check that Vex has been built with sizes of basic types as
stated in priv/libvex_basictypes.h. Failure of any of these is
a serious configuration error and should be corrected
@@ -343,6 +337,7 @@
vassert(archinfo_guest->subarch =3D=3D VexSubArchX86_sse0
|| archinfo_guest->subarch =3D=3D VexSubArchX86_sse1
|| archinfo_guest->subarch =3D=3D VexSubArchX86_sse2);
+ vassert(0 =3D=3D sizeof(VexGuestX86State) % 8);
vassert(sizeof( ((VexGuestX86State*)0)->guest_TISTART ) =3D=3D =
4);
vassert(sizeof( ((VexGuestX86State*)0)->guest_TILEN ) =3D=3D 4)=
;
break;
@@ -357,6 +352,7 @@
offB_TISTART =3D offsetof(VexGuestAMD64State,guest_TISTART)=
;
offB_TILEN =3D offsetof(VexGuestAMD64State,guest_TILEN);
vassert(archinfo_guest->subarch =3D=3D VexSubArch_NONE);
+ vassert(0 =3D=3D sizeof(VexGuestAMD64State) % 8);
vassert(sizeof( ((VexGuestAMD64State*)0)->guest_TISTART ) =3D=3D=
8);
vassert(sizeof( ((VexGuestAMD64State*)0)->guest_TILEN ) =3D=3D =
8);
break;
@@ -384,6 +380,7 @@
offB_TILEN =3D offsetof(VexGuestPPC32State,guest_TILEN);
vassert(archinfo_guest->subarch =3D=3D VexSubArchPPC32_noAV
|| archinfo_guest->subarch =3D=3D VexSubArchPPC32_AV);
+ vassert(0 =3D=3D sizeof(VexGuestPPC32State) % 8);
vassert(sizeof( ((VexGuestPPC32State*)0)->guest_TISTART ) =3D=3D=
4);
vassert(sizeof( ((VexGuestPPC32State*)0)->guest_TILEN ) =3D=3D =
4);
break;
|