Fix switchback.c to reflect changes to call of LibVEX_Translate()

Fix test_ppc_jm1.c to reflect direct linking
 - main -> __main etc
 - vex_printf -> vexxx_printf etc

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

diff --git a/VEX/switchback/switchback.c b/VEX/switchback/switchback.c
index 0f4d61469c491894d4d3686b8e036d2d93d13d9e..8e0e26bc89ee8bc120cbf4a3f90c4aad09e5b06d 100644 (file)
--- a/VEX/switchback/switchback.c
+++ b/VEX/switchback/switchback.c
@@ -4,8 +4,7 @@
 13 Dec '05 - Linker no longer used (apart from mymalloc)
 Simply compile and link switchback.c with test_xxx.c,
 e.g. for ppc64:
-$ (cd .. && make EXTRA_CFLAGS="-m64" libvex_ppc64_linux.a)
-$ gcc -m64 -Wall -O -g -o switchback switchback.c linker.c ../libvex_ppc64_linux.a test_xxx.c
+$ (cd .. && make EXTRA_CFLAGS="-m64" libvex_ppc64_linux.a) && gcc -m64 -mregnames -Wall -Wshadow -Wno-long-long -Winline -O -g -o switchback switchback.c linker.c ../libvex_ppc64_linux.a test_xxx.c
 
 Test file test_xxx.c must have an entry point called "entry",
 which expects to take a single argument which is a function pointer
@@ -112,7 +111,7 @@ ULong*          trans_tableP[N_TRANS_TABLE];
 Int trans_cache_used = 0;
 Int trans_table_used = 0;
 
-static Bool chase_into_not_ok ( Addr64 dst ) { return False; }
+static Bool chase_into_ok ( Addr64 dst ) { return False; }
 
 #if 0
 // local_sys_write_stderr(&c,1);
@@ -796,7 +795,7 @@ Bool run_translation ( HWord translation )
 HWord find_translation ( Addr64 guest_addr )
 {
    Int i;
-   HWord res;
+   HWord __res;
    if (0)
       printf("find translation %p ... ", ULong_to_Ptr(guest_addr));
    for (i = 0; i < trans_table_used; i++)
@@ -819,17 +818,18 @@ HWord find_translation ( Addr64 guest_addr )
       i--;
    }
 
-   res = (HWord)trans_tableP[i];
-   if (0) printf("%p\n", (void*)res);
-   return res;
+   __res = (HWord)trans_tableP[i];
+   if (0) printf("%p\n", (void*)__res);
+   return __res;
 }
 
 #define N_TRANSBUF 5000
 static UChar transbuf[N_TRANSBUF];
 void make_translation ( Addr64 guest_addr, Bool verbose )
 {
+   VexTranslateArgs   vta;
    VexTranslateResult tres;
-   VexArchInfo vai;
+   VexArchInfo vex_archinfo;
    Int trans_used, i, ws_needed;
 
    if (trans_table_used >= N_TRANS_TABLE
@@ -844,25 +844,32 @@ void make_translation ( Addr64 guest_addr, Bool verbose )
    if (0)
       printf("make translation %p\n", ULong_to_Ptr(guest_addr));
 
-   LibVEX_default_VexArchInfo(&vai);
-   vai.subarch = VexSubArch;
-   vai.ppc32_cache_line_szB = CacheLineSize;
-
-   tres
-      = LibVEX_Translate ( 
-           VexArch, &vai,
-           VexArch, &vai,
-           ULong_to_Ptr(guest_addr), guest_addr, guest_addr,
-           chase_into_not_ok,
-           &trans_table[trans_table_used],
-           transbuf, N_TRANSBUF, &trans_used,
-           NULL,          /* instrument1 */
-           NULL,          /* instrument2 */
-           False,         /* cleanup after instrument */
-           False,         /* self-checking translation? */
-           NULL, /* access checker */
-           verbose ? TEST_FLAGS : DEBUG_TRACE_FLAGS
-        );
+   LibVEX_default_VexArchInfo(&vex_archinfo);
+   vex_archinfo.subarch = VexSubArch;
+   vex_archinfo.ppc32_cache_line_szB = CacheLineSize;
+
+   /* */
+   vta.arch_guest       = VexArch;
+   vta.archinfo_guest   = vex_archinfo;
+   vta.arch_host        = VexArch;
+   vta.archinfo_host    = vex_archinfo;
+   vta.guest_bytes      = (UChar*)ULong_to_Ptr(guest_addr);
+   vta.guest_bytes_addr = (Addr64)guest_addr;
+   vta.guest_bytes_addr_noredir = (Addr64)guest_addr;
+   vta.chase_into_ok    = chase_into_ok;
+//   vta.guest_extents    = &vge;
+   vta.guest_extents    = &trans_table[trans_table_used];
+   vta.host_bytes       = transbuf;
+   vta.host_bytes_size  = N_TRANSBUF;
+   vta.host_bytes_used  = &trans_used;
+   vta.instrument1      = NULL;
+   vta.instrument2      = NULL;
+   vta.do_self_check    = False;
+   vta.traceflags       = verbose ? TEST_FLAGS : DEBUG_TRACE_FLAGS;
+   vta.dispatch         = NULL;
+
+   tres = LibVEX_Translate ( &vta );
+
    assert(tres == VexTransOK);
    ws_needed = (trans_used+7) / 8;
    assert(ws_needed > 0);
@@ -1129,19 +1136,19 @@ int main ( Int argc, HChar** argv )
    get_R2();
 
 #if !defined(__powerpc64__) // ppc32
-   gst.guest_CIA  = (UInt)entryP;
-   gst.guest_GPR1 = (UInt)&gstack[25000]; /* stack pointer */
-   gst.guest_GPR3 = (UInt)serviceFn; /* param to entry */
-   gst.guest_GPR2 = saved_R2;
-   gst.guest_LR = 0x12345678; /* bogus return address */
+   gst.guest_CIA   = (UInt)entryP;
+   gst.guest_GPR1  = (UInt)&gstack[25000]; /* stack pointer */
+   gst.guest_GPR3  = (UInt)serviceFn; /* param to entry */
+   gst.guest_GPR2  = saved_R2;
+   gst.guest_LR    = 0x12345678; /* bogus return address */
 #else // ppc64
    get_R13();
-   gst.guest_CIA  = * (ULong*)entryP;
-   gst.guest_GPR1 = (ULong)&gstack[25000]; /* stack pointer */
-   gst.guest_GPR3 = (ULong)serviceFn;      /* param to entry */
-   gst.guest_GPR2 = saved_R2;
+   gst.guest_CIA   = * (ULong*)entryP;
+   gst.guest_GPR1  = (ULong)&gstack[25000]; /* stack pointer */
+   gst.guest_GPR3  = (ULong)serviceFn;      /* param to entry */
+   gst.guest_GPR2  = saved_R2;
    gst.guest_GPR13 = saved_R13;
-   gst.guest_LR   = 0x1234567812345678ULL; /* bogus return address */
+   gst.guest_LR    = 0x1234567812345678ULL; /* bogus return address */
 //   printf("setting CIA to %p\n", (void*)gst.guest_CIA);
 #endif
 

diff --git a/VEX/switchback/test_ppc_jm1.c b/VEX/switchback/test_ppc_jm1.c
index 8a4581cd4b95d55906ebb38865477896dc9688b1..a17c75c81d9606db4b92a1129bb5a5d3b7dbcdfd 100644 (file)
--- a/VEX/switchback/test_ppc_jm1.c
+++ b/VEX/switchback/test_ppc_jm1.c
@@ -119,14 +119,14 @@ enum test_flags {
 
 //#define DEBUG_ARGS_BUILD
 #if defined (DEBUG_ARGS_BUILD)
-#define AB_DPRINTF(fmt, args...) do { vex_printf(fmt , ##args); } while (0)
+#define AB_DPRINTF(fmt, args...) do { vexxx_printf(fmt , ##args); } while (0)
 #else
 #define AB_DPRINTF(fmt, args...) do { } while (0)
 #endif
 
 //#define DEBUG_FILTER
 #if defined (DEBUG_FILTER)
-#define FDPRINTF(fmt, args...) do { vex_printf(fmt , ##args); } while (0)
+#define FDPRINTF(fmt, args...) do { vexxx_printf(fmt , ##args); } while (0)
 #else
 #define FDPRINTF(fmt, args...) do { } while (0)
 #endif
@@ -304,7 +304,7 @@ void* my_malloc ( int n )
 
 /////////////////////////////////////////////////////////////////////
 
-static void vex_log_bytes ( char* p, int n )
+static void vexxx_log_bytes ( char* p, int n )
 {
    int i;
    for (i = 0; i < n; i++)
@@ -312,14 +312,14 @@ static void vex_log_bytes ( char* p, int n )
 }
 
 /*---------------------------------------------------------*/
-/*--- vex_printf                                        ---*/
+/*--- vexxx_printf                                        ---*/
 /*---------------------------------------------------------*/
 
 /* This should be the only <...> include in the entire VEX library.
    New code for vex_util.c should go above this point. */
 #include <stdarg.h>
 
-static HChar vex_toupper ( HChar c )
+static HChar vexxx_toupper ( HChar c )
 {
    if (c >= 'a' && c <= 'z')
       return c + ('A' - 'a');
@@ -327,14 +327,14 @@ static HChar vex_toupper ( HChar c )
       return c;
 }
 
-static Int vex_strlen ( const HChar* str )
+static Int vexxx_strlen ( const HChar* str )
 {
    Int i = 0;
    while (str[i] != 0) i++;
    return i;
 }
 
-Bool vex_streq ( const HChar* s1, const HChar* s2 )
+Bool vexxx_streq ( const HChar* s1, const HChar* s2 )
 {
    while (True) {
       if (*s1 == 0 && *s2 == 0)
@@ -358,10 +358,10 @@ static UInt
 myvprintf_str ( void(*send)(HChar), Int flags, Int width, HChar* str, 
                 Bool capitalise )
 {
-#  define MAYBE_TOUPPER(ch) (capitalise ? vex_toupper(ch) : (ch))
+#  define MAYBE_TOUPPER(ch) (capitalise ? vexxx_toupper(ch) : (ch))
    UInt ret = 0;
    Int i, extra;
-   Int len = vex_strlen(str);
+   Int len = vexxx_strlen(str);
 
    if (width == 0) {
       ret += len;
@@ -606,7 +606,7 @@ static Int   n_myprintf_buf;
 static void add_to_myprintf_buf ( HChar c )
 {
    if (c == '\n' || n_myprintf_buf >= 1000-10 /*paranoia*/ ) {
-      (*vex_log_bytes)( myprintf_buf, vex_strlen(myprintf_buf) );
+      (*vexxx_log_bytes)( myprintf_buf, vexxx_strlen(myprintf_buf) );
       n_myprintf_buf = 0;
       myprintf_buf[n_myprintf_buf] = 0;      
    }
@@ -614,7 +614,7 @@ static void add_to_myprintf_buf ( HChar c )
    myprintf_buf[n_myprintf_buf] = 0;
 }
 
-static UInt vex_printf ( const char *format, ... )
+static UInt vexxx_printf ( const char *format, ... )
 {
    UInt ret;
    va_list vargs;
@@ -625,7 +625,7 @@ static UInt vex_printf ( const char *format, ... )
    ret = vprintf_wrk ( add_to_myprintf_buf, format, vargs );
 
    if (n_myprintf_buf > 0) {
-      (*vex_log_bytes)( myprintf_buf, n_myprintf_buf );
+      (*vexxx_log_bytes)( myprintf_buf, n_myprintf_buf );
    }
 
    va_end(vargs);
@@ -3576,14 +3576,14 @@ static uint16_t *ii16;
 static int nb_ii16;
 
 static inline void register_farg (void *farg,
-                                  int s, uint16_t exp, uint64_t mant)
+                                  int s, uint16_t _exp, uint64_t mant)
 {
     uint64_t tmp;
 
-    tmp = ((uint64_t)s << 63) | ((uint64_t)exp << 52) | mant;
+    tmp = ((uint64_t)s << 63) | ((uint64_t)_exp << 52) | mant;
     *(uint64_t *)farg = tmp;
     AB_DPRINTF("%d %03x %013llx => %016llx %0e\n",
-               s, exp, mant, *(uint64_t *)farg, *(double *)farg);
+               s, _exp, mant, *(uint64_t *)farg, *(double *)farg);
 }
 
 static void build_fargs_table (void)
@@ -3603,7 +3603,7 @@ static void build_fargs_table (void)
      * (8 values)
      */
     uint64_t mant;
-    uint16_t exp, e0, e1;
+    uint16_t _exp, e0, e1;
     int s;
     int i;
 
@@ -3614,11 +3614,11 @@ static void build_fargs_table (void)
             for (e1 = 0x000; ; e1 = ((e1 + 1) << 2) + 6) {
                 if (e1 >= 0x400)
                     e1 = 0x3fe;
-                exp = (e0 << 10) | e1;
+                _exp = (e0 << 10) | e1;
                 for (mant = 0x0000000000001ULL; mant < (1ULL << 52);
                      /* Add 'random' bits */
                      mant = ((mant + 0x4A6) << 13) + 0x359) {
-                    register_farg(&fargs[i++], s, exp, mant);
+                    register_farg(&fargs[i++], s, _exp, mant);
                 }
                 if (e1 == 0x3fe)
                     break;
@@ -3628,44 +3628,44 @@ static void build_fargs_table (void)
     /* Special values */
     /* +0.0      : 0 0x000 0x0000000000000 */
     s = 0;
-    exp = 0x000;
+    _exp = 0x000;
     mant = 0x0000000000000ULL;
-    register_farg(&fargs[i++], s, exp, mant);
+    register_farg(&fargs[i++], s, _exp, mant);
     /* -0.0      : 1 0x000 0x0000000000000 */
     s = 1;
-    exp = 0x000;
+    _exp = 0x000;
     mant = 0x0000000000000ULL;
-    register_farg(&fargs[i++], s, exp, mant);
+    register_farg(&fargs[i++], s, _exp, mant);
     /* +infinity : 0 0x7FF 0x0000000000000  */
     s = 0;
-    exp = 0x7FF;
+    _exp = 0x7FF;
     mant = 0x0000000000000ULL;
-    register_farg(&fargs[i++], s, exp, mant);
+    register_farg(&fargs[i++], s, _exp, mant);
     /* -infinity : 1 0x7FF 0x0000000000000 */
     s = 1;
-    exp = 0x7FF;
+    _exp = 0x7FF;
     mant = 0x0000000000000ULL;
-    register_farg(&fargs[i++], s, exp, mant);
+    register_farg(&fargs[i++], s, _exp, mant);
     /* +SNaN     : 0 0x7FF 0x7FFFFFFFFFFFF */
     s = 0;
-    exp = 0x7FF;
+    _exp = 0x7FF;
     mant = 0x7FFFFFFFFFFFFULL;
-    register_farg(&fargs[i++], s, exp, mant);
+    register_farg(&fargs[i++], s, _exp, mant);
     /* -SNaN     : 1 0x7FF 0x7FFFFFFFFFFFF */
     s = 1;
-    exp = 0x7FF;
+    _exp = 0x7FF;
     mant = 0x7FFFFFFFFFFFFULL;
-    register_farg(&fargs[i++], s, exp, mant);
+    register_farg(&fargs[i++], s, _exp, mant);
     /* +QNaN     : 0 0x7FF 0x8000000000000 */
     s = 0;
-    exp = 0x7FF;
+    _exp = 0x7FF;
     mant = 0x8000000000000ULL;
-    register_farg(&fargs[i++], s, exp, mant);
+    register_farg(&fargs[i++], s, _exp, mant);
     /* -QNaN     : 1 0x7FF 0x8000000000000 */
     s = 1;
-    exp = 0x7FF;
+    _exp = 0x7FF;
     mant = 0x8000000000000ULL;
-    register_farg(&fargs[i++], s, exp, mant);
+    register_farg(&fargs[i++], s, _exp, mant);
     AB_DPRINTF("Registered %d floats values\n", i);
     nb_fargs = i;
 }
@@ -3714,7 +3714,7 @@ static void test_int_three_args (const unsigned char *name, test_func_t func)
     int i, j, k;
 
     if (verbose > 1)
-        vex_printf( "Test instruction %s\n", name);
+        vexxx_printf( "Test instruction %s\n", name);
     for (i = 0; i < nb_iargs; i++) {
         for (j = 0; j < nb_iargs; j++) {
             for (k = 0;k < nb_iargs; k++) {
@@ -3730,14 +3730,14 @@ static void test_int_three_args (const unsigned char *name, test_func_t func)
                 __asm__ __volatile__ ("mfxer 18");
                 xer = r18;
                 res = r17;
-                vex_printf("%s %08x, %08x, %08x => %08x (%08x %08x)\n",
+                vexxx_printf("%s %08x, %08x, %08x => %08x (%08x %08x)\n",
                        name, iargs[i], iargs[j], iargs[k], res, flags, xer);
             }
-            vex_printf("\n");
+            vexxx_printf("\n");
         }
-        vex_printf("\n");
+        vexxx_printf("\n");
     }
-    vex_printf("\n");
+    vexxx_printf("\n");
 }
 
 static void test_int_two_args (const unsigned char *name, test_func_t func)
@@ -3746,7 +3746,7 @@ static void test_int_two_args (const unsigned char *name, test_func_t func)
     int i, j;
 
     if (verbose > 1)
-        vex_printf( "Test instruction %s\n", name);
+        vexxx_printf( "Test instruction %s\n", name);
     for (i = 0; i < nb_iargs; i++) {
         for (j = 0; j < nb_iargs; j++) {
             r14 = iargs[i];
@@ -3760,12 +3760,12 @@ static void test_int_two_args (const unsigned char *name, test_func_t func)
             __asm__ __volatile__ ("mfxer 18");
             xer = r18;
             res = r17;
-            vex_printf("%s %08x, %08x => %08x (%08x %08x)\n",
+            vexxx_printf("%s %08x, %08x => %08x (%08x %08x)\n",
                    name, iargs[i], iargs[j], res, flags, xer);
         }
-        vex_printf("\n");
+        vexxx_printf("\n");
     }
-    vex_printf("\n");
+    vexxx_printf("\n");
 }
 
 static void test_int_one_arg (const unsigned char *name, test_func_t func)
@@ -3774,7 +3774,7 @@ static void test_int_one_arg (const unsigned char *name, test_func_t func)
     int i;
 
     if (verbose > 1)
-        vex_printf( "Test instruction %s\n", name);
+        vexxx_printf( "Test instruction %s\n", name);
     for (i = 0; i < nb_iargs; i++) {
         r14 = iargs[i];
         r18 = 0;
@@ -3787,10 +3787,10 @@ static void test_int_one_arg (const unsigned char *name, test_func_t func)
         flags = r18;
         __asm__ __volatile__ ("mfxer 18");
         xer = r18;
-        vex_printf("%s %08x => %08x (%08x %08x)\n",
+        vexxx_printf("%s %08x => %08x (%08x %08x)\n",
                name, iargs[i], res, flags, xer);
     }
-    vex_printf("\n");
+    vexxx_printf("\n");
 }
 
 static inline void _patch_op_imm (void *out, void *in,
@@ -3826,19 +3826,19 @@ static void test_int_one_reg_imm16 (const unsigned char *name,
     int i, j;
 
     if (verbose > 1)
-        vex_printf( "Test instruction %s\n", name);
+        vexxx_printf( "Test instruction %s\n", name);
     for (i = 0; i < nb_iargs; i++) {
         for (j = 0; j < nb_ii16; j++) {
             p = (void *)func;
 #if 0
-            vex_printf("copy func %s from %p to %p (%08x %08x)\n",
+            vexxx_printf("copy func %s from %p to %p (%08x %08x)\n",
                    name, func, func_buf, p[0], p[1]);
 #endif
             func_buf[1] = p[1];
             patch_op_imm16(func_buf, p, ii16[j]);
             func = (void *)func_buf;
 #if 0
-            vex_printf(" =>  func %s from %p to %p (%08x %08x)\n",
+            vexxx_printf(" =>  func %s from %p to %p (%08x %08x)\n",
                    name, func, func_buf, func_buf[0], func_buf[1]);
 #endif
             r14 = iargs[i];
@@ -3851,12 +3851,12 @@ static void test_int_one_reg_imm16 (const unsigned char *name,
             __asm__ __volatile__ ("mfxer 18");
             xer = r18;
             res = r17;
-            vex_printf("%s %08x, %08x => %08x (%08x %08x)\n",
+            vexxx_printf("%s %08x, %08x => %08x (%08x %08x)\n",
                    name, iargs[i], ii16[j], res, flags, xer);
         }
-        vex_printf("\n");
+        vexxx_printf("\n");
     }
-    vex_printf("\n");
+    vexxx_printf("\n");
 }
 
 /* Special test cases for:
@@ -3878,7 +3878,7 @@ static void rlwi_cb (const unsigned char *name, test_func_t func)
     int i, j, k, l;
 
     if (verbose > 1)
-        vex_printf( "Test instruction %s\n", name);
+        vexxx_printf( "Test instruction %s\n", name);
     for (i = 0;;) {
         if (i >= nb_iargs)
             i = nb_iargs - 1;
@@ -3901,14 +3901,14 @@ static void rlwi_cb (const unsigned char *name, test_func_t func)
                     __asm__ __volatile__ ("mfxer 18");
                     xer = r18;
                     res = r17;
-                    vex_printf("%s %08x, %d, %d, %d => %08x (%08x %08x)\n",
+                    vexxx_printf("%s %08x, %d, %d, %d => %08x (%08x %08x)\n",
                            name, iargs[i], j, k, l, res, flags, xer);
                 }
-                vex_printf("\n");
+                vexxx_printf("\n");
             }
-            vex_printf("\n");
+            vexxx_printf("\n");
         }
-        vex_printf("\n");
+        vexxx_printf("\n");
         if (i == 0)
             i = 1;
         else if (i == nb_iargs - 1)
@@ -3916,7 +3916,7 @@ static void rlwi_cb (const unsigned char *name, test_func_t func)
         else
             i += 3;
     }
-    vex_printf("\n");
+    vexxx_printf("\n");
 }
 
 static void rlwnm_cb (const unsigned char *name, test_func_t func)
@@ -3926,7 +3926,7 @@ static void rlwnm_cb (const unsigned char *name, test_func_t func)
     int i, j, k, l;
 
     if (verbose > 1)
-        vex_printf( "Test instruction %s\n", name);
+        vexxx_printf( "Test instruction %s\n", name);
     for (i = 0; i < nb_iargs; i++) {
         for (j = 0; j < 64; j++) {
             for (k = 0; k < 32; k++) {
@@ -3947,16 +3947,16 @@ static void rlwnm_cb (const unsigned char *name, test_func_t func)
                     __asm__ __volatile__ ("mfxer 18");
                     xer = r18;
                     res = r17;
-                    vex_printf("%s %08x, %08x, %d, %d => %08x (%08x %08x)\n",
+                    vexxx_printf("%s %08x, %08x, %d, %d => %08x (%08x %08x)\n",
                            name, iargs[i], j, k, l, res, flags, xer);
                 }
-                vex_printf("\n");
+                vexxx_printf("\n");
             }
-            vex_printf("\n");
+            vexxx_printf("\n");
         }
-        vex_printf("\n");
+        vexxx_printf("\n");
     }
-    vex_printf("\n");
+    vexxx_printf("\n");
 }
 
 static void srawi_cb (const unsigned char *name, test_func_t func)
@@ -3966,7 +3966,7 @@ static void srawi_cb (const unsigned char *name, test_func_t func)
     int i, j;
 
     if (verbose > 1)
-        vex_printf( "Test instruction %s\n", name);
+        vexxx_printf( "Test instruction %s\n", name);
     for (i = 0; i < nb_iargs; i++) {
         for (j = 0; j < 32; j++) {
             p = (void *)func;
@@ -3983,12 +3983,12 @@ static void srawi_cb (const unsigned char *name, test_func_t func)
             __asm__ __volatile__ ("mfxer 18");
             xer = r18;
             res = r17;
-            vex_printf("%s %08x, %d => %08x (%08x %08x)\n",
+            vexxx_printf("%s %08x, %d => %08x (%08x %08x)\n",
                    name, iargs[i], j, res, flags, xer);
         }
-        vex_printf("\n");
+        vexxx_printf("\n");
     }
-    vex_printf("\n");
+    vexxx_printf("\n");
 }
 
 typedef struct special_t special_t;
@@ -4007,7 +4007,7 @@ static void test_special (special_t *table,
         continue;
     for (i = 0; table[i].name != NULL; i++) {
 #if 0
-        vex_printf( "look for handler for '%s' (%s)\n", name,
+        vexxx_printf( "look for handler for '%s' (%s)\n", name,
                 table[i].name);
 #endif
         if (my_strcmp(table[i].name, tmp) == 0) {
@@ -4015,7 +4015,7 @@ static void test_special (special_t *table,
             return;
         }
     }
-    vex_printf( "ERROR: no test found for op '%s'\n", name);
+    vexxx_printf( "ERROR: no test found for op '%s'\n", name);
 }
 
 static special_t special_int_ops[] = {
@@ -4093,7 +4093,7 @@ static void test_float_three_args (const unsigned char *name, test_func_t func)
     int i, j, k;
 
     if (verbose > 1)
-        vex_printf( "Test instruction %s\n", name);
+        vexxx_printf( "Test instruction %s\n", name);
     for (i = 0; i < nb_fargs; i++) {
         for (j = 0; j < nb_fargs; j++) {
             for (k = 0;k < nb_fargs; k++) {
@@ -4113,14 +4113,14 @@ static void test_float_three_args (const unsigned char *name, test_func_t func)
                 flags = r18;
                 res = f17;
                 ur = *(uint64_t *)(&res);
-                vex_printf("%s %016llx, %016llx, %016llx => %016llx (%08x)\n",
+                vexxx_printf("%s %016llx, %016llx, %016llx => %016llx (%08x)\n",
                        name, u0, u1, u2, ur, flags);
             }
-            vex_printf("\n");
+            vexxx_printf("\n");
         }
-        vex_printf("\n");
+        vexxx_printf("\n");
     }
-    vex_printf("\n");
+    vexxx_printf("\n");
 }
 
 static void test_float_two_args (const unsigned char *name, test_func_t func)
@@ -4131,7 +4131,7 @@ static void test_float_two_args (const unsigned char *name, test_func_t func)
     int i, j;
 
     if (verbose > 1)
-        vex_printf( "Test instruction %s\n", name);
+        vexxx_printf( "Test instruction %s\n", name);
     for (i = 0; i < nb_fargs; i++) {
         for (j = 0; j < nb_fargs; j++) {
             u0 = *(uint64_t *)(&fargs[i]);
@@ -4148,12 +4148,12 @@ static void test_float_two_args (const unsigned char *name, test_func_t func)
             flags = r18;
             res = f17;
             ur = *(uint64_t *)(&res);
-            vex_printf("%s %016llx, %016llx => %016llx (%08x)\n",
+            vexxx_printf("%s %016llx, %016llx => %016llx (%08x)\n",
                    name, u0, u1, ur, flags);
         }
-        vex_printf("\n");
+        vexxx_printf("\n");
     }
-    vex_printf("\n");
+    vexxx_printf("\n");
 }
 
 static void test_float_one_arg (const unsigned char *name, test_func_t func)
@@ -4164,7 +4164,7 @@ static void test_float_one_arg (const unsigned char *name, test_func_t func)
     int i;
 
     if (verbose > 1)
-        vex_printf( "Test instruction %s\n", name);
+        vexxx_printf( "Test instruction %s\n", name);
     for (i = 0; i < nb_fargs; i++) {
         u0 = *(uint64_t *)(&fargs[i]);
         f14 = fargs[i];
@@ -4178,9 +4178,9 @@ static void test_float_one_arg (const unsigned char *name, test_func_t func)
         flags = r18;
         res = f17;
         ur = *(uint64_t *)(&res);
-        vex_printf("%s %016llx => %016llx (%08x)\n", name, u0, ur, flags);
+        vexxx_printf("%s %016llx => %016llx (%08x)\n", name, u0, ur, flags);
     }
-    vex_printf("\n");
+    vexxx_printf("\n");
 }
 
 static special_t special_float_ops[] = {
@@ -4259,7 +4259,7 @@ static void test_ppc405 (const unsigned char *name, test_func_t func)
     int i, j, k;
 
     if (verbose > 1)
-        vex_printf( "Test instruction %s\n", name);
+        vexxx_printf( "Test instruction %s\n", name);
     for (i = 0; i < nb_iargs; i++) {
         for (j = 0; j < nb_iargs; j++) {
             for (k = 0;k < nb_iargs; k++) {
@@ -4278,14 +4278,14 @@ static void test_ppc405 (const unsigned char *name, test_func_t func)
                 __asm__ __volatile__ ("mfxer 18");
                 xer = r18;
                 res = r17;
-                vex_printf("%s %08x, %08x, %08x => %08x (%08x %08x)\n",
+                vexxx_printf("%s %08x, %08x, %08x => %08x (%08x %08x)\n",
                        name, iargs[i], iargs[j], iargs[k], res, flags, xer);
             }
-            vex_printf("\n");
+            vexxx_printf("\n");
         }
-        vex_printf("\n");
+        vexxx_printf("\n");
     }
-    vex_printf("\n");
+    vexxx_printf("\n");
 }
 #endif /* defined (IS_PPC405) */
 
@@ -4316,8 +4316,8 @@ static int check_name (const unsigned char *name, const unsigned char *filter,
             continue;
         FDPRINTF("Check '%s' againt '%s' (%s match)\n",
                  name, filter, exact ? "exact" : "starting");
-        nlen = vex_strlen(name);
-        flen = vex_strlen(filter);
+        nlen = vexxx_strlen(name);
+        flen = vexxx_strlen(filter);
         if (exact) {
             if (nlen == flen && my_memcmp(name, filter, flen) == 0)
                 ret = 1;
@@ -4386,7 +4386,7 @@ static void do_tests (int one_arg, int two_args, int three_args,
             loop = &float_loops[nb_args - 1];
             break;
 #else
-            vex_printf( "Sorry. "
+            vexxx_printf( "Sorry. "
                     "PPC floating point instructions tests "
                     "are disabled on your host\n");
 #endif /* !defined (NO_FLOAT) */
@@ -4397,7 +4397,7 @@ static void do_tests (int one_arg, int two_args, int three_args,
             loop = &tmpl;
             break;
 #else
-            vex_printf( "Sorry. "
+            vexxx_printf( "Sorry. "
                     "PPC405 instructions tests are disabled on your host\n");
             continue;
 #endif /* defined (IS_PPC405) */
@@ -4407,12 +4407,12 @@ static void do_tests (int one_arg, int two_args, int three_args,
             loop = &altivec_int_loops[nb_args - 1];
             break;
 #else
-            vex_printf( "Sorry. "
+            vexxx_printf( "Sorry. "
                     "Altivec instructions tests are not yet implemented\n");
             continue;
 #endif
 #else
-            vex_printf( "Sorry. "
+            vexxx_printf( "Sorry. "
                     "Altivec instructions tests are disabled on your host\n");
             continue;
 #endif
@@ -4422,36 +4422,36 @@ static void do_tests (int one_arg, int two_args, int three_args,
             loop = &altivec_float_loops[nb_args - 1];
             break;
 #else
-            vex_printf( "Sorry. "
+            vexxx_printf( "Sorry. "
                     "Altivec instructions tests are not yet implemented\n");
             continue;
 #endif
 #else
-            vex_printf( "Sorry. "
+            vexxx_printf( "Sorry. "
                     "Altivec float instructions tests "
                     "are disabled on your host\n");
 #endif
             continue;
         default:
-            vex_printf("ERROR: unknown insn family %08x\n", family);
+            vexxx_printf("ERROR: unknown insn family %08x\n", family);
             continue;
         }
         if (verbose > 0)
-            vex_printf( "%s:\n", all_tests[i].name);
+            vexxx_printf( "%s:\n", all_tests[i].name);
         for (j = 0; tests[j].name != NULL; j++) {
             if (check_name(tests[j].name, filter, exact))
                 (*loop)(tests[j].name, tests[j].func);
             n++;
         }
-        vex_printf("\n");
+        vexxx_printf("\n");
     }
-    vex_printf( "All done. Tested %d different instructions\n", n);
+    vexxx_printf( "All done. Tested %d different instructions\n", n);
 }
 
 #if 0 // unused
 static void usage (void)
 {
-    vex_printf(
+    vexxx_printf(
             "test-ppc [-1] [-2] [-3] [-*] [-t <type>] [-f <family>] [-u] "
             "[-n <filter>] [-x] [-h]\n"
             "\t-1: test opcodes with one argument\n"
@@ -4479,7 +4479,7 @@ static void usage (void)
 }
 #endif
 
-int main (int argc, char **argv)
+int _main (int argc, char **argv)
 {
     unsigned char /* *tmp, */ *filter = NULL;
     int one_arg = 0, two_args = 0, three_args = 0;
@@ -4540,17 +4540,17 @@ int main (int argc, char **argv)
     //            break;
     //        default:
     //            usage();
-    //            vex_printf( "Unknown argument: '%c'\n", c);
+    //            vexxx_printf( "Unknown argument: '%c'\n", c);
     //            return 1;
     //        bad_arg:
     //            usage();
-    //            vex_printf( "Bad argument for '%c': '%s'\n", c, tmp);
+    //            vexxx_printf( "Bad argument for '%c': '%s'\n", c, tmp);
     //            return 1;
     //        }
     //    }
     //    if (argc != optind) {
     //        usage();
-    //        vex_printf( "Bad number of arguments\n");
+    //        vexxx_printf( "Bad number of arguments\n");
     //        return 1;
     //    }
 
@@ -4608,6 +4608,6 @@ void entry ( HWord(*service)(HWord,HWord) )
 {
    char* argv[2] = { NULL, NULL };
    serviceFn = service;
-   main(0, argv);
+   _main(0, argv);
    (*service)(0,0);
 }