ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user: Implement force_sigsegv() via force_sig() 

Now that we have a force_sig() with the semantics we need,
we can implement force_sigsegv() to call it rather than
open-coding the call to queue_signal().

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Peter Maydell 2016-07-28 16:44:50 +01:00 committed by Riku Voipio
parent c599d4d6d6
commit c4b3574402
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
linux-user/signal.c
View File

@ -512,8 +512,7 @@ void signal_init(void)
} }
} }
#if !defined(TARGET_OPENRISC) && !defined(TARGET_UNICORE32) && \ #if !(defined(TARGET_X86_64) || defined(TARGET_UNICORE32))
!defined(TARGET_X86_64)
/* Force a synchronously taken signal. The kernel force_sig() function /* Force a synchronously taken signal. The kernel force_sig() function
* also forces the signal to "not blocked, not ignored", but for QEMU * also forces the signal to "not blocked, not ignored", but for QEMU
* that work is done in process_pending_signals(). * that work is done in process_pending_signals().
@ -531,9 +530,6 @@ static void force_sig(int sig)
info._sifields._kill._uid = 0; info._sifields._kill._uid = 0;
queue_signal(env, info.si_signo, QEMU_SI_KILL, &info); queue_signal(env, info.si_signo, QEMU_SI_KILL, &info);
} }
#endif
#if !(defined(TARGET_X86_64) || defined(TARGET_UNICORE32))
/* Force a SIGSEGV if we couldn't write to memory trying to set /* Force a SIGSEGV if we couldn't write to memory trying to set
* up the signal frame. oldsig is the signal we were trying to handle * up the signal frame. oldsig is the signal we were trying to handle
@ -541,22 +537,13 @@ static void force_sig(int sig)
*/ */
static void force_sigsegv(int oldsig) static void force_sigsegv(int oldsig)
{ {
CPUState *cpu = thread_cpu;
CPUArchState *env = cpu->env_ptr;
target_siginfo_t info;
if (oldsig == SIGSEGV) { if (oldsig == SIGSEGV) {
/* Make sure we don't try to deliver the signal again; this will /* Make sure we don't try to deliver the signal again; this will
* end up with handle_pending_signal() calling dump_core_and_abort(). * end up with handle_pending_signal() calling dump_core_and_abort().
*/ */
sigact_table[oldsig - 1]._sa_handler = TARGET_SIG_DFL; sigact_table[oldsig - 1]._sa_handler = TARGET_SIG_DFL;
} }
info.si_signo = TARGET_SIGSEGV; force_sig(TARGET_SIGSEGV);
info.si_errno = 0;
info.si_code = TARGET_SI_KERNEL;
info._sifields._kill._pid = 0;
info._sifields._kill._uid = 0;
queue_signal(env, info.si_signo, QEMU_SI_KILL, &info);
} }
#endif #endif