diff options
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/main.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index bc8c1e6fe1..50e2da4dbf 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -808,11 +808,16 @@ static void save_window(CPUSPARCState *env) 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 @@ static void restore_window(CPUSPARCState *env) 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 @@ static void flush_windows(CPUSPARCState *env) 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++; } - /* set wim so that restore will reload the registers */ cwp1 = cpu_cwp_inc(env, env->cwp + 1); +#ifndef TARGET_SPARC64 + /* set wim so that restore will reload the registers */ env->wim = 1 << cwp1; +#endif #if defined(DEBUG_WIN) printf("flush_windows: nb=%d\n", offset - 1); #endif |