diff options
| author | Richard Henderson | 2022-04-21 17:16:36 +0200 |
|---|---|---|
| committer | Richard Henderson | 2022-04-26 17:16:40 +0200 |
| commit | b9ef5b31389c3b02b594168f3730f40a9c1bd7b3 (patch) | |
| tree | e70a7008e89ea3efcb4d2d93e61176cde89eb4b8 | |
| parent | linux-user/nios2: Adjust error return (diff) | |
| download | qemu-b9ef5b31389c3b02b594168f3730f40a9c1bd7b3.tar.gz qemu-b9ef5b31389c3b02b594168f3730f40a9c1bd7b3.tar.xz qemu-b9ef5b31389c3b02b594168f3730f40a9c1bd7b3.zip | |
linux-user/nios2: Handle special qemu syscall return values
Honor QEMU_ESIGRETURN and QEMU_ERESTARTSYS.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220421151735.31996-6-richard.henderson@linaro.org>
| -rw-r--r-- | linux-user/nios2/cpu_loop.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c index 63afba5862..2963fc62b4 100644 --- a/linux-user/nios2/cpu_loop.c +++ b/linux-user/nios2/cpu_loop.c @@ -55,6 +55,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 the code after translate_rc_and_ret: all negative * values are errors (aided by userspace restricted to 2G), |