From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org, "Laurent Vivier" <laurent@vivier.eu>
Subject: [PULL 08/28] target/ppc: fix signal delivery for ppc64abi32
Date: Thu, 26 Sep 2019 19:35:33 +0100 [thread overview]
Message-ID: <20190926183553.13895-9-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190926183553.13895-1-alex.bennee@linaro.org>
We were incorrectly using the 64-bit AIX ABI instead of the 32-bit
SYSV ABI for setting NIP for the signal handler.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c
index 619a56950d..5b82af6cb6 100644
--- a/linux-user/ppc/signal.c
+++ b/linux-user/ppc/signal.c
@@ -501,7 +501,9 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
int i, err = 0;
#if defined(TARGET_PPC64)
struct target_sigcontext *sc = 0;
+#if !defined(TARGET_ABI32)
struct image_info *image = ((TaskState *)thread_cpu->opaque)->info;
+#endif
#endif
rt_sf_addr = get_sigframe(ka, env, sizeof(*rt_sf));
@@ -557,7 +559,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
env->gpr[5] = (target_ulong) h2g(&rt_sf->uc);
env->gpr[6] = (target_ulong) h2g(rt_sf);
-#if defined(TARGET_PPC64)
+#if defined(TARGET_PPC64) && !defined(TARGET_ABI32)
if (get_ppc64_abi(image) < 2) {
/* ELFv1 PPC64 function pointers are pointers to OPD entries. */
struct target_func_ptr *handler =
--
2.20.1
next prev parent reply other threads:[~2019-09-26 18:55 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-26 18:35 [PULL 00/28] testing updates (docker,podman,tcg,alpha) Alex Bennée
2019-09-26 18:35 ` [PULL 01/28] target/alpha: Use array for FPCR_DYN conversion Alex Bennée
2019-09-26 18:35 ` [PULL 02/28] target/alpha: Fix SWCR_MAP_UMZ Alex Bennée
2019-09-26 18:35 ` [PULL 03/28] target/alpha: Fix SWCR_TRAP_ENABLE_MASK Alex Bennée
2019-09-26 18:35 ` [PULL 04/28] target/alpha: Handle SWCR_MAP_DMZ earlier Alex Bennée
2019-09-26 18:35 ` [PULL 05/28] target/alpha: Write to fpcr_flush_to_zero once Alex Bennée
2019-09-26 18:35 ` [PULL 06/28] target/alpha: Mask IOV exception with INV for user-only Alex Bennée
2019-09-26 18:35 ` [PULL 07/28] target/alpha: Tidy helper_fp_exc_raise_s Alex Bennée
2019-09-26 18:35 ` Alex Bennée [this message]
2019-09-26 18:35 ` [PULL 09/28] tests/docker: add sanitizers back to clang build Alex Bennée
2019-10-01 7:36 ` Paolo Bonzini
2019-10-01 13:04 ` John Snow
2019-09-26 18:35 ` [PULL 10/28] tests/docker: fix DOCKER_PARTIAL_IMAGES Alex Bennée
2019-09-26 18:35 ` [PULL 11/28] tests/docker: remove python2.7 from debian9-mxe Alex Bennée
2019-09-26 18:35 ` [PULL 12/28] tests/docker: reduce scary warnings by cleaning up clean up Alex Bennée
2019-09-26 18:35 ` [PULL 13/28] podman: fix command invocation Alex Bennée
2019-09-26 18:35 ` [PULL 14/28] tests/tcg: clean-up some comments after the de-tangling Alex Bennée
2019-09-26 18:35 ` [PULL 15/28] tests/tcg: re-enable linux-test for ppc64abi32 Alex Bennée
2019-09-26 18:35 ` [PULL 16/28] tests/tcg: add float_madds test to multiarch Alex Bennée
2019-09-26 18:35 ` [PULL 17/28] tests/tcg: add generic version of float_convs Alex Bennée
2019-09-26 18:35 ` [PULL 18/28] tests/tcg: add simple record/replay smoke test for aarch64 Alex Bennée
2019-09-26 18:35 ` [PULL 19/28] configure: preserve PKG_CONFIG for subdir builds Alex Bennée
2019-09-26 18:35 ` [PULL 20/28] docs/devel: add "check-tcg" to testing.rst Alex Bennée
2019-09-26 18:35 ` [PULL 21/28] target/i386: Fix broken build with WHPX enabled Alex Bennée
2019-09-26 18:35 ` [PULL 22/28] docker: remove debian8-mxe definitions Alex Bennée
2019-09-26 18:35 ` [PULL 23/28] docker: remove unused debian8 partial image Alex Bennée
2019-09-26 18:35 ` [PULL 24/28] docker: remove 'deprecated' image definitions Alex Bennée
2019-09-26 18:35 ` [PULL 25/28] docker: remove unused debian-ports Alex Bennée
2019-09-26 18:35 ` [PULL 26/28] docker: remove unused debian-sid Alex Bennée
2019-09-26 18:35 ` [PULL 27/28] docker: move tests from python2 to python3 Alex Bennée
2019-09-26 18:35 ` [PULL 28/28] tests/docker: remove debian-powerpc-user-cross Alex Bennée
2019-09-27 15:53 ` [PULL 00/28] testing updates (docker,podman,tcg,alpha) Peter Maydell
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=20190926183553.13895-9-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=laurent@vivier.eu \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=riku.voipio@iki.fi \
/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).