Refactor translation block CPU state handling (Jan Kiszka)

[qemu] / target-sparc / machine.c

diff --git a/target-sparc/machine.c b/target-sparc/machine.c
index 5d4d2eb..417523f 100644 (file)
--- a/target-sparc/machine.c
+++ b/target-sparc/machine.c
@@ -9,6 +9,7 @@ void register_machines(void)
 #ifdef TARGET_SPARC64
     qemu_register_machine(&sun4u_machine);
     qemu_register_machine(&sun4v_machine);
+    qemu_register_machine(&niagara_machine);
 #else
     qemu_register_machine(&ss5_machine);
     qemu_register_machine(&ss10_machine);
@@ -31,6 +32,10 @@ void cpu_save(QEMUFile *f, void *opaque)
     int i;
     uint32_t tmp;
 
+    // if env->cwp == env->nwindows - 1, this will set the ins of the last
+    // window as the outs of the first window
+    cpu_set_cwp(env, env->cwp);
+
     for(i = 0; i < 8; i++)
         qemu_put_betls(f, &env->gregs[i]);
     qemu_put_be32s(f, &env->nwindows);
@@ -54,6 +59,9 @@ void cpu_save(QEMUFile *f, void *opaque)
     qemu_put_be32(f, tmp);
     qemu_put_betls(f, &env->fsr);
     qemu_put_betls(f, &env->tbr);
+    tmp = env->interrupt_index;
+    qemu_put_be32(f, tmp);
+    qemu_put_be32s(f, &env->pil_in);
 #ifndef TARGET_SPARC64
     qemu_put_be32s(f, &env->wim);
     /* MMU */
@@ -72,7 +80,7 @@ void cpu_save(QEMUFile *f, void *opaque)
         qemu_put_be64s(f, &env->dtlb_tte[i]);
     }
     qemu_put_be32s(f, &env->mmu_version);
-    for (i = 0; i < MAXTL; i++) {
+    for (i = 0; i < MAXTL_MAX; i++) {
         qemu_put_be64s(f, &env->ts[i].tpc);
         qemu_put_be64s(f, &env->ts[i].tnpc);
         qemu_put_be64s(f, &env->ts[i].tstate);
@@ -103,14 +111,14 @@ void cpu_save(QEMUFile *f, void *opaque)
     qemu_put_be64s(f, &env->gsr);
     qemu_put_be32s(f, &env->gl);
     qemu_put_be64s(f, &env->hpstate);
-    for (i = 0; i < MAXTL; i++)
+    for (i = 0; i < MAXTL_MAX; i++)
         qemu_put_be64s(f, &env->htstate[i]);
     qemu_put_be64s(f, &env->hintp);
     qemu_put_be64s(f, &env->htba);
     qemu_put_be64s(f, &env->hver);
     qemu_put_be64s(f, &env->hstick_cmpr);
     qemu_put_be64s(f, &env->ssr);
-    qemu_get_ptimer(f, env->hstick);
+    qemu_put_ptimer(f, env->hstick);
 #endif
 }
 
@@ -147,6 +155,9 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
     PUT_PSR(env, tmp);
     qemu_get_betls(f, &env->fsr);
     qemu_get_betls(f, &env->tbr);
+    tmp = qemu_get_be32(f);
+    env->interrupt_index = tmp;
+    qemu_get_be32s(f, &env->pil_in);
 #ifndef TARGET_SPARC64
     qemu_get_be32s(f, &env->wim);
     /* MMU */
@@ -165,7 +176,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
         qemu_get_be64s(f, &env->dtlb_tte[i]);
     }
     qemu_get_be32s(f, &env->mmu_version);
-    for (i = 0; i < MAXTL; i++) {
+    for (i = 0; i < MAXTL_MAX; i++) {
         qemu_get_be64s(f, &env->ts[i].tpc);
         qemu_get_be64s(f, &env->ts[i].tnpc);
         qemu_get_be64s(f, &env->ts[i].tstate);
@@ -175,7 +186,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
     qemu_get_be32s(f, &env->asi);
     qemu_get_be32s(f, &env->pstate);
     qemu_get_be32s(f, &env->tl);
-    env->tsptr = &env->ts[env->tl];
+    env->tsptr = &env->ts[env->tl & MAXTL_MASK];
     qemu_get_be32s(f, &env->cansave);
     qemu_get_be32s(f, &env->canrestore);
     qemu_get_be32s(f, &env->otherwin);
@@ -197,7 +208,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
     qemu_get_be64s(f, &env->gsr);
     qemu_get_be32s(f, &env->gl);
     qemu_get_be64s(f, &env->hpstate);
-    for (i = 0; i < MAXTL; i++)
+    for (i = 0; i < MAXTL_MAX; i++)
         qemu_get_be64s(f, &env->htstate[i]);
     qemu_get_be64s(f, &env->hintp);
     qemu_get_be64s(f, &env->htba);