[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/15] linux-user/sparc: Tidy window spill/fill traps
From: |
Richard Henderson |
Subject: |
[PATCH v2 05/15] linux-user/sparc: Tidy window spill/fill traps |
Date: |
Wed, 15 Feb 2023 19:45:06 -1000 |
Add some macros to localize the hw difference between v9 and pre-v9.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/sparc/cpu_loop.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c
index e1d08ff204..2bcf32590f 100644
--- a/linux-user/sparc/cpu_loop.c
+++ b/linux-user/sparc/cpu_loop.c
@@ -158,6 +158,15 @@ static void flush_windows(CPUSPARCState *env)
#define syscall_cc xcc
#endif
+/* Avoid ifdefs below for the v9 and pre-v9 hw traps. */
+#ifdef TARGET_SPARC64
+#define TARGET_TT_SPILL TT_SPILL
+#define TARGET_TT_FILL TT_FILL
+#else
+#define TARGET_TT_SPILL TT_WIN_OVF
+#define TARGET_TT_FILL TT_WIN_UNF
+#endif
+
void cpu_loop (CPUSPARCState *env)
{
CPUState *cs = env_cpu(env);
@@ -204,20 +213,14 @@ void cpu_loop (CPUSPARCState *env)
env->npc = env->npc + 4;
break;
-#ifndef TARGET_SPARC64
- case TT_WIN_OVF: /* window overflow */
+ case TARGET_TT_SPILL: /* window overflow */
save_window(env);
break;
- case TT_WIN_UNF: /* window underflow */
- restore_window(env);
- break;
-#else
- case TT_SPILL: /* window overflow */
- save_window(env);
- break;
- case TT_FILL: /* window underflow */
+ case TARGET_TT_FILL: /* window underflow */
restore_window(env);
break;
+
+#ifdef TARGET_SPARC64
#ifndef TARGET_ABI32
case 0x16e:
flush_windows(env);
--
2.34.1
- [PATCH v2 00/15] linux-user/sparc: Handle missing traps, Richard Henderson, 2023/02/16
- [PATCH v2 01/15] linux-user/sparc: Raise SIGILL for all unhandled software traps, Richard Henderson, 2023/02/16
- [PATCH v2 02/15] linux-user/sparc: Tidy syscall trap, Richard Henderson, 2023/02/16
- [PATCH v2 03/15] linux-user/sparc: Tidy syscall error return, Richard Henderson, 2023/02/16
- [PATCH v2 04/15] linux-user/sparc: Use TT_TRAP for flush windows, Richard Henderson, 2023/02/16
- [PATCH v2 05/15] linux-user/sparc: Tidy window spill/fill traps,
Richard Henderson <=
- [PATCH v2 06/15] linux-user/sparc: Fix sparc64_{get, set}_context traps, Richard Henderson, 2023/02/16
- [PATCH v2 07/15] linux-user/sparc: Handle software breakpoint trap, Richard Henderson, 2023/02/16
- [PATCH v2 08/15] linux-user/sparc: Handle division by zero traps, Richard Henderson, 2023/02/16
- [PATCH v2 09/15] linux-user/sparc: Handle getcc, setcc, getpsr traps, Richard Henderson, 2023/02/16
- [PATCH v2 10/15] linux-user/sparc: Handle priviledged opcode trap, Richard Henderson, 2023/02/16
- [PATCH v2 11/15] linux-user/sparc: Handle privilidged action trap, Richard Henderson, 2023/02/16
- [PATCH v2 12/15] linux-user/sparc: Handle coprocessor disabled trap, Richard Henderson, 2023/02/16
- [PATCH v2 13/15] linux-user/sparc: Handle unimplemented flush trap, Richard Henderson, 2023/02/16
- [PATCH v2 14/15] linux-user/sparc: Handle floating-point exceptions, Richard Henderson, 2023/02/16