From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: thuth@redhat.com, qemu-s390x@nongnu.org, cohuck@redhat.com,
laurent@vivier.eu, david@redhat.com
Subject: [PATCH v2 02/15] linux-user/s390x: Use uint16_t for signal retcode
Date: Wed, 28 Apr 2021 12:33:55 -0700 [thread overview]
Message-ID: <20210428193408.233706-3-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210428193408.233706-1-richard.henderson@linaro.org>
Using the right type simplifies the frame setup.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/s390x/signal.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c
index 707fb603d7..fece8ab97b 100644
--- a/linux-user/s390x/signal.c
+++ b/linux-user/s390x/signal.c
@@ -25,7 +25,6 @@
#define __NUM_FPRS 16
#define __NUM_ACRS 16
-#define S390_SYSCALL_SIZE 2
#define __SIGNAL_FRAMESIZE 160 /* FIXME: 31-bit mode -> 96 */
#define _SIGCONTEXT_NSIG 64
@@ -62,7 +61,7 @@ typedef struct {
target_sigcontext sc;
target_sigregs sregs;
int signo;
- uint8_t retcode[S390_SYSCALL_SIZE];
+ uint16_t retcode;
} sigframe;
struct target_ucontext {
@@ -75,7 +74,7 @@ struct target_ucontext {
typedef struct {
uint8_t callee_used_stack[__SIGNAL_FRAMESIZE];
- uint8_t retcode[S390_SYSCALL_SIZE];
+ uint16_t retcode;
struct target_siginfo info;
struct target_ucontext uc;
} rt_sigframe;
@@ -155,7 +154,7 @@ void setup_frame(int sig, struct target_sigaction *ka,
env->regs[14] = (frame_addr + offsetof(sigframe, retcode))
| PSW_ADDR_AMODE;
__put_user(S390_SYSCALL_OPCODE | TARGET_NR_sigreturn,
- (uint16_t *)(frame->retcode));
+ &frame->retcode);
}
/* Set up backchain. */
@@ -216,7 +215,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
env->regs[14] = (frame_addr + offsetof(typeof(*frame), retcode))
| PSW_ADDR_AMODE;
__put_user(S390_SYSCALL_OPCODE | TARGET_NR_rt_sigreturn,
- (uint16_t *)(frame->retcode));
+ &frame->retcode);
}
/* Set up backchain. */
--
2.25.1
next prev parent reply other threads:[~2021-04-28 19:39 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 ` Richard Henderson [this message]
2021-04-29 7:10 ` [PATCH v2 02/15] linux-user/s390x: Use uint16_t for signal retcode 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
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=20210428193408.233706-3-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).