From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DPUke-0007iF-My
	for qemu-devel@nongnu.org; Sat, 23 Apr 2005 20:13:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DPUkc-0007hy-W8
	for qemu-devel@nongnu.org; Sat, 23 Apr 2005 20:13:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DPUkc-0006bZ-SQ
	for qemu-devel@nongnu.org; Sat, 23 Apr 2005 20:13:30 -0400
Received: from [65.74.133.9] (helo=mail.codesourcery.com)
	by monty-python.gnu.org with esmtp
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24) (Exim 4.34) id 1DPUmS-0005cA-1Z
	for qemu-devel@nongnu.org; Sat, 23 Apr 2005 20:15:24 -0400
From: Paul Brook <paul@codesourcery.com>
Date: Sun, 24 Apr 2005 01:12:03 +0100
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_VRuaCqiZ20mI5Cr"
Message-Id: <200504240112.05056.paul@codesourcery.com>
Subject: [Qemu-devel] [patch] i386-user compile fix
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

--Boundary-00=_VRuaCqiZ20mI5Cr
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

The i386-user target doesn't compile, giving errors about undefined symbol 
EAX. The attached patch conditionalizes the uses.

Paul

--Boundary-00=_VRuaCqiZ20mI5Cr
Content-Type: text/x-diff; charset="us-ascii"; name="patch.qemu_i386_user"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
	filename="patch.qemu_i386_user"

Index: cpu-exec.c
===================================================================
RCS file: /cvsroot/qemu/qemu/cpu-exec.c,v
retrieving revision 1.54
diff -u -p -r1.54 cpu-exec.c
--- cpu-exec.c	23 Apr 2005 18:16:07 -0000	1.54
+++ cpu-exec.c	23 Apr 2005 21:39:31 -0000
@@ -322,14 +322,30 @@ int cpu_exec(CPUState *env1)
                 if ((loglevel & CPU_LOG_EXEC)) {
 #if defined(TARGET_I386)
                     /* restore flags in standard format */
+#ifdef reg_EAX
                     env->regs[R_EAX] = EAX;
+#endif
+#ifdef reg_EBX
                     env->regs[R_EBX] = EBX;
+#endif
+#ifdef reg_ECX
                     env->regs[R_ECX] = ECX;
+#endif
+#ifdef reg_EDX
                     env->regs[R_EDX] = EDX;
+#endif
+#ifdef reg_ESI
                     env->regs[R_ESI] = ESI;
+#endif
+#ifdef reg_EDI
                     env->regs[R_EDI] = EDI;
+#endif
+#ifdef reg_EBP
                     env->regs[R_EBP] = EBP;
+#endif
+#ifdef reg_ESP
                     env->regs[R_ESP] = ESP;
+#endif
                     env->eflags = env->eflags | cc_table[CC_OP].compute_all() | (DF & DF_MASK);
                     cpu_dump_state(env, logfile, fprintf, X86_DUMP_CCOP);
                     env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C);

--Boundary-00=_VRuaCqiZ20mI5Cr--