[Qemu-devel] [PATCH] Some updates for the qemu/tests

[Even Rouault]

Some are required for x86_64 compilation.

Index: Makefile
===================================================================
RCS file: /cvsroot/qemu/qemu/tests/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile    26 Apr 2005 21:39:25 -0000      1.33
+++ Makefile    29 Nov 2005 20:58:48 -0000
@@ -71,7 +71,7 @@ runcom: runcom.c

 # NOTE: -fomit-frame-pointer is currently needed : this is a bug in libqemu
 qruncom: qruncom.c ../i386-user/libqemu.a
-       $(CC) $(CFLAGS) -fomit-frame-pointer $(LDFLAGS) -I../target-i386 -I.. 
-I../i386-user \
+       $(CC) $(CFLAGS) -fomit-frame-pointer $(LDFLAGS) -I../target-i386 -I.. 
-I../i386-user -I../fpu \
               -o $@ $< -L../i386-user -lqemu -lm

 # arm test
Index: qruncom.c
===================================================================
RCS file: /cvsroot/qemu/qemu/tests/qruncom.c,v
retrieving revision 1.3
diff -u -p -r1.3 qruncom.c
--- qruncom.c   21 Nov 2005 23:32:57 -0000      1.3
+++ qruncom.c   29 Nov 2005 20:58:48 -0000
@@ -263,7 +263,7 @@ int main(int argc, char **argv)
         case EXCP0D_GPF:
             {
                 int int_num, ah;
-                int_num = *(env->segs[R_CS].base + env->eip + 1);
+                int_num = *(int*)(env->segs[R_CS].base + env->eip + 1);
                 if (int_num != 0x21)
                     goto unknown_int;
                 ah = (env->regs[R_EAX] >> 8) & 0xff;
@@ -291,7 +291,7 @@ int main(int argc, char **argv)
                 default:
                 unknown_int:
                     fprintf(stderr, "unsupported int 0x%02x\n", int_num);
-                    cpu_dump_state(env, stderr, 0);
+                    cpu_dump_state(env, stderr, fprintf, 0);
                     //                    exit(1);
                 }
                 env->eip += 2;
@@ -299,7 +299,7 @@ int main(int argc, char **argv)
             break;
         default:
             fprintf(stderr, "unhandled cpu_exec return code (0x%x)\n", ret);
-            cpu_dump_state(env, stderr, 0);
+            cpu_dump_state(env, stderr, fprintf, 0);
             exit(1);
         }
     }
Index: test-i386.c
===================================================================
RCS file: /cvsroot/qemu/qemu/tests/test-i386.c,v
retrieving revision 1.49
diff -u -p -r1.49 test-i386.c
--- test-i386.c 23 Apr 2005 17:54:59 -0000      1.49
+++ test-i386.c 29 Nov 2005 20:58:50 -0000
@@ -36,6 +36,7 @@
 //#define LINUX_VM86_IOPL_FIX
 //#define TEST_P4_FLAGS
 #if defined(__x86_64__)
+#include <xmmintrin.h>
 #define TEST_SSE
 #define TEST_CMOV  1
 #define TEST_FCOMI 1
@@ -2013,9 +2014,6 @@ static void test_enter(void)
 }

 #ifdef TEST_SSE
-
-typedef int __m64 __attribute__ ((__mode__ (__V2SI__)));
-typedef int __m128 __attribute__ ((__mode__(__V4SF__)));

 typedef union {
     double d[2];