From: David Hildenbrand <david@redhat.com>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Cc: thuth@redhat.com, qemu-s390x@nongnu.org, cohuck@redhat.com,
laurent@vivier.eu
Subject: Re: [PATCH v2 03/15] linux-user/s390x: Remove PSW_ADDR_AMODE
Date: Thu, 29 Apr 2021 09:11:31 +0200 [thread overview]
Message-ID: <475ff4d0-c580-4529-3468-e482bc0a9a5e@redhat.com> (raw)
In-Reply-To: <20210428193408.233706-4-richard.henderson@linaro.org>
On 28.04.21 21:33, Richard Henderson wrote:
> This is an unnecessary complication since we only
> support 64-bit mode.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> linux-user/s390x/signal.c | 17 ++++++-----------
> 1 file changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c
> index fece8ab97b..1dfca71fa9 100644
> --- a/linux-user/s390x/signal.c
> +++ b/linux-user/s390x/signal.c
> @@ -31,7 +31,6 @@
> #define _SIGCONTEXT_NSIG_BPW 64 /* FIXME: 31-bit mode -> 32 */
> #define _SIGCONTEXT_NSIG_WORDS (_SIGCONTEXT_NSIG / _SIGCONTEXT_NSIG_BPW)
> #define _SIGMASK_COPY_SIZE (sizeof(unsigned long)*_SIGCONTEXT_NSIG_WORDS)
> -#define PSW_ADDR_AMODE 0x0000000000000000UL /* 0x80000000UL for 31-bit */
> #define S390_SYSCALL_OPCODE ((uint16_t)0x0a00)
>
> typedef struct {
> @@ -148,11 +147,9 @@ void setup_frame(int sig, struct target_sigaction *ka,
> /* Set up to return from userspace. If provided, use a stub
> already in userspace. */
> if (ka->sa_flags & TARGET_SA_RESTORER) {
> - env->regs[14] = (unsigned long)
> - ka->sa_restorer | PSW_ADDR_AMODE;
> + env->regs[14] = ka->sa_restorer;
> } else {
> - env->regs[14] = (frame_addr + offsetof(sigframe, retcode))
> - | PSW_ADDR_AMODE;
> + env->regs[14] = frame_addr + offsetof(sigframe, retcode);
> __put_user(S390_SYSCALL_OPCODE | TARGET_NR_sigreturn,
> &frame->retcode);
> }
> @@ -162,7 +159,7 @@ void setup_frame(int sig, struct target_sigaction *ka,
>
> /* Set up registers for signal handler */
> env->regs[15] = frame_addr;
> - env->psw.addr = (target_ulong) ka->_sa_handler | PSW_ADDR_AMODE;
> + env->psw.addr = ka->_sa_handler;
>
> env->regs[2] = sig; //map_signal(sig);
> env->regs[3] = frame_addr += offsetof(typeof(*frame), sc);
> @@ -210,10 +207,9 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
> /* Set up to return from userspace. If provided, use a stub
> already in userspace. */
> if (ka->sa_flags & TARGET_SA_RESTORER) {
> - env->regs[14] = ka->sa_restorer | PSW_ADDR_AMODE;
> + env->regs[14] = ka->sa_restorer;
> } else {
> - env->regs[14] = (frame_addr + offsetof(typeof(*frame), retcode))
> - | PSW_ADDR_AMODE;
> + env->regs[14] = frame_addr + offsetof(typeof(*frame), retcode);
> __put_user(S390_SYSCALL_OPCODE | TARGET_NR_rt_sigreturn,
> &frame->retcode);
> }
> @@ -223,7 +219,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
>
> /* Set up registers for signal handler */
> env->regs[15] = frame_addr;
> - env->psw.addr = (target_ulong) ka->_sa_handler | PSW_ADDR_AMODE;
> + env->psw.addr = ka->_sa_handler;
>
> env->regs[2] = sig; //map_signal(sig);
> env->regs[3] = frame_addr + offsetof(typeof(*frame), info);
> @@ -248,7 +244,6 @@ restore_sigregs(CPUS390XState *env, target_sigregs *sc)
> trace_user_s390x_restore_sigregs(env, (unsigned long long)sc->regs.psw.addr,
> (unsigned long long)env->psw.addr);
> __get_user(env->psw.addr, &sc->regs.psw.addr);
> - /* FIXME: 31-bit -> | PSW_ADDR_AMODE */
>
> for (i = 0; i < 16; i++) {
> __get_user(env->aregs[i], &sc->regs.acrs[i]);
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
next prev parent reply other threads:[~2021-04-29 7:13 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-28 19:33 [PATCH v2 00/15] linux-user/s390x: some signal fixes Richard Henderson
2021-04-28 19:33 ` [PATCH v2 01/15] linux-user/s390x: Fix sigframe types Richard Henderson
2021-04-29 7:10 ` David Hildenbrand
2021-04-28 19:33 ` [PATCH v2 02/15] linux-user/s390x: Use uint16_t for signal retcode Richard Henderson
2021-04-29 7:10 ` David Hildenbrand
2021-04-28 19:33 ` [PATCH v2 03/15] linux-user/s390x: Remove PSW_ADDR_AMODE Richard Henderson
2021-04-29 7:11 ` David Hildenbrand [this message]
2021-04-28 19:33 ` [PATCH v2 04/15] linux-user/s390x: Remove restore_sigregs return value Richard Henderson
2021-04-29 7:11 ` David Hildenbrand
2021-04-28 19:33 ` [PATCH v2 05/15] linux-user/s390x: Fix trace in restore_regs Richard Henderson
2021-04-29 7:12 ` David Hildenbrand
2021-04-28 19:33 ` [PATCH v2 06/15] linux-user/s390x: Fix sigcontext sregs value Richard Henderson
2021-04-29 7:13 ` David Hildenbrand
2021-04-28 19:34 ` [PATCH v2 07/15] linux-user/s390x: Use tswap_sigset in setup_rt_frame Richard Henderson
2021-04-29 7:14 ` David Hildenbrand
2021-04-28 19:34 ` [PATCH v2 08/15] linux-user/s390x: Tidy save_sigregs Richard Henderson
2021-04-29 7:14 ` David Hildenbrand
2021-04-28 19:34 ` [PATCH v2 09/15] linux-user/s390x: Clean up single-use gotos in signal.c Richard Henderson
2021-04-29 7:15 ` David Hildenbrand
2021-04-28 19:34 ` [PATCH v2 10/15] linux-user/s390x: Set psw.mask properly for the signal handler Richard Henderson
2021-04-29 7:20 ` David Hildenbrand
2021-04-28 19:34 ` [PATCH v2 11/15] linux-user/s390x: Add stub sigframe argument for last_break Richard Henderson
2021-04-29 7:21 ` David Hildenbrand
2021-04-28 19:34 ` [PATCH v2 12/15] linux-user/s390x: Fix frame_addr corruption in setup_frame Richard Henderson
2021-04-29 7:21 ` David Hildenbrand
2021-04-28 19:34 ` [PATCH v2 13/15] linux-user/s390x: Add build asserts for sigset sizes Richard Henderson
2021-04-29 7:21 ` David Hildenbrand
2021-04-28 19:34 ` [PATCH v2 14/15] linux-user/s390x: Clean up signal.c Richard Henderson
2021-04-29 7:29 ` David Hildenbrand
2021-04-28 19:34 ` [PATCH v2 15/15] linux-user/s390x: Handle vector regs in signal stack Richard Henderson
2021-04-29 7:32 ` David Hildenbrand
2021-04-28 19:40 ` [PATCH v2 00/15] linux-user/s390x: some signal fixes Richard Henderson
2021-04-29 7:33 ` David Hildenbrand
2021-05-06 11:54 ` Cornelia Huck
2021-05-06 13:31 ` Laurent Vivier
2021-05-15 19:44 ` Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=475ff4d0-c580-4529-3468-e482bc0a9a5e@redhat.com \
--to=david@redhat.com \
--cc=cohuck@redhat.com \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.