qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 02/14] linux-user/sparc: Tidy syscall trap
Date: Wed,  1 Feb 2023 14:51:52 -1000	[thread overview]
Message-ID: <20230202005204.2055899-3-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230202005204.2055899-1-richard.henderson@linaro.org>

Use TT_TRAP.

For sparc32, 0x88 is the "Slowaris" system call, currently
BAD_TRAP in the kernel's ttable_32.S.

For sparc64, 0x110 is tl0_linux32, the sparc32 trap, as also
seen in the adjacent code.  We do not implement multiple abis,
so treat this as !defined(CONFIG_COMPAT), which vectors this
case to BTRAP.  This was presumably a typo for 0x111, which is
the "old" linux64 syscall number.  Both old and new linux64
syscalls traps vector to LINUX_64BIT_SYSCALL_TRAP.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/sparc/cpu_loop.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c
index c120c42278..18d5c24af1 100644
--- a/linux-user/sparc/cpu_loop.c
+++ b/linux-user/sparc/cpu_loop.c
@@ -167,12 +167,11 @@ void cpu_loop (CPUSPARCState *env)
         }
 
         switch (trapnr) {
-#ifndef TARGET_SPARC64
-        case 0x88:
-        case 0x90:
+#ifdef TARGET_SPARC64
+        case TT_TRAP + 0x11: /* tl0_oldlinux64 */
+        case TT_TRAP + 0x6d: /* tl0_linux64 */
 #else
-        case 0x110:
-        case 0x16d:
+        case TT_TRAP + 0x10: /* t_linux */
 #endif
             ret = do_syscall (env, env->gregs[1],
                               env->regwptr[0], env->regwptr[1],
-- 
2.34.1



  parent reply	other threads:[~2023-02-02  0:52 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 ` Richard Henderson [this message]
2023-02-02  1:15   ` [PATCH 02/14] linux-user/sparc: Tidy syscall trap 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 ` [PATCH 05/14] linux-user/sparc: Fix sparc64_{get,set}_context traps Richard Henderson
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-3-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).