[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [5091] Fix Sparc64 window handling problems detected by Vin
From: |
Blue Swirl |
Subject: |
[Qemu-devel] [5091] Fix Sparc64 window handling problems detected by Vince Weaver |
Date: |
Wed, 27 Aug 2008 19:19:45 +0000 |
Revision: 5091
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5091
Author: blueswir1
Date: 2008-08-27 19:19:44 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
Fix Sparc64 window handling problems detected by Vince Weaver
Modified Paths:
--------------
trunk/linux-user/main.c
Modified: trunk/linux-user/main.c
===================================================================
--- trunk/linux-user/main.c 2008-08-27 18:43:53 UTC (rev 5090)
+++ trunk/linux-user/main.c 2008-08-27 19:19:44 UTC (rev 5091)
@@ -808,11 +808,16 @@
static void restore_window(CPUSPARCState *env)
{
- unsigned int new_wim, i, cwp1;
+#ifndef TARGET_SPARC64
+ unsigned int new_wim;
+#endif
+ unsigned int i, cwp1;
abi_ulong sp_ptr;
+#ifndef TARGET_SPARC64
new_wim = ((env->wim << 1) | (env->wim >> (env->nwindows - 1))) &
((1LL << env->nwindows) - 1);
+#endif
/* restore the invalid window */
cwp1 = cpu_cwp_inc(env, env->cwp + 1);
@@ -826,12 +831,13 @@
get_user_ual(env->regbase[get_reg_index(env, cwp1, 8 + i)], sp_ptr);
sp_ptr += sizeof(abi_ulong);
}
- env->wim = new_wim;
#ifdef TARGET_SPARC64
env->canrestore++;
if (env->cleanwin < env->nwindows - 1)
env->cleanwin++;
env->cansave--;
+#else
+ env->wim = new_wim;
#endif
}
@@ -843,14 +849,23 @@
for(;;) {
/* if restore would invoke restore_window(), then we can stop */
cwp1 = cpu_cwp_inc(env, env->cwp + offset);
+#ifndef TARGET_SPARC64
if (env->wim & (1 << cwp1))
break;
+#else
+ if (env->canrestore == 0)
+ break;
+ env->cansave++;
+ env->canrestore--;
+#endif
save_window_offset(env, cwp1);
offset++;
}
+ cwp1 = cpu_cwp_inc(env, env->cwp + 1);
+#ifndef TARGET_SPARC64
/* set wim so that restore will reload the registers */
- cwp1 = cpu_cwp_inc(env, env->cwp + 1);
env->wim = 1 << cwp1;
+#endif
#if defined(DEBUG_WIN)
printf("flush_windows: nb=%d\n", offset - 1);
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [5091] Fix Sparc64 window handling problems detected by Vince Weaver,
Blue Swirl <=