Skip to content

Commit

Permalink
linux-user/hppa: Fix setup_sigcontext()
Browse files Browse the repository at this point in the history
We don't emulate a preemptive kernel on this level, and the hppa architecture
doesn't allow context switches on the gateway page. So we always have to return
to sc_iaoq[] and not to gr[31].
This fixes the remaining random segfaults which still occured.

Signed-off-by: Helge Deller <deller@gmx.de>
Message-Id: <20220924114501.21767-8-deller@gmx.de>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
  • Loading branch information
hdeller authored and vivier committed Sep 27, 2022
1 parent 4c184e7 commit 2319a53
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions linux-user/hppa/signal.c
Expand Up @@ -49,23 +49,13 @@ struct target_rt_sigframe {

static void setup_sigcontext(struct target_sigcontext *sc, CPUArchState *env)
{
int flags = 0;
int i;

/* ??? if on_sig_stack, flags |= 1 (PARISC_SC_FLAG_ONSTACK). */

if (env->iaoq_f < TARGET_PAGE_SIZE) {
/* In the gateway page, executing a syscall. */
flags |= 2; /* PARISC_SC_FLAG_IN_SYSCALL */
__put_user(env->gr[31], &sc->sc_iaoq[0]);
__put_user(env->gr[31] + 4, &sc->sc_iaoq[1]);
} else {
__put_user(env->iaoq_f, &sc->sc_iaoq[0]);
__put_user(env->iaoq_b, &sc->sc_iaoq[1]);
}
__put_user(env->iaoq_f, &sc->sc_iaoq[0]);
__put_user(env->iaoq_b, &sc->sc_iaoq[1]);
__put_user(0, &sc->sc_iasq[0]);
__put_user(0, &sc->sc_iasq[1]);
__put_user(flags, &sc->sc_flags);
__put_user(0, &sc->sc_flags);

__put_user(cpu_hppa_get_psw(env), &sc->sc_gr[0]);
for (i = 1; i < 32; ++i) {
Expand Down

0 comments on commit 2319a53

Please sign in to comment.