CRIS: Avoid endless loops for unstested CRIS cpu-state load/save.

Fix several endless loops.

Signed-off-by: Stefan Weil <[email protected]>
Acked-by: Edgar E. Iglesias <[email protected]>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6679 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/target-cris/machine.c b/target-cris/machine.c
index b17db232141c66ffa06e5d7b2f8acde9cd3e4bf1..2d3396d8b35882421c43e3ddae8ccdc7caa2e31b 100644 (file)
--- a/target-cris/machine.c
+++ b/target-cris/machine.c
@@ -34,14 +34,14 @@ void cpu_save(QEMUFile *f, void *opaque)
     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 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
     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);