|
From: <sv...@va...> - 2005-12-16 13:49:24
|
Author: cerion
Date: 2005-12-16 13:49:00 +0000 (Fri, 16 Dec 2005)
New Revision: 1499
Log:
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
Modified:
trunk/switchback/
trunk/switchback/switchback.c
trunk/switchback/test_ppc_jm1.c
Property changes on: trunk/switchback
___________________________________________________________________
Name: svn:ignore
+ switchback
Modified: trunk/switchback/switchback.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/switchback/switchback.c 2005-12-16 13:40:18 UTC (rev 1498)
+++ trunk/switchback/switchback.c 2005-12-16 13:49:00 UTC (rev 1499)
@@ -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=3D"-m64" libvex_ppc64_linux.a)
-$ gcc -m64 -Wall -O -g -o switchback switchback.c linker.c ../libvex_ppc=
64_linux.a test_xxx.c
+$ (cd .. && make EXTRA_CFLAGS=3D"-m64" libvex_ppc64_linux.a) && gcc -m64=
-mregnames -Wall -Wshadow -Wno-long-long -Winline -O -g -o switchback sw=
itchback.c linker.c ../libvex_ppc64_linux.a test_xxx.c
=20
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 @@
Int trans_cache_used =3D 0;
Int trans_table_used =3D 0;
=20
-static Bool chase_into_not_ok ( Addr64 dst ) { return False; }
+static Bool chase_into_ok ( Addr64 dst ) { return False; }
=20
#if 0
// local_sys_write_stderr(&c,1);
@@ -796,7 +795,7 @@
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 =3D 0; i < trans_table_used; i++)
@@ -819,17 +818,18 @@
i--;
}
=20
- res =3D (HWord)trans_tableP[i];
- if (0) printf("%p\n", (void*)res);
- return res;
+ __res =3D (HWord)trans_tableP[i];
+ if (0) printf("%p\n", (void*)__res);
+ return __res;
}
=20
#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;
=20
if (trans_table_used >=3D N_TRANS_TABLE
@@ -844,25 +844,32 @@
if (0)
printf("make translation %p\n", ULong_to_Ptr(guest_addr));
=20
- LibVEX_default_VexArchInfo(&vai);
- vai.subarch =3D VexSubArch;
- vai.ppc32_cache_line_szB =3D CacheLineSize;
+ LibVEX_default_VexArchInfo(&vex_archinfo);
+ vex_archinfo.subarch =3D VexSubArch;
+ vex_archinfo.ppc32_cache_line_szB =3D CacheLineSize;
=20
- tres
- =3D LibVEX_Translate (=20
- 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
- );
+ /* */
+ vta.arch_guest =3D VexArch;
+ vta.archinfo_guest =3D vex_archinfo;
+ vta.arch_host =3D VexArch;
+ vta.archinfo_host =3D vex_archinfo;
+ vta.guest_bytes =3D (UChar*)ULong_to_Ptr(guest_addr);
+ vta.guest_bytes_addr =3D (Addr64)guest_addr;
+ vta.guest_bytes_addr_noredir =3D (Addr64)guest_addr;
+ vta.chase_into_ok =3D chase_into_ok;
+// vta.guest_extents =3D &vge;
+ vta.guest_extents =3D &trans_table[trans_table_used];
+ vta.host_bytes =3D transbuf;
+ vta.host_bytes_size =3D N_TRANSBUF;
+ vta.host_bytes_used =3D &trans_used;
+ vta.instrument1 =3D NULL;
+ vta.instrument2 =3D NULL;
+ vta.do_self_check =3D False;
+ vta.traceflags =3D verbose ? TEST_FLAGS : DEBUG_TRACE_FLAGS;
+ vta.dispatch =3D NULL;
+
+ tres =3D LibVEX_Translate ( &vta );
+
assert(tres =3D=3D VexTransOK);
ws_needed =3D (trans_used+7) / 8;
assert(ws_needed > 0);
@@ -1129,19 +1136,19 @@
get_R2();
=20
#if !defined(__powerpc64__) // ppc32
- gst.guest_CIA =3D (UInt)entryP;
- gst.guest_GPR1 =3D (UInt)&gstack[25000]; /* stack pointer */
- gst.guest_GPR3 =3D (UInt)serviceFn; /* param to entry */
- gst.guest_GPR2 =3D saved_R2;
- gst.guest_LR =3D 0x12345678; /* bogus return address */
+ gst.guest_CIA =3D (UInt)entryP;
+ gst.guest_GPR1 =3D (UInt)&gstack[25000]; /* stack pointer */
+ gst.guest_GPR3 =3D (UInt)serviceFn; /* param to entry */
+ gst.guest_GPR2 =3D saved_R2;
+ gst.guest_LR =3D 0x12345678; /* bogus return address */
#else // ppc64
get_R13();
- gst.guest_CIA =3D * (ULong*)entryP;
- gst.guest_GPR1 =3D (ULong)&gstack[25000]; /* stack pointer */
- gst.guest_GPR3 =3D (ULong)serviceFn; /* param to entry */
- gst.guest_GPR2 =3D saved_R2;
+ gst.guest_CIA =3D * (ULong*)entryP;
+ gst.guest_GPR1 =3D (ULong)&gstack[25000]; /* stack pointer */
+ gst.guest_GPR3 =3D (ULong)serviceFn; /* param to entry */
+ gst.guest_GPR2 =3D saved_R2;
gst.guest_GPR13 =3D saved_R13;
- gst.guest_LR =3D 0x1234567812345678ULL; /* bogus return address */
+ gst.guest_LR =3D 0x1234567812345678ULL; /* bogus return address */
// printf("setting CIA to %p\n", (void*)gst.guest_CIA);
#endif
=20
Modified: trunk/switchback/test_ppc_jm1.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/switchback/test_ppc_jm1.c 2005-12-16 13:40:18 UTC (rev 1498)
+++ trunk/switchback/test_ppc_jm1.c 2005-12-16 13:49:00 UTC (rev 1499)
@@ -119,14 +119,14 @@
=20
//#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); } whil=
e (0)
#else
#define AB_DPRINTF(fmt, args...) do { } while (0)
#endif
=20
//#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 @@
=20
/////////////////////////////////////////////////////////////////////
=20
-static void vex_log_bytes ( char* p, int n )
+static void vexxx_log_bytes ( char* p, int n )
{
int i;
for (i =3D 0; i < n; i++)
@@ -312,14 +312,14 @@
}
=20
/*---------------------------------------------------------*/
-/*--- vex_printf ---*/
+/*--- vexxx_printf ---*/
/*---------------------------------------------------------*/
=20
/* 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>
=20
-static HChar vex_toupper ( HChar c )
+static HChar vexxx_toupper ( HChar c )
{
if (c >=3D 'a' && c <=3D 'z')
return c + ('A' - 'a');
@@ -327,14 +327,14 @@
return c;
}
=20
-static Int vex_strlen ( const HChar* str )
+static Int vexxx_strlen ( const HChar* str )
{
Int i =3D 0;
while (str[i] !=3D 0) i++;
return i;
}
=20
-Bool vex_streq ( const HChar* s1, const HChar* s2 )
+Bool vexxx_streq ( const HChar* s1, const HChar* s2 )
{
while (True) {
if (*s1 =3D=3D 0 && *s2 =3D=3D 0)
@@ -358,10 +358,10 @@
myvprintf_str ( void(*send)(HChar), Int flags, Int width, HChar* str,=20
Bool capitalise )
{
-# define MAYBE_TOUPPER(ch) (capitalise ? vex_toupper(ch) : (ch))
+# define MAYBE_TOUPPER(ch) (capitalise ? vexxx_toupper(ch) : (ch))
UInt ret =3D 0;
Int i, extra;
- Int len =3D vex_strlen(str);
+ Int len =3D vexxx_strlen(str);
=20
if (width =3D=3D 0) {
ret +=3D len;
@@ -606,7 +606,7 @@
static void add_to_myprintf_buf ( HChar c )
{
if (c =3D=3D '\n' || n_myprintf_buf >=3D 1000-10 /*paranoia*/ ) {
- (*vex_log_bytes)( myprintf_buf, vex_strlen(myprintf_buf) );
+ (*vexxx_log_bytes)( myprintf_buf, vexxx_strlen(myprintf_buf) );
n_myprintf_buf =3D 0;
myprintf_buf[n_myprintf_buf] =3D 0; =20
}
@@ -614,7 +614,7 @@
myprintf_buf[n_myprintf_buf] =3D 0;
}
=20
-static UInt vex_printf ( const char *format, ... )
+static UInt vexxx_printf ( const char *format, ... )
{
UInt ret;
va_list vargs;
@@ -625,7 +625,7 @@
ret =3D vprintf_wrk ( add_to_myprintf_buf, format, vargs );
=20
if (n_myprintf_buf > 0) {
- (*vex_log_bytes)( myprintf_buf, n_myprintf_buf );
+ (*vexxx_log_bytes)( myprintf_buf, n_myprintf_buf );
}
=20
va_end(vargs);
@@ -3576,14 +3576,14 @@
static int nb_ii16;
=20
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;
=20
- tmp =3D ((uint64_t)s << 63) | ((uint64_t)exp << 52) | mant;
+ tmp =3D ((uint64_t)s << 63) | ((uint64_t)_exp << 52) | mant;
*(uint64_t *)farg =3D tmp;
AB_DPRINTF("%d %03x %013llx =3D> %016llx %0e\n",
- s, exp, mant, *(uint64_t *)farg, *(double *)farg);
+ s, _exp, mant, *(uint64_t *)farg, *(double *)farg);
}
=20
static void build_fargs_table (void)
@@ -3603,7 +3603,7 @@
* (8 values)
*/
uint64_t mant;
- uint16_t exp, e0, e1;
+ uint16_t _exp, e0, e1;
int s;
int i;
=20
@@ -3614,11 +3614,11 @@
for (e1 =3D 0x000; ; e1 =3D ((e1 + 1) << 2) + 6) {
if (e1 >=3D 0x400)
e1 =3D 0x3fe;
- exp =3D (e0 << 10) | e1;
+ _exp =3D (e0 << 10) | e1;
for (mant =3D 0x0000000000001ULL; mant < (1ULL << 52);
/* Add 'random' bits */
mant =3D ((mant + 0x4A6) << 13) + 0x359) {
- register_farg(&fargs[i++], s, exp, mant);
+ register_farg(&fargs[i++], s, _exp, mant);
}
if (e1 =3D=3D 0x3fe)
break;
@@ -3628,44 +3628,44 @@
/* Special values */
/* +0.0 : 0 0x000 0x0000000000000 */
s =3D 0;
- exp =3D 0x000;
+ _exp =3D 0x000;
mant =3D 0x0000000000000ULL;
- register_farg(&fargs[i++], s, exp, mant);
+ register_farg(&fargs[i++], s, _exp, mant);
/* -0.0 : 1 0x000 0x0000000000000 */
s =3D 1;
- exp =3D 0x000;
+ _exp =3D 0x000;
mant =3D 0x0000000000000ULL;
- register_farg(&fargs[i++], s, exp, mant);
+ register_farg(&fargs[i++], s, _exp, mant);
/* +infinity : 0 0x7FF 0x0000000000000 */
s =3D 0;
- exp =3D 0x7FF;
+ _exp =3D 0x7FF;
mant =3D 0x0000000000000ULL;
- register_farg(&fargs[i++], s, exp, mant);
+ register_farg(&fargs[i++], s, _exp, mant);
/* -infinity : 1 0x7FF 0x0000000000000 */
s =3D 1;
- exp =3D 0x7FF;
+ _exp =3D 0x7FF;
mant =3D 0x0000000000000ULL;
- register_farg(&fargs[i++], s, exp, mant);
+ register_farg(&fargs[i++], s, _exp, mant);
/* +SNaN : 0 0x7FF 0x7FFFFFFFFFFFF */
s =3D 0;
- exp =3D 0x7FF;
+ _exp =3D 0x7FF;
mant =3D 0x7FFFFFFFFFFFFULL;
- register_farg(&fargs[i++], s, exp, mant);
+ register_farg(&fargs[i++], s, _exp, mant);
/* -SNaN : 1 0x7FF 0x7FFFFFFFFFFFF */
s =3D 1;
- exp =3D 0x7FF;
+ _exp =3D 0x7FF;
mant =3D 0x7FFFFFFFFFFFFULL;
- register_farg(&fargs[i++], s, exp, mant);
+ register_farg(&fargs[i++], s, _exp, mant);
/* +QNaN : 0 0x7FF 0x8000000000000 */
s =3D 0;
- exp =3D 0x7FF;
+ _exp =3D 0x7FF;
mant =3D 0x8000000000000ULL;
- register_farg(&fargs[i++], s, exp, mant);
+ register_farg(&fargs[i++], s, _exp, mant);
/* -QNaN : 1 0x7FF 0x8000000000000 */
s =3D 1;
- exp =3D 0x7FF;
+ _exp =3D 0x7FF;
mant =3D 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 =3D i;
}
@@ -3714,7 +3714,7 @@
int i, j, k;
=20
if (verbose > 1)
- vex_printf( "Test instruction %s\n", name);
+ vexxx_printf( "Test instruction %s\n", name);
for (i =3D 0; i < nb_iargs; i++) {
for (j =3D 0; j < nb_iargs; j++) {
for (k =3D 0;k < nb_iargs; k++) {
@@ -3730,14 +3730,14 @@
__asm__ __volatile__ ("mfxer 18");
xer =3D r18;
res =3D r17;
- vex_printf("%s %08x, %08x, %08x =3D> %08x (%08x %08x)\n"=
,
+ vexxx_printf("%s %08x, %08x, %08x =3D> %08x (%08x %08x)\=
n",
name, iargs[i], iargs[j], iargs[k], res, flags, x=
er);
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
=20
static void test_int_two_args (const unsigned char *name, test_func_t fu=
nc)
@@ -3746,7 +3746,7 @@
int i, j;
=20
if (verbose > 1)
- vex_printf( "Test instruction %s\n", name);
+ vexxx_printf( "Test instruction %s\n", name);
for (i =3D 0; i < nb_iargs; i++) {
for (j =3D 0; j < nb_iargs; j++) {
r14 =3D iargs[i];
@@ -3760,12 +3760,12 @@
__asm__ __volatile__ ("mfxer 18");
xer =3D r18;
res =3D r17;
- vex_printf("%s %08x, %08x =3D> %08x (%08x %08x)\n",
+ vexxx_printf("%s %08x, %08x =3D> %08x (%08x %08x)\n",
name, iargs[i], iargs[j], res, flags, xer);
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
=20
static void test_int_one_arg (const unsigned char *name, test_func_t fun=
c)
@@ -3774,7 +3774,7 @@
int i;
=20
if (verbose > 1)
- vex_printf( "Test instruction %s\n", name);
+ vexxx_printf( "Test instruction %s\n", name);
for (i =3D 0; i < nb_iargs; i++) {
r14 =3D iargs[i];
r18 =3D 0;
@@ -3787,10 +3787,10 @@
flags =3D r18;
__asm__ __volatile__ ("mfxer 18");
xer =3D r18;
- vex_printf("%s %08x =3D> %08x (%08x %08x)\n",
+ vexxx_printf("%s %08x =3D> %08x (%08x %08x)\n",
name, iargs[i], res, flags, xer);
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
=20
static inline void _patch_op_imm (void *out, void *in,
@@ -3826,19 +3826,19 @@
int i, j;
=20
if (verbose > 1)
- vex_printf( "Test instruction %s\n", name);
+ vexxx_printf( "Test instruction %s\n", name);
for (i =3D 0; i < nb_iargs; i++) {
for (j =3D 0; j < nb_ii16; j++) {
p =3D (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] =3D p[1];
patch_op_imm16(func_buf, p, ii16[j]);
func =3D (void *)func_buf;
#if 0
- vex_printf(" =3D> func %s from %p to %p (%08x %08x)\n",
+ vexxx_printf(" =3D> func %s from %p to %p (%08x %08x)\n",
name, func, func_buf, func_buf[0], func_buf[1]);
#endif
r14 =3D iargs[i];
@@ -3851,12 +3851,12 @@
__asm__ __volatile__ ("mfxer 18");
xer =3D r18;
res =3D r17;
- vex_printf("%s %08x, %08x =3D> %08x (%08x %08x)\n",
+ vexxx_printf("%s %08x, %08x =3D> %08x (%08x %08x)\n",
name, iargs[i], ii16[j], res, flags, xer);
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
=20
/* Special test cases for:
@@ -3878,7 +3878,7 @@
int i, j, k, l;
=20
if (verbose > 1)
- vex_printf( "Test instruction %s\n", name);
+ vexxx_printf( "Test instruction %s\n", name);
for (i =3D 0;;) {
if (i >=3D nb_iargs)
i =3D nb_iargs - 1;
@@ -3901,14 +3901,14 @@
__asm__ __volatile__ ("mfxer 18");
xer =3D r18;
res =3D r17;
- vex_printf("%s %08x, %d, %d, %d =3D> %08x (%08x %08x=
)\n",
+ vexxx_printf("%s %08x, %d, %d, %d =3D> %08x (%08x %0=
8x)\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 =3D=3D 0)
i =3D 1;
else if (i =3D=3D nb_iargs - 1)
@@ -3916,7 +3916,7 @@
else
i +=3D 3;
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
=20
static void rlwnm_cb (const unsigned char *name, test_func_t func)
@@ -3926,7 +3926,7 @@
int i, j, k, l;
=20
if (verbose > 1)
- vex_printf( "Test instruction %s\n", name);
+ vexxx_printf( "Test instruction %s\n", name);
for (i =3D 0; i < nb_iargs; i++) {
for (j =3D 0; j < 64; j++) {
for (k =3D 0; k < 32; k++) {
@@ -3947,16 +3947,16 @@
__asm__ __volatile__ ("mfxer 18");
xer =3D r18;
res =3D r17;
- vex_printf("%s %08x, %08x, %d, %d =3D> %08x (%08x %0=
8x)\n",
+ vexxx_printf("%s %08x, %08x, %d, %d =3D> %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");
}
=20
static void srawi_cb (const unsigned char *name, test_func_t func)
@@ -3966,7 +3966,7 @@
int i, j;
=20
if (verbose > 1)
- vex_printf( "Test instruction %s\n", name);
+ vexxx_printf( "Test instruction %s\n", name);
for (i =3D 0; i < nb_iargs; i++) {
for (j =3D 0; j < 32; j++) {
p =3D (void *)func;
@@ -3983,12 +3983,12 @@
__asm__ __volatile__ ("mfxer 18");
xer =3D r18;
res =3D r17;
- vex_printf("%s %08x, %d =3D> %08x (%08x %08x)\n",
+ vexxx_printf("%s %08x, %d =3D> %08x (%08x %08x)\n",
name, iargs[i], j, res, flags, xer);
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
=20
typedef struct special_t special_t;
@@ -4007,7 +4007,7 @@
continue;
for (i =3D 0; table[i].name !=3D 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) =3D=3D 0) {
@@ -4015,7 +4015,7 @@
return;
}
}
- vex_printf( "ERROR: no test found for op '%s'\n", name);
+ vexxx_printf( "ERROR: no test found for op '%s'\n", name);
}
=20
static special_t special_int_ops[] =3D {
@@ -4093,7 +4093,7 @@
int i, j, k;
=20
if (verbose > 1)
- vex_printf( "Test instruction %s\n", name);
+ vexxx_printf( "Test instruction %s\n", name);
for (i =3D 0; i < nb_fargs; i++) {
for (j =3D 0; j < nb_fargs; j++) {
for (k =3D 0;k < nb_fargs; k++) {
@@ -4113,14 +4113,14 @@
flags =3D r18;
res =3D f17;
ur =3D *(uint64_t *)(&res);
- vex_printf("%s %016llx, %016llx, %016llx =3D> %016llx (%=
08x)\n",
+ vexxx_printf("%s %016llx, %016llx, %016llx =3D> %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");
}
=20
static void test_float_two_args (const unsigned char *name, test_func_t =
func)
@@ -4131,7 +4131,7 @@
int i, j;
=20
if (verbose > 1)
- vex_printf( "Test instruction %s\n", name);
+ vexxx_printf( "Test instruction %s\n", name);
for (i =3D 0; i < nb_fargs; i++) {
for (j =3D 0; j < nb_fargs; j++) {
u0 =3D *(uint64_t *)(&fargs[i]);
@@ -4148,12 +4148,12 @@
flags =3D r18;
res =3D f17;
ur =3D *(uint64_t *)(&res);
- vex_printf("%s %016llx, %016llx =3D> %016llx (%08x)\n",
+ vexxx_printf("%s %016llx, %016llx =3D> %016llx (%08x)\n",
name, u0, u1, ur, flags);
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
=20
static void test_float_one_arg (const unsigned char *name, test_func_t f=
unc)
@@ -4164,7 +4164,7 @@
int i;
=20
if (verbose > 1)
- vex_printf( "Test instruction %s\n", name);
+ vexxx_printf( "Test instruction %s\n", name);
for (i =3D 0; i < nb_fargs; i++) {
u0 =3D *(uint64_t *)(&fargs[i]);
f14 =3D fargs[i];
@@ -4178,9 +4178,9 @@
flags =3D r18;
res =3D f17;
ur =3D *(uint64_t *)(&res);
- vex_printf("%s %016llx =3D> %016llx (%08x)\n", name, u0, ur, fla=
gs);
+ vexxx_printf("%s %016llx =3D> %016llx (%08x)\n", name, u0, ur, f=
lags);
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
=20
static special_t special_float_ops[] =3D {
@@ -4259,7 +4259,7 @@
int i, j, k;
=20
if (verbose > 1)
- vex_printf( "Test instruction %s\n", name);
+ vexxx_printf( "Test instruction %s\n", name);
for (i =3D 0; i < nb_iargs; i++) {
for (j =3D 0; j < nb_iargs; j++) {
for (k =3D 0;k < nb_iargs; k++) {
@@ -4278,14 +4278,14 @@
__asm__ __volatile__ ("mfxer 18");
xer =3D r18;
res =3D r17;
- vex_printf("%s %08x, %08x, %08x =3D> %08x (%08x %08x)\n"=
,
+ vexxx_printf("%s %08x, %08x, %08x =3D> %08x (%08x %08x)\=
n",
name, iargs[i], iargs[j], iargs[k], res, flags, x=
er);
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
- vex_printf("\n");
+ vexxx_printf("\n");
}
#endif /* defined (IS_PPC405) */
=20
@@ -4316,8 +4316,8 @@
continue;
FDPRINTF("Check '%s' againt '%s' (%s match)\n",
name, filter, exact ? "exact" : "starting");
- nlen =3D vex_strlen(name);
- flen =3D vex_strlen(filter);
+ nlen =3D vexxx_strlen(name);
+ flen =3D vexxx_strlen(filter);
if (exact) {
if (nlen =3D=3D flen && my_memcmp(name, filter, flen) =3D=3D=
0)
ret =3D 1;
@@ -4386,7 +4386,7 @@
loop =3D &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 @@
loop =3D &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 @@
loop =3D &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 hos=
t\n");
continue;
#endif
@@ -4422,36 +4422,36 @@
loop =3D &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 =3D 0; tests[j].name !=3D 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);
}
=20
#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 @@
}
#endif
=20
-int main (int argc, char **argv)
+int _main (int argc, char **argv)
{
unsigned char /* *tmp, */ *filter =3D NULL;
int one_arg =3D 0, two_args =3D 0, three_args =3D 0;
@@ -4540,17 +4540,17 @@
// 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 !=3D optind) {
// usage();
- // vex_printf( "Bad number of arguments\n");
+ // vexxx_printf( "Bad number of arguments\n");
// return 1;
// }
=20
@@ -4608,6 +4608,6 @@
{
char* argv[2] =3D { NULL, NULL };
serviceFn =3D service;
- main(0, argv);
+ _main(0, argv);
(*service)(0,0);
}
|