Re: [Qemu-devel] [4721] CRIS: Add (untested) cpu-state save/load.

[Stefan Weil <weil@mail.berlios.de>]

[-- Attachment #1: Type: text/plain, Size: 643 bytes --]

Edgar E. Iglesias schrieb:
> Revision: 4721
> http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4721
> Author: edgar_igl
> Date: 2008-06-09 23:44:20 +0000 (Mon, 09 Jun 2008)
>
> Log Message:
> -----------
> CRIS: Add (untested) cpu-state save/load.
>
> Modified Paths:
> --------------
> trunk/hw/etraxfs.c
> trunk/target-cris/machine.c

It's indeed untested and even unused. Using compiler option
-Wmissing-noreturn I detected several endless loops.

The appended patch fixes them - please apply it to Qemu trunk.

Regards

Stefan Weil


PS. Antony, maybe such bugs might be a good reason to use
    the -Wmissing-noreturn option!




[-- Attachment #2: cris.patch --]
[-- Type: text/x-diff, Size: 1391 bytes --]

Fix several endless loops.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>

Index: target-cris/machine.c
===================================================================
--- target-cris/machine.c	(Revision 6676)
+++ target-cris/machine.c	(Arbeitskopie)
@@ -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);