|
From: <sv...@va...> - 2005-06-30 12:50:55
|
Author: sewardj
Date: 2005-06-30 13:50:50 +0100 (Thu, 30 Jun 2005)
New Revision: 1237
Log:
Fix pointer-type mismatches.
Modified:
trunk/priv/guest-arm/gdefs.h
trunk/priv/guest-arm/toIR.c
trunk/test_main.c
Modified: trunk/priv/guest-arm/gdefs.h
=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-arm/gdefs.h 2005-06-30 12:26:18 UTC (rev 1236)
+++ trunk/priv/guest-arm/gdefs.h 2005-06-30 12:50:50 UTC (rev 1237)
@@ -51,7 +51,7 @@
Bool (*byte_accessible)(Addr64),
Bool (*resteerOkFn)(Addr64),
Bool host_bigendian,
- VexSubArch subarch_guest );
+ VexArchInfo* archinfo_guest );
=20
/* Used by the optimiser to specialise calls to helpers. */
extern
Modified: trunk/priv/guest-arm/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-arm/toIR.c 2005-06-30 12:26:18 UTC (rev 1236)
+++ trunk/priv/guest-arm/toIR.c 2005-06-30 12:50:50 UTC (rev 1237)
@@ -167,7 +167,7 @@
Bool (*byte_accessible)(Addr64),
Bool (*chase_into_ok)(Addr64),
Bool host_bigendian,
- VexSubArch subarch_guest )
+ VexArchInfo* archinfo_guest )
{
Long delta;
Int i, n_instrs, size, first_stmt_idx;
@@ -183,7 +183,7 @@
vassert(vex_control.guest_chase_thresh >=3D 0);
vassert(vex_control.guest_chase_thresh < vex_control.guest_max_insns)=
;
=20
- vassert(subarch_guest =3D=3D VexSubArchARM_v4);
+ vassert(archinfo_guest->subarch =3D=3D VexSubArchARM_v4);
=20
/* Start a new, empty extent. */
vge->n_used =3D 1;
Modified: trunk/test_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/test_main.c 2005-06-30 12:26:18 UTC (rev 1236)
+++ trunk/test_main.c 2005-06-30 12:50:50 UTC (rev 1237)
@@ -66,6 +66,7 @@
VexTranslateResult tres;
VexControl vcon;
VexGuestExtents vge;
+ VexArchInfo vai;
=20
if (argc !=3D 2) {
fprintf(stderr, "usage: vex file.org\n");
@@ -122,6 +123,9 @@
origbuf[i] =3D (UChar)u;
}
=20
+ LibVEX_default_VexArchInfo(&vai);
+ vai.subarch =3D VexSubArchX86_sse1;
+
for (i =3D 0; i < TEST_N_ITERS; i++)
tres
=3D LibVEX_Translate (=20
@@ -138,8 +142,8 @@
VexArchAMD64, VexSubArch_NONE,=20
#endif
#if 1 /* x86 -> x86 */
- VexArchX86, VexSubArchX86_sse1,=20
- VexArchX86, VexSubArchX86_sse1,=20
+ VexArchX86, &vai,=20
+ VexArchX86, &vai,=20
#endif
=20
origbuf, (Addr64)orig_addr, chase_into_not_ok,
|