diff mbox series

[4/7] linux-user/nios2: Handle special qemu syscall return values

Message ID 20220320160009.2665152-5-richard.henderson@linaro.org
State New
Headers show
Series linux-user/nios2: Fix clone and sigreturn | expand

Commit Message

Richard Henderson March 20, 2022, 4 p.m. UTC 
Honor QEMU_ESIGRETURN and QEMU_ERESTARTSYS.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/nios2/cpu_loop.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Peter Maydell March 25, 2022, 12:13 p.m. UTC | #1 
On Sun, 20 Mar 2022 at 16:06, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> Honor QEMU_ESIGRETURN and QEMU_ERESTARTSYS.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  linux-user/nios2/cpu_loop.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c
> index 2ae94f4a95..d12c3c2852 100644
> --- a/linux-user/nios2/cpu_loop.c
> +++ b/linux-user/nios2/cpu_loop.c
> @@ -48,6 +48,14 @@ void cpu_loop(CPUNios2State *env)
>                                   env->regs[7], env->regs[8], env->regs[9],
>                                   0, 0);
>
> +                if (ret == -QEMU_ESIGRETURN) {
> +                    /* rt_sigreturn has set all state. */
> +                    break;
> +                }
> +                if (ret == -QEMU_ERESTARTSYS) {
> +                    env->regs[R_PC] -= 4;
> +                    break;
> +                }

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM
diff mbox series

Patch

diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c
index 2ae94f4a95..d12c3c2852 100644
--- a/linux-user/nios2/cpu_loop.c
+++ b/linux-user/nios2/cpu_loop.c
@@ -48,6 +48,14 @@  void cpu_loop(CPUNios2State *env)
                                  env->regs[7], env->regs[8], env->regs[9],
                                  0, 0);
 
+                if (ret == -QEMU_ESIGRETURN) {
+                    /* rt_sigreturn has set all state. */
+                    break;
+                }
+                if (ret == -QEMU_ERESTARTSYS) {
+                    env->regs[R_PC] -= 4;
+                    break;
+                }
                 /*
                  * See syscall_set_return_value.
                  * Use the QEMU traditional -515 error indication in