gwj / at91sam9263 · Commits

Commit d488ddd8352e1e25f13e9c1f644dd1d7ebc0b342

Authored by edgar_igl
1 parent 5368a422

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>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6679 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
target-cris/machine.c
  View file @d488ddd
@@ -34,14 +34,14 @@ void cpu_save(QEMUFile *f, void *opaque) @@ -34,14 +34,14 @@ void cpu_save(QEMUFile *f, void *opaque)
34 qemu_put_be32(f, env->cc_size); 34 qemu_put_be32(f, env->cc_size);
35 qemu_put_be32(f, env->cc_x); 35 qemu_put_be32(f, env->cc_x);
36 36
37 - for (s = 0; s < 4; i++) { 37 + for (s = 0; s < 4; s++) {
38 for (i = 0; i < 16; i++) 38 for (i = 0; i < 16; i++)
39 qemu_put_be32(f, env->sregs[s][i]); 39 qemu_put_be32(f, env->sregs[s][i]);
40 } 40 }
41 41
42 qemu_put_be32(f, env->mmu_rand_lfsr); 42 qemu_put_be32(f, env->mmu_rand_lfsr);
43 for (mmu = 0; mmu < 2; mmu++) { 43 for (mmu = 0; mmu < 2; mmu++) {
44 - for (s = 0; s < 4; i++) { 44 + for (s = 0; s < 4; s++) {
45 for (i = 0; i < 16; i++) { 45 for (i = 0; i < 16; i++) {
46 qemu_put_be32(f, env->tlbsets[mmu][s][i].lo); 46 qemu_put_be32(f, env->tlbsets[mmu][s][i].lo);
47 qemu_put_be32(f, env->tlbsets[mmu][s][i].hi); 47 qemu_put_be32(f, env->tlbsets[mmu][s][i].hi);
@@ -77,14 +77,14 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) @@ -77,14 +77,14 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
77 env->cc_size = qemu_get_be32(f); 77 env->cc_size = qemu_get_be32(f);
78 env->cc_x = qemu_get_be32(f); 78 env->cc_x = qemu_get_be32(f);
79 79
80 - for (s = 0; s < 4; i++) { 80 + for (s = 0; s < 4; s++) {
81 for (i = 0; i < 16; i++) 81 for (i = 0; i < 16; i++)
82 env->sregs[s][i] = qemu_get_be32(f); 82 env->sregs[s][i] = qemu_get_be32(f);
83 } 83 }
84 84
85 env->mmu_rand_lfsr = qemu_get_be32(f); 85 env->mmu_rand_lfsr = qemu_get_be32(f);
86 for (mmu = 0; mmu < 2; mmu++) { 86 for (mmu = 0; mmu < 2; mmu++) {
87 - for (s = 0; s < 4; i++) { 87 + for (s = 0; s < 4; s++) {
88 for (i = 0; i < 16; i++) { 88 for (i = 0; i < 16; i++) {
89 env->tlbsets[mmu][s][i].lo = qemu_get_be32(f); 89 env->tlbsets[mmu][s][i].lo = qemu_get_be32(f);
90 env->tlbsets[mmu][s][i].hi = qemu_get_be32(f); 90 env->tlbsets[mmu][s][i].hi = qemu_get_be32(f);