|
From: <sv...@va...> - 2006-12-17 14:24:07
|
Author: sewardj
Date: 2006-12-17 14:24:05 +0000 (Sun, 17 Dec 2006)
New Revision: 1687
Log:
Make this compilable again.
Modified:
trunk/test/test-i386.c
trunk/test/test-i386.h
Modified: trunk/test/test-i386.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/test-i386.c 2006-12-01 02:59:17 UTC (rev 1686)
+++ trunk/test/test-i386.c 2006-12-17 14:24:05 UTC (rev 1687)
@@ -32,7 +32,7 @@
=20
/* Setting this to 1 creates a very comprehensive test of
integer condition codes. */
-#define TEST_INTEGER_VERBOSE 0
+#define TEST_INTEGER_VERBOSE 1
=20
=20
//#define LINUX_VM86_IOPL_FIX
@@ -261,12 +261,12 @@
: "=3Dr" (res)\
: "r" (v1), "r" (v2));\
printf("%-10s %d\n", "set" JCC, res);\
- {\
+ { int one =3D 1; \
asm("movl $0x12345678, %0\n\t"\
"cmpl %2, %1\n\t"\
"cmov" JCC "l %3, %0\n\t"\
: "=3Dr" (res)\
- : "r" (v1), "r" (v2), "m" (1));\
+ : "r" (v1), "r" (v2), "m" (one));\
printf("%-10s R=3D0x%08x\n", "cmov" JCC "l", res);\
asm("movl $0x12345678, %0\n\t"\
"cmpl %2, %1\n\t"\
@@ -506,11 +506,12 @@
{\
int res, val, resz;\
val =3D op0;\
- asm("xorl %1, %1\n"\
- "movl $0x12345678, %0\n"\
- #op " %" size "2, %" size "0 ; setz %b1" \
+ asm("xorl %1, %1\n\t"\
+ "movl $0x12345678, %0\n\t"\
+ #op " %" size "2, %" size "0\n\t" \
+ "setz %b1" \
: "=3Dr" (res), "=3Dq" (resz)\
- : "g" (val));\
+ : "r" (val));\
printf("%-10s A=3D%08x R=3D%08x %d\n", #op, val, res, resz);\
}
=20
@@ -594,7 +595,8 @@
/* test all roundings */
asm volatile ("fstcw %0" : "=3Dm" (fpuc));
for(i=3D0;i<4;i++) {
- asm volatile ("fldcw %0" : : "m" ((fpuc & ~0x0c00) | (i << 10)))=
;
+ int16_t tmp =3D (fpuc & ~0x0c00) | (i << 10);
+ asm volatile ("fldcw %0" : : "m" (tmp));
asm volatile ("fist %0" : "=3Dm" (wa) : "t" (a));
asm volatile ("fistl %0" : "=3Dm" (ia) : "t" (a));
asm volatile ("fistpll %0" : "=3Dm" (lla) : "t" (a) : "st");
Modified: trunk/test/test-i386.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/test/test-i386.h 2006-12-01 02:59:17 UTC (rev 1686)
+++ trunk/test/test-i386.h 2006-12-17 14:24:05 UTC (rev 1687)
@@ -1,4 +1,6 @@
=20
+#define FULLTXT 1
+
#define exec_op glue(exec_, OP)
#define exec_opl glue(glue(exec_, OP), l)
#define exec_opw glue(glue(exec_, OP), w)
@@ -29,8 +31,13 @@
res =3D s0;
flags =3D iflags;
EXECOP1("", res, flags);
- printf("%-6s A=3D%08x R=3D%08x CCIN=3D%04x CC=3D%04x\n",
- stringify(OP) "l", s0, res, iflags, flags & CC_MASK);
+ if (FULLTXT)
+ printf("%-6s A=3D%08x R=3D%08x CCIN=3D%04x CC=3D%04x\n",
+ stringify(OP) "l", s0, res, iflags, flags & CC_MASK);
+ else
+ printf("%08x %04x %04x\n",
+ res, iflags, flags & CC_MASK);
+
}
inline void exec_opw(int s0, int s1, int iflags)
{
@@ -38,8 +45,13 @@
res =3D s0;
flags =3D iflags;
EXECOP1("w", res, flags);
- printf("%-6s A=3D%08x R=3D%08x CCIN=3D%04x CC=3D%04x\n",
- stringify(OP) "w", s0, res, iflags, flags & CC_MASK);
+ if (FULLTXT)
+ printf("%-6s A=3D%08x R=3D%08x CCIN=3D%04x CC=3D%04x\n",
+ stringify(OP) "w", s0, res, iflags, flags & CC_MASK);
+ else
+ printf("%08x %04x %04x\n",
+ res, iflags, flags & CC_MASK);
+
}
inline void exec_opb(int s0, int s1, int iflags)
{
@@ -47,8 +59,13 @@
res =3D s0;
flags =3D iflags;
EXECOP1("b", res, flags);
- printf("%-6s A=3D%08x R=3D%08x CCIN=3D%04x CC=3D%04x\n",
- stringify(OP) "b", s0, res, iflags, flags & CC_MASK);
+ if (FULLTXT)
+ printf("%-6s A=3D%08x R=3D%08x CCIN=3D%04x CC=3D%04x\n",
+ stringify(OP) "b", s0, res, iflags, flags & CC_MASK);
+ else
+ printf("%08x %04x %04x\n",
+ res, iflags, flags & CC_MASK);
+
}
#else
inline void exec_opl(int s0, int s1, int iflags)
@@ -57,8 +74,12 @@
res =3D s0;
flags =3D iflags;
EXECOP2("", res, s1, flags);
- printf("%-6s A=3D%08x B=3D%08x R=3D%08x CCIN=3D%04x CC=3D%04x\n",
- stringify(OP) "l", s0, s1, res, iflags, flags & CC_MASK);
+ if (FULLTXT)
+ printf("%-6s A=3D%08x B=3D%08x R=3D%08x CCIN=3D%04x CC=3D%04x\n",
+ stringify(OP) "l", s0, s1, res, iflags, flags & CC_MASK);
+ else
+ printf("%08x %04x %04x\n",
+ res, iflags, flags & CC_MASK);
}
=20
inline void exec_opw(int s0, int s1, int iflags)
@@ -67,8 +88,12 @@
res =3D s0;
flags =3D iflags;
EXECOP2("w", res, s1, flags);
- printf("%-6s A=3D%08x B=3D%08x R=3D%08x CCIN=3D%04x CC=3D%04x\n",
- stringify(OP) "w", s0, s1, res, iflags, flags & CC_MASK);
+ if (FULLTXT)
+ printf("%-6s A=3D%08x B=3D%08x R=3D%08x CCIN=3D%04x CC=3D%04x\n",
+ stringify(OP) "w", s0, s1, res, iflags, flags & CC_MASK);
+ else
+ printf("%08x %04x %04x\n",
+ res, iflags, flags & CC_MASK);
}
=20
inline void exec_opb(int s0, int s1, int iflags)
@@ -77,8 +102,12 @@
res =3D s0;
flags =3D iflags;
EXECOP2("b", res, s1, flags);
- printf("%-6s A=3D%08x B=3D%08x R=3D%08x CCIN=3D%04x CC=3D%04x\n",
- stringify(OP) "b", s0, s1, res, iflags, flags & CC_MASK);
+ if (FULLTXT)
+ printf("%-6s A=3D%08x B=3D%08x R=3D%08x CCIN=3D%04x CC=3D%04x\n",
+ stringify(OP) "b", s0, s1, res, iflags, flags & CC_MASK);
+ else
+ printf("%08x %04x %04x\n",
+ res, iflags, flags & CC_MASK);
}
#endif
=20
@@ -177,3 +206,5 @@
=20
#undef OP
#undef OP_CC
+
+#undef FULLTXT
|