From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LeZ1P-0001ZK-4y
	for qemu-devel@nongnu.org; Tue, 03 Mar 2009 13:07:15 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LeZ1O-0001Yc-1l
	for qemu-devel@nongnu.org; Tue, 03 Mar 2009 13:07:14 -0500
Received: from [199.232.76.173] (port=43469 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LeZ1N-0001YN-QZ
	for qemu-devel@nongnu.org; Tue, 03 Mar 2009 13:07:13 -0500
Received: from savannah.gnu.org ([199.232.41.3]:36619 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 <edgar.iglesias@gmail.com>)
	id 1LeZ1N-000614-CJ
	for qemu-devel@nongnu.org; Tue, 03 Mar 2009 13:07:13 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <edgar.iglesias@gmail.com>) id 1LeZ1M-0008RP-5P
	for qemu-devel@nongnu.org; Tue, 03 Mar 2009 18:07:12 +0000
Received: from edgar_igl by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <edgar_igl@savannah.gnu.org>) id 1LeZ1L-0008RJ-UE
	for qemu-devel@nongnu.org; Tue, 03 Mar 2009 18:07:12 +0000
MIME-Version: 1.0
Errors-To: edgar_igl
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Message-Id: <E1LeZ1L-0008RJ-UE@cvs.savannah.gnu.org>
Date: Tue, 03 Mar 2009 18:07:11 +0000
Subject: [Qemu-devel] [6679] CRIS: Avoid endless loops for unstested CRIS
	cpu-state load/save.
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: 6679
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6679
Author:   edgar_igl
Date:     2009-03-03 18:07:11 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
CRIS: Avoid endless loops for unstested CRIS cpu-state load/save.

Fix several endless loops.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>

Modified Paths:
--------------
    trunk/target-cris/machine.c

Modified: trunk/target-cris/machine.c
===================================================================
--- trunk/target-cris/machine.c	2009-03-03 17:37:21 UTC (rev 6678)
+++ trunk/target-cris/machine.c	2009-03-03 18:07:11 UTC (rev 6679)
@@ -34,14 +34,14 @@
     qemu_put_be32(f, env->cc_size);
     qemu_put_be32(f, env->cc_x);
 
-    for (s = 0; s < 4; i++) {
+    for (s = 0; s < 4; s++) {
         for (i = 0; i < 16; i++)
             qemu_put_be32(f, env->sregs[s][i]);
     }
 
     qemu_put_be32(f, env->mmu_rand_lfsr);
     for (mmu = 0; mmu < 2; mmu++) {
-        for (s = 0; s < 4; i++) {
+        for (s = 0; s < 4; s++) {
             for (i = 0; i < 16; i++) {
                 qemu_put_be32(f, env->tlbsets[mmu][s][i].lo);
                 qemu_put_be32(f, env->tlbsets[mmu][s][i].hi);
@@ -77,14 +77,14 @@
     env->cc_size = qemu_get_be32(f);
     env->cc_x = qemu_get_be32(f);
 
-    for (s = 0; s < 4; i++) {
+    for (s = 0; s < 4; s++) {
         for (i = 0; i < 16; i++)
             env->sregs[s][i] = qemu_get_be32(f);
     }
 
     env->mmu_rand_lfsr = qemu_get_be32(f);
     for (mmu = 0; mmu < 2; mmu++) {
-        for (s = 0; s < 4; i++) {
+        for (s = 0; s < 4; s++) {
             for (i = 0; i < 16; i++) {
                 env->tlbsets[mmu][s][i].lo = qemu_get_be32(f);
                 env->tlbsets[mmu][s][i].hi = qemu_get_be32(f);