Re: [Qemu-devel] Re: win32 build broken

[Filip Navara <xnavara@volny.cz>]

[-- Attachment #1: Type: text/plain, Size: 108 bytes --]

Ronald wrote:

>After tonight's update here is what I get:
>
[snip]

Does the attached patch help?

- Filip

[-- Attachment #2: qemu.diff  --]
[-- Type: text/x-patch, Size: 1586 bytes --]

--- exec-all.h	Tue Jan  4 00:35:10 2005
+++ exec-all.h	Fri Jan  7 17:44:27 2005
@@ -343,7 +341,7 @@
 #elif defined(__i386__) && defined(USE_DIRECT_JUMP)
 
 /* we patch the jump instruction directly */
-#define GOTO_TB(opname, n)\
+#define GOTO_TB(opname, tbparam, n)\
 do {\
     asm volatile (".section .data\n"\
 		  ASM_NAME(__op_label) #n "." ASM_NAME(opname) ":\n"\
@@ -372,6 +370,15 @@
 } while (0)
 
 #else
+
+/* we patch the jump instruction directly */
+#define GOTO_TB(opname, tbparam, n)\
+do {\
+    static void __attribute__((unused)) *dummy ## n = &&dummy_label ## n;\
+    goto *(void *)(((TranslationBlock *)tbparam)->tb_next[n]);\
+dummy_label ## n:\
+    EXIT_TB(); \
+} while (0)
 
 /* jump to next block operations (more portable code, does not need
    cache flushing, but slower because of indirect jump) */
--- slirp/slirp.h	Sun Nov 14 19:58:04 2004
+++ slirp/slirp.h	Fri Jan  7 16:08:04 2005
@@ -20,6 +20,7 @@
 typedef uint64_t u_int64_t;
 typedef char *caddr_t;
 
+# include <windows.h>
 # include <winsock2.h>
 # include <sys/timeb.h>
 # include <iphlpapi.h>
Only in .: sparc-softmmu
diff -ru ../qemu-snapshot-2005-01-06_23/target-i386/op.c ./target-i386/op.c
--- ../qemu-snapshot-2005-01-06_23/target-i386/op.c	Thu Jan  6 21:46:58 2005
+++ ./target-i386/op.c	Fri Jan  7 17:39:47 2005
@@ -1262,12 +1262,12 @@
 
 void OPPROTO op_goto_tb0(void)
 {
-    GOTO_TB(op_goto_tb0, 0);
+    GOTO_TB(op_goto_tb0, PARAM1, 0);
 }
 
 void OPPROTO op_goto_tb1(void)
 {
-    GOTO_TB(op_goto_tb1, 1);
+    GOTO_TB(op_goto_tb1, PARAM1, 1);
 }
 
 void OPPROTO op_jmp_label(void)