OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

accel/tcg: Move clear_helper_retaddr to cpu loop 

Currently there are only two places that require we reset this
value before exiting to the main loop, but that will change.

Reviewed-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-09-13 13:01:07 -07:00
parent 0fdbb7d2c1
commit f920ffdd8e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
accel/tcg/cpu-exec.c
View File

@ -462,6 +462,7 @@ void cpu_exec_step_atomic(CPUState *cpu)
* memory. * memory.
*/ */
#ifndef CONFIG_SOFTMMU #ifndef CONFIG_SOFTMMU
clear_helper_retaddr();
tcg_debug_assert(!have_mmap_lock()); tcg_debug_assert(!have_mmap_lock());
#endif #endif
if (qemu_mutex_iothread_locked()) { if (qemu_mutex_iothread_locked()) {
@ -471,7 +472,6 @@ void cpu_exec_step_atomic(CPUState *cpu)
qemu_plugin_disable_mem_helpers(cpu); qemu_plugin_disable_mem_helpers(cpu);
} }
/* /*
* As we start the exclusive region before codegen we must still * As we start the exclusive region before codegen we must still
* be in the region if we longjump out of either the codegen or * be in the region if we longjump out of either the codegen or
@ -916,6 +916,7 @@ int cpu_exec(CPUState *cpu)
#endif #endif
#ifndef CONFIG_SOFTMMU #ifndef CONFIG_SOFTMMU
clear_helper_retaddr();
tcg_debug_assert(!have_mmap_lock()); tcg_debug_assert(!have_mmap_lock());
#endif #endif
if (qemu_mutex_iothread_locked()) { if (qemu_mutex_iothread_locked()) {

2
accel/tcg/user-exec.c
View File

@ -175,7 +175,6 @@ static inline int handle_cpu_signal(uintptr_t pc, siginfo_t *info,
* currently executing TB was modified and must be exited * currently executing TB was modified and must be exited
* immediately. Clear helper_retaddr for next execution. * immediately. Clear helper_retaddr for next execution.
*/ */
clear_helper_retaddr();
cpu_exit_tb_from_sighandler(cpu, old_set); cpu_exit_tb_from_sighandler(cpu, old_set);
/* NORETURN */ /* NORETURN */
@ -193,7 +192,6 @@ static inline int handle_cpu_signal(uintptr_t pc, siginfo_t *info,
* an exception. Undo signal and retaddr state prior to longjmp. * an exception. Undo signal and retaddr state prior to longjmp.
*/ */
sigprocmask(SIG_SETMASK, old_set, NULL); sigprocmask(SIG_SETMASK, old_set, NULL);
clear_helper_retaddr();
cc = CPU_GET_CLASS(cpu); cc = CPU_GET_CLASS(cpu);
cc->tcg_ops->tlb_fill(cpu, address, 0, access_type, cc->tcg_ops->tlb_fill(cpu, address, 0, access_type,