Fix pointer-type mismatches.

git-svn-id: svn://svn.valgrind.org/vex/trunk@1237

diff --git a/VEX/priv/guest-arm/gdefs.h b/VEX/priv/guest-arm/gdefs.h
index aa50506d3043f41ba4b831b9de923a86e6932dcd..7ef365b9d3b15c8c2cd8fff07c5dd625cc4b1153 100644 (file)
--- a/VEX/priv/guest-arm/gdefs.h
+++ b/VEX/priv/guest-arm/gdefs.h
@@ -51,7 +51,7 @@ IRBB* bbToIR_ARM ( UChar*           armCode,
                    Bool             (*byte_accessible)(Addr64),
                    Bool             (*resteerOkFn)(Addr64),
                    Bool             host_bigendian,
-                   VexSubArch       subarch_guest );
+                   VexArchInfo*     archinfo_guest );
 
 /* Used by the optimiser to specialise calls to helpers. */
 extern

diff --git a/VEX/priv/guest-arm/toIR.c b/VEX/priv/guest-arm/toIR.c
index 3f108ea6e20140e556261155b4335eab43a85e45..14071a8d28f973d7d42ea5f53d4a0a1be84dd39e 100644 (file)
--- a/VEX/priv/guest-arm/toIR.c
+++ b/VEX/priv/guest-arm/toIR.c
@@ -167,7 +167,7 @@ IRBB* bbToIR_ARM ( UChar*           armCode,
                    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 @@ IRBB* bbToIR_ARM ( UChar*           armCode,
    vassert(vex_control.guest_chase_thresh >= 0);
    vassert(vex_control.guest_chase_thresh < vex_control.guest_max_insns);
 
-   vassert(subarch_guest == VexSubArchARM_v4);
+   vassert(archinfo_guest->subarch == VexSubArchARM_v4);
 
    /* Start a new, empty extent. */
    vge->n_used  = 1;

diff --git a/VEX/test_main.c b/VEX/test_main.c
index e31749e5d2276ff30ace27d810c056228174fcc8..854dbbf9c99d8c549fc0511930810271c0e8a2b1 100644 (file)
--- a/VEX/test_main.c
+++ b/VEX/test_main.c
@@ -66,6 +66,7 @@ int main ( int argc, char** argv )
    VexTranslateResult tres;
    VexControl vcon;
    VexGuestExtents vge;
+   VexArchInfo vai;
 
    if (argc != 2) {
       fprintf(stderr, "usage: vex file.org\n");
@@ -122,6 +123,9 @@ int main ( int argc, char** argv )
          origbuf[i] = (UChar)u;
       }
 
+      LibVEX_default_VexArchInfo(&vai);
+      vai.subarch = VexSubArchX86_sse1;
+
       for (i = 0; i < TEST_N_ITERS; i++)
          tres
             = LibVEX_Translate ( 
@@ -138,8 +142,8 @@ int main ( int argc, char** argv )
                  VexArchAMD64, VexSubArch_NONE, 
 #endif
 #if 1 /* x86 -> x86 */
-                 VexArchX86, VexSubArchX86_sse1, 
-                 VexArchX86, VexSubArchX86_sse1, 
+                 VexArchX86, &vai, 
+                 VexArchX86, &vai, 
 #endif
 
                  origbuf, (Addr64)orig_addr, chase_into_not_ok,