From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: laurent@vivier.eu
Subject: [PATCH v2 05/15] linux-user/sparc: Tidy window spill/fill traps
Date: Wed, 15 Feb 2023 19:45:06 -1000 [thread overview]
Message-ID: <20230216054516.1267305-6-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230216054516.1267305-1-richard.henderson@linaro.org>
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
next prev parent reply other threads:[~2023-02-16 5:49 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-16 5:45 [PATCH v2 00/15] linux-user/sparc: Handle missing traps Richard Henderson
2023-02-16 5:45 ` [PATCH v2 01/15] linux-user/sparc: Raise SIGILL for all unhandled software traps Richard Henderson
2023-02-16 6:07 ` Richard Henderson
2023-02-16 5:45 ` [PATCH v2 02/15] linux-user/sparc: Tidy syscall trap Richard Henderson
2023-02-16 7:51 ` Philippe Mathieu-Daudé
2023-02-16 5:45 ` [PATCH v2 03/15] linux-user/sparc: Tidy syscall error return Richard Henderson
2023-02-16 5:45 ` [PATCH v2 04/15] linux-user/sparc: Use TT_TRAP for flush windows Richard Henderson
2023-02-16 7:54 ` Philippe Mathieu-Daudé
2023-02-16 5:45 ` Richard Henderson [this message]
2023-02-16 7:55 ` [PATCH v2 05/15] linux-user/sparc: Tidy window spill/fill traps Philippe Mathieu-Daudé
2023-02-16 5:45 ` [PATCH v2 06/15] linux-user/sparc: Fix sparc64_{get, set}_context traps Richard Henderson
2023-02-16 5:45 ` [PATCH v2 07/15] linux-user/sparc: Handle software breakpoint trap Richard Henderson
2023-02-16 5:45 ` [PATCH v2 08/15] linux-user/sparc: Handle division by zero traps Richard Henderson
2023-02-16 5:45 ` [PATCH v2 09/15] linux-user/sparc: Handle getcc, setcc, getpsr traps Richard Henderson
2023-02-16 5:45 ` [PATCH v2 10/15] linux-user/sparc: Handle priviledged opcode trap Richard Henderson
2023-02-16 5:45 ` [PATCH v2 11/15] linux-user/sparc: Handle privilidged action trap Richard Henderson
2023-02-16 5:45 ` [PATCH v2 12/15] linux-user/sparc: Handle coprocessor disabled trap Richard Henderson
2023-02-16 5:45 ` [PATCH v2 13/15] linux-user/sparc: Handle unimplemented flush trap Richard Henderson
2023-02-16 5:45 ` [PATCH v2 14/15] linux-user/sparc: Handle floating-point exceptions Richard Henderson
2023-02-16 5:45 ` [PATCH v2 15/15] linux-user/sparc: Handle tag overflow traps Richard Henderson
2023-03-07 15:56 ` [PATCH v2 00/15] linux-user/sparc: Handle missing traps Laurent Vivier
2023-03-07 17:07 ` Richard Henderson
2023-03-07 18:23 ` 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=20230216054516.1267305-6-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=laurent@vivier.eu \
--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).