From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: mark.cave-ayland@ilande.co.uk, laurent@vivier.eu, iii@linux.ibm.com
Subject: [PATCH 05/14] linux-user/sparc: Fix sparc64_{get,set}_context traps
Date: Wed, 1 Feb 2023 14:51:55 -1000 [thread overview]
Message-ID: <20230202005204.2055899-6-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230202005204.2055899-1-richard.henderson@linaro.org>
These traps are present for sparc64 with ilp32, aka sparc32plus.
Enabling them means adjusting the defines over in signal.c,
and fixing an incorrect usage of abi_ulong when we really meant
the full register, target_ulong.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/sparc/cpu_loop.c | 23 +++++++++++------------
linux-user/sparc/signal.c | 36 +++++++++++++++++++-----------------
2 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c
index efc0fa64d5..493845fe76 100644
--- a/linux-user/sparc/cpu_loop.c
+++ b/linux-user/sparc/cpu_loop.c
@@ -217,6 +217,17 @@ void cpu_loop (CPUSPARCState *env)
env->npc = env->npc + 4;
break;
+#ifdef TARGET_SPARC64
+ case TT_TRAP + 0x6e:
+ flush_windows(env);
+ sparc64_get_context(env);
+ break;
+ case TT_TRAP + 0x6f:
+ flush_windows(env);
+ sparc64_set_context(env);
+ break;
+#endif
+
case TARGET_TT_SPILL: /* window overflow */
save_window(env);
break;
@@ -224,18 +235,6 @@ void cpu_loop (CPUSPARCState *env)
restore_window(env);
break;
-#ifdef TARGET_SPARC64
-#ifndef TARGET_ABI32
- case 0x16e:
- flush_windows(env);
- sparc64_get_context(env);
- break;
- case 0x16f:
- flush_windows(env);
- sparc64_set_context(env);
- break;
-#endif
-#endif
case EXCP_INTERRUPT:
/* just indicate that signals should be handled asap */
break;
diff --git a/linux-user/sparc/signal.c b/linux-user/sparc/signal.c
index b501750fe0..2be9000b9e 100644
--- a/linux-user/sparc/signal.c
+++ b/linux-user/sparc/signal.c
@@ -503,7 +503,23 @@ long do_rt_sigreturn(CPUSPARCState *env)
return -QEMU_ESIGRETURN;
}
-#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
+#ifdef TARGET_ABI32
+void setup_sigtramp(abi_ulong sigtramp_page)
+{
+ uint32_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 2 * 8, 0);
+ assert(tramp != NULL);
+
+ default_sigreturn = sigtramp_page;
+ install_sigtramp(tramp, TARGET_NR_sigreturn);
+
+ default_rt_sigreturn = sigtramp_page + 8;
+ install_sigtramp(tramp + 2, TARGET_NR_rt_sigreturn);
+
+ unlock_user(tramp, sigtramp_page, 2 * 8);
+}
+#endif
+
+#ifdef TARGET_SPARC64
#define SPARC_MC_TSTATE 0
#define SPARC_MC_PC 1
#define SPARC_MC_NPC 2
@@ -575,7 +591,7 @@ void sparc64_set_context(CPUSPARCState *env)
struct target_ucontext *ucp;
target_mc_gregset_t *grp;
target_mc_fpu_t *fpup;
- abi_ulong pc, npc, tstate;
+ target_ulong pc, npc, tstate;
unsigned int i;
unsigned char fenab;
@@ -773,18 +789,4 @@ do_sigsegv:
unlock_user_struct(ucp, ucp_addr, 1);
force_sig(TARGET_SIGSEGV);
}
-#else
-void setup_sigtramp(abi_ulong sigtramp_page)
-{
- uint32_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 2 * 8, 0);
- assert(tramp != NULL);
-
- default_sigreturn = sigtramp_page;
- install_sigtramp(tramp, TARGET_NR_sigreturn);
-
- default_rt_sigreturn = sigtramp_page + 8;
- install_sigtramp(tramp + 2, TARGET_NR_rt_sigreturn);
-
- unlock_user(tramp, sigtramp_page, 2 * 8);
-}
-#endif
+#endif /* TARGET_SPARC64 */
--
2.34.1
next prev parent reply other threads:[~2023-02-02 0:53 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-02 0:51 [PATCH 00/14] linux-user/sparc: Handle missing traps Richard Henderson
2023-02-02 0:51 ` [PATCH 01/14] linux-user/sparc: Raise SIGILL for all unhandled software traps Richard Henderson
2023-02-02 11:56 ` Ilya Leoshkevich
2023-02-02 0:51 ` [PATCH 02/14] linux-user/sparc: Tidy syscall trap Richard Henderson
2023-02-02 1:15 ` Richard Henderson
2023-02-02 0:51 ` [PATCH 03/14] linux-user/sparc: Use TT_TRAP for flush windows Richard Henderson
2023-02-02 0:51 ` [PATCH 04/14] linux-user/sparc: Tidy window spill/fill traps Richard Henderson
2023-02-02 0:51 ` Richard Henderson [this message]
2023-02-02 0:51 ` [PATCH 06/14] linux-user/sparc: Handle software breakpoint trap Richard Henderson
2023-02-02 0:51 ` [PATCH 07/14] linux-user/sparc: Handle division by zero traps Richard Henderson
2023-02-02 0:51 ` [PATCH 08/14] linux-user/sparc: Handle getcc, setcc, getpsr traps Richard Henderson
2023-02-02 0:51 ` [PATCH 09/14] linux-user/sparc: Handle priviledged opcode trap Richard Henderson
2023-02-02 0:52 ` [PATCH 10/14] linux-user/sparc: Handle privilidged action trap Richard Henderson
2023-02-02 0:52 ` [PATCH 11/14] linux-user/sparc: Handle coprocessor disabled trap Richard Henderson
2023-02-02 0:52 ` [PATCH 12/14] linux-user/sparc: Handle unimplemented flush trap Richard Henderson
2023-02-02 0:52 ` [PATCH 13/14] linux-user/sparc: Handle floating-point exceptions Richard Henderson
2023-02-02 0:52 ` [PATCH 14/14] linux-user/sparc: Handle tag overflow traps Richard Henderson
2023-02-05 23:24 ` [PATCH 00/14] linux-user/sparc: Handle missing traps Mark Cave-Ayland
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=20230202005204.2055899-6-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=iii@linux.ibm.com \
--cc=laurent@vivier.eu \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-devel@nongnu.org \
/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).