diff options
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/main.c | 7 | ||||
| -rw-r--r-- | linux-user/microblaze/target_signal.h | 1 | ||||
| -rw-r--r-- | linux-user/signal.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index c5da418fa4..b2bc6ab2f7 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2982,7 +2982,12 @@ void cpu_loop(CPUMBState *env) env->regs[9], env->regs[10], 0, 0); - env->regs[3] = ret; + if (ret == -TARGET_ERESTARTSYS) { + /* Wind back to before the syscall. */ + env->sregs[SR_PC] -= 4; + } else if (ret != -TARGET_QEMU_ESIGRETURN) { + env->regs[3] = ret; + } /* All syscall exits result in guest r14 being equal to the * PC we return to, because the kernel syscall exit "rtbd" does * this. (This is true even for sigreturn(); note that r14 is diff --git a/linux-user/microblaze/target_signal.h b/linux-user/microblaze/target_signal.h index 3d1f7a7238..acdf3b5acd 100644 --- a/linux-user/microblaze/target_signal.h +++ b/linux-user/microblaze/target_signal.h @@ -26,4 +26,5 @@ static inline abi_ulong get_sp_from_cpustate(CPUMBState *state) return state->regs[14]; } + #endif /* TARGET_SIGNAL_H */ diff --git a/linux-user/signal.c b/linux-user/signal.c index b4641dffb8..9e8555096a 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -3618,7 +3618,7 @@ long do_sigreturn(CPUMBState *env) env->regs[14] = env->sregs[SR_PC]; unlock_user_struct(frame, frame_addr, 0); - return env->regs[10]; + return -TARGET_QEMU_ESIGRETURN; badframe: force_sig(TARGET_SIGSEGV); } |