From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1K9iCM-0003gk-4U
	for qemu-devel@nongnu.org; Fri, 20 Jun 2008 11:06:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1K9iCL-0003gP-0Z
	for qemu-devel@nongnu.org; Fri, 20 Jun 2008 11:06:45 -0400
Received: from [199.232.76.173] (port=46977 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1K9iCK-0003gD-Td
	for qemu-devel@nongnu.org; Fri, 20 Jun 2008 11:06:44 -0400
Received: from savannah.gnu.org ([199.232.41.3]:51390 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <blauwirbel@gmail.com>)
	id 1K9iCK-0007f5-HP
	for qemu-devel@nongnu.org; Fri, 20 Jun 2008 11:06:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <blauwirbel@gmail.com>) id 1K9iCJ-00059C-GH
	for qemu-devel@nongnu.org; Fri, 20 Jun 2008 15:06:43 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1K9iCJ-000596-6b
	for qemu-devel@nongnu.org; Fri, 20 Jun 2008 15:06:43 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1K9iCJ-000596-6b@cvs.savannah.gnu.org>
Date: Fri, 20 Jun 2008 15:06:43 +0000
Subject: [Qemu-devel] [4758] Fix boot problem on i386 host introduced in
	r4690
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

Revision: 4758
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4758
Author:   blueswir1
Date:     2008-06-20 15:06:42 +0000 (Fri, 20 Jun 2008)

Log Message:
-----------
Fix boot problem on i386 host introduced in r4690

Modified Paths:
--------------
    trunk/target-sparc/op_helper.c

Modified: trunk/target-sparc/op_helper.c
===================================================================
--- trunk/target-sparc/op_helper.c	2008-06-20 14:50:55 UTC (rev 4757)
+++ trunk/target-sparc/op_helper.c	2008-06-20 15:06:42 UTC (rev 4758)
@@ -2622,12 +2622,12 @@
 void cpu_set_cwp(CPUState *env1, int new_cwp)
 {
     /* put the modified wrap registers at their proper location */
-    if (env1->cwp == env->nwindows - 1)
-        memcpy32(env1->regbase, env1->regbase + env->nwindows * 16);
+    if (env1->cwp == env1->nwindows - 1)
+        memcpy32(env1->regbase, env1->regbase + env1->nwindows * 16);
     env1->cwp = new_cwp;
     /* put the wrap registers at their temporary location */
-    if (new_cwp == env->nwindows - 1)
-        memcpy32(env1->regbase + env->nwindows * 16, env1->regbase);
+    if (new_cwp == env1->nwindows - 1)
+        memcpy32(env1->regbase + env1->nwindows * 16, env1->regbase);
     env1->regwptr = env1->regbase + (new_cwp * 16);
 }