qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Filip Navara <xnavara@volny.cz>
To: daimon55@free.fr, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] Re: win32 build broken
Date: Sat, 08 Jan 2005 23:12:13 +0100	[thread overview]
Message-ID: <41E05ABD.6060000@volny.cz> (raw)
In-Reply-To: <pan.2005.01.08.21.47.38.829699@reply.to>

[-- 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)

  reply	other threads:[~2005-01-08 22:24 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-01-04 13:03 [Qemu-devel] win32 build broken Ronald
2005-01-04 20:55 ` René Korthaus
2005-01-06 22:35   ` Renzo Davoli
2005-01-06 22:52     ` Magnus Damm
2005-01-07  7:37       ` [Qemu-devel] softmmu ppc Laurent Amon
2005-01-07  9:43         ` Daniel Egger
2005-01-07 12:06           ` Magnus Damm
2005-01-07 14:05             ` Piotras
2005-01-07 16:05             ` Daniel Egger
2005-01-08  9:57               ` Magnus Damm
2005-01-08 12:49                 ` Daniel Egger
2005-01-08 21:47     ` [Qemu-devel] Re: win32 build broken Ronald
2005-01-08 22:12       ` Filip Navara [this message]
2005-01-08 22:37         ` [Qemu-devel] " Ronald

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=41E05ABD.6060000@volny.cz \
    --to=xnavara@volny.cz \
    --cc=daimon55@free.fr \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).