falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user: AArch64: Implement SA_RESTORER for signal handlers 

Implement support for signal handlers with the SA_RESTORER
flag set.

Signed-off-by: Michael Matz <matz@suse.de>
[PMM: minor tweaks to make patch apply to current master]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Michael Matz 2014-03-02 19:36:39 +00:00 committed by Riku Voipio
parent 4cf2348026
commit 8a3ae9109e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
linux-user/signal.c
View File

@ -1273,7 +1273,7 @@ static void target_setup_frame(int usig, struct target_sigaction *ka,
CPUARMState *env) CPUARMState *env)
{ {
struct target_rt_sigframe *frame; struct target_rt_sigframe *frame;
abi_ulong frame_addr; abi_ulong frame_addr, return_addr;
frame_addr = get_sigframe(ka, env); frame_addr = get_sigframe(ka, env);
if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) { if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) {
@ -1290,15 +1290,19 @@ static void target_setup_frame(int usig, struct target_sigaction *ka,
__put_user(target_sigaltstack_used.ss_size, __put_user(target_sigaltstack_used.ss_size,
&frame->uc.tuc_stack.ss_size); &frame->uc.tuc_stack.ss_size);
target_setup_sigframe(frame, env, set); target_setup_sigframe(frame, env, set);
/* mov x8,#__NR_rt_sigreturn; svc #0 */ if (ka->sa_flags & TARGET_SA_RESTORER) {
__put_user(0xd2801168, &frame->tramp[0]); return_addr = ka->sa_restorer;
__put_user(0xd4000001, &frame->tramp[1]); } else {
/* mov x8,#__NR_rt_sigreturn; svc #0 */
__put_user(0xd2801168, &frame->tramp[0]);
__put_user(0xd4000001, &frame->tramp[1]);
return_addr = frame_addr + offsetof(struct target_rt_sigframe, tramp);
}
env->xregs[0] = usig; env->xregs[0] = usig;
env->xregs[31] = frame_addr; env->xregs[31] = frame_addr;
env->xregs[29] = env->xregs[31] + offsetof(struct target_rt_sigframe, fp); env->xregs[29] = env->xregs[31] + offsetof(struct target_rt_sigframe, fp);
env->pc = ka->_sa_handler; env->pc = ka->_sa_handler;
env->xregs[30] = env->xregs[31] + env->xregs[30] = return_addr;
offsetof(struct target_rt_sigframe, tramp);
if (info) { if (info) {
if (copy_siginfo_to_user(&frame->info, info)) { if (copy_siginfo_to_user(&frame->info, info)) {
goto give_sigsegv; goto give_sigsegv;