mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-14 23:13:30 +00:00
linux-user/sparc64: Fix the handling of window spill trap
Fix the handling of window spill traps by keeping cansave into account when calculating the new CWP. Signed-off-by: Giuseppe Musacchio <thatlemon@gmail.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20200625091204.3186186-3-laurent@vivier.eu>
This commit is contained in:
parent
aa04c9d9ef
commit
d43624c400
|
@ -413,7 +413,11 @@ static void save_window(CPUSPARCState *env)
|
||||||
save_window_offset(env, cpu_cwp_dec(env, env->cwp - 2));
|
save_window_offset(env, cpu_cwp_dec(env, env->cwp - 2));
|
||||||
env->wim = new_wim;
|
env->wim = new_wim;
|
||||||
#else
|
#else
|
||||||
save_window_offset(env, cpu_cwp_dec(env, env->cwp - 2));
|
/*
|
||||||
|
* cansave is zero if the spill trap handler is triggered by `save` and
|
||||||
|
* nonzero if triggered by a `flushw`
|
||||||
|
*/
|
||||||
|
save_window_offset(env, cpu_cwp_dec(env, env->cwp - env->cansave - 2));
|
||||||
env->cansave++;
|
env->cansave++;
|
||||||
env->canrestore--;
|
env->canrestore--;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -69,7 +69,11 @@ static void save_window(CPUSPARCState *env)
|
||||||
save_window_offset(env, cpu_cwp_dec(env, env->cwp - 2));
|
save_window_offset(env, cpu_cwp_dec(env, env->cwp - 2));
|
||||||
env->wim = new_wim;
|
env->wim = new_wim;
|
||||||
#else
|
#else
|
||||||
save_window_offset(env, cpu_cwp_dec(env, env->cwp - 2));
|
/*
|
||||||
|
* cansave is zero if the spill trap handler is triggered by `save` and
|
||||||
|
* nonzero if triggered by a `flushw`
|
||||||
|
*/
|
||||||
|
save_window_offset(env, cpu_cwp_dec(env, env->cwp - env->cansave - 2));
|
||||||
env->cansave++;
|
env->cansave++;
|
||||||
env->canrestore--;
|
env->canrestore--;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue