[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/14] linux-user/sparc: Fix sparc64_{get,set}_context traps
From: |
Richard Henderson |
Subject: |
[PATCH 05/14] linux-user/sparc: Fix sparc64_{get,set}_context traps |
Date: |
Wed, 1 Feb 2023 14:51:55 -1000 |
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
- [PATCH 00/14] linux-user/sparc: Handle missing traps, Richard Henderson, 2023/02/01
- [PATCH 01/14] linux-user/sparc: Raise SIGILL for all unhandled software traps, Richard Henderson, 2023/02/01
- [PATCH 02/14] linux-user/sparc: Tidy syscall trap, Richard Henderson, 2023/02/01
- [PATCH 03/14] linux-user/sparc: Use TT_TRAP for flush windows, Richard Henderson, 2023/02/01
- [PATCH 04/14] linux-user/sparc: Tidy window spill/fill traps, Richard Henderson, 2023/02/01
- [PATCH 05/14] linux-user/sparc: Fix sparc64_{get,set}_context traps,
Richard Henderson <=
- [PATCH 06/14] linux-user/sparc: Handle software breakpoint trap, Richard Henderson, 2023/02/01
- [PATCH 07/14] linux-user/sparc: Handle division by zero traps, Richard Henderson, 2023/02/01
- [PATCH 08/14] linux-user/sparc: Handle getcc, setcc, getpsr traps, Richard Henderson, 2023/02/01
- [PATCH 09/14] linux-user/sparc: Handle priviledged opcode trap, Richard Henderson, 2023/02/01
- [PATCH 10/14] linux-user/sparc: Handle privilidged action trap, Richard Henderson, 2023/02/01
- [PATCH 11/14] linux-user/sparc: Handle coprocessor disabled trap, Richard Henderson, 2023/02/01
- [PATCH 13/14] linux-user/sparc: Handle floating-point exceptions, Richard Henderson, 2023/02/01
- [PATCH 14/14] linux-user/sparc: Handle tag overflow traps, Richard Henderson, 2023/02/01
- [PATCH 12/14] linux-user/sparc: Handle unimplemented flush trap, Richard Henderson, 2023/02/01
- Re: [PATCH 00/14] linux-user/sparc: Handle missing traps, Mark Cave-Ayland, 2023/02/05