[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 07/68] linux-user/nios2: Use QEMU_ESIGRETURN from do_rt_sigret
From: |
Richard Henderson |
Subject: |
[PATCH v8 07/68] linux-user/nios2: Use QEMU_ESIGRETURN from do_rt_sigreturn |
Date: |
Fri, 22 Apr 2022 09:51:37 -0700 |
Drop the kernel-specific "pr2" code structure and use
the qemu-specific error return value.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220421151735.31996-8-richard.henderson@linaro.org>
---
linux-user/nios2/signal.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/linux-user/nios2/signal.c b/linux-user/nios2/signal.c
index 133bc05673..9aa525e723 100644
--- a/linux-user/nios2/signal.c
+++ b/linux-user/nios2/signal.c
@@ -77,8 +77,7 @@ static void rt_setup_ucontext(struct target_ucontext *uc,
CPUNios2State *env)
__put_user(env->regs[R_SP], &gregs[28]);
}
-static int rt_restore_ucontext(CPUNios2State *env, struct target_ucontext *uc,
- int *pr2)
+static int rt_restore_ucontext(CPUNios2State *env, struct target_ucontext *uc)
{
int temp;
unsigned long *gregs = uc->tuc_mcontext.gregs;
@@ -128,8 +127,6 @@ static int rt_restore_ucontext(CPUNios2State *env, struct
target_ucontext *uc,
__get_user(env->regs[R_SP], &gregs[28]);
target_restore_altstack(&uc->tuc_stack, env);
-
- *pr2 = env->regs[2];
return 0;
}
@@ -191,7 +188,6 @@ long do_rt_sigreturn(CPUNios2State *env)
abi_ulong frame_addr = env->regs[R_SP];
struct target_rt_sigframe *frame;
sigset_t set;
- int rval;
if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) {
goto badframe;
@@ -200,15 +196,15 @@ long do_rt_sigreturn(CPUNios2State *env)
target_to_host_sigset(&set, &frame->uc.tuc_sigmask);
set_sigmask(&set);
- if (rt_restore_ucontext(env, &frame->uc, &rval)) {
+ if (rt_restore_ucontext(env, &frame->uc)) {
goto badframe;
}
unlock_user_struct(frame, frame_addr, 0);
- return rval;
+ return -QEMU_ESIGRETURN;
badframe:
unlock_user_struct(frame, frame_addr, 0);
force_sig(TARGET_SIGSEGV);
- return 0;
+ return -QEMU_ESIGRETURN;
}
--
2.34.1
- [PATCH v8 00/68] nios2 fixes, cleanups, shadow reg sets, Richard Henderson, 2022/04/22
- [PATCH v8 02/68] linux-user/nios2: Fix clone child return, Richard Henderson, 2022/04/22
- [PATCH v8 03/68] linux-user/nios2: Drop syscall 0 "workaround", Richard Henderson, 2022/04/22
- [PATCH v8 04/68] linux-user/nios2: Adjust error return, Richard Henderson, 2022/04/22
- [PATCH v8 01/68] linux-user/nios2: Hoist pc advance to the top of EXCP_TRAP, Richard Henderson, 2022/04/22
- [PATCH v8 05/68] linux-user/nios2: Handle special qemu syscall return values, Richard Henderson, 2022/04/22
- [PATCH v8 06/68] linux-user/nios2: Remove do_sigreturn, Richard Henderson, 2022/04/22
- [PATCH v8 07/68] linux-user/nios2: Use QEMU_ESIGRETURN from do_rt_sigreturn,
Richard Henderson <=
- [PATCH v8 08/68] tests/tcg/nios2: Re-enable linux-user tests, Richard Henderson, 2022/04/22
- [PATCH v8 09/68] target/nios2: Remove user-only nios2_cpu_do_interrupt, Richard Henderson, 2022/04/22
- [PATCH v8 10/68] target/nios2: Remove nios2_cpu_record_sigsegv, Richard Henderson, 2022/04/22
- [PATCH v8 11/68] target/nios2: Build helper.c for system only, Richard Henderson, 2022/04/22
- [PATCH v8 12/68] linux-user/nios2: Use force_sig_fault for EXCP_DEBUG, Richard Henderson, 2022/04/22
- [PATCH v8 14/68] target/nios2: Stop generating code if gen_check_supervisor fails, Richard Henderson, 2022/04/22
- [PATCH v8 13/68] target/nios2: Check supervisor on eret, Richard Henderson, 2022/04/22
- [PATCH v8 16/68] target/nios2: Split PC out of env->regs[], Richard Henderson, 2022/04/22
- [PATCH v8 18/68] target/nios2: Fix BRET instruction, Richard Henderson, 2022/04/22
- [PATCH v8 19/68] target/nios2: Do not create TCGv for control registers, Richard Henderson, 2022/04/22