[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/15] linux-user/sparc: Tidy syscall error return
From: |
Richard Henderson |
Subject: |
[PATCH v2 03/15] linux-user/sparc: Tidy syscall error return |
Date: |
Wed, 15 Feb 2023 19:45:04 -1000 |
Reduce ifdefs with #define syscall_cc.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/sparc/cpu_loop.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c
index d31ea057db..051a292ce5 100644
--- a/linux-user/sparc/cpu_loop.c
+++ b/linux-user/sparc/cpu_loop.c
@@ -149,10 +149,13 @@ static void flush_windows(CPUSPARCState *env)
#endif
}
+/* Avoid ifdefs below for the abi32 and abi64 paths. */
#ifdef TARGET_ABI32
#define TARGET_TT_SYSCALL (TT_TRAP + 0x10) /* t_linux */
+#define syscall_cc psr
#else
#define TARGET_TT_SYSCALL (TT_TRAP + 0x6d) /* tl0_linux64 */
+#define syscall_cc xcc
#endif
void cpu_loop (CPUSPARCState *env)
@@ -183,18 +186,10 @@ void cpu_loop (CPUSPARCState *env)
break;
}
if ((abi_ulong)ret >= (abi_ulong)(-515)) {
-#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
- env->xcc |= PSR_CARRY;
-#else
- env->psr |= PSR_CARRY;
-#endif
+ env->syscall_cc |= PSR_CARRY;
ret = -ret;
} else {
-#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
- env->xcc &= ~PSR_CARRY;
-#else
- env->psr &= ~PSR_CARRY;
-#endif
+ env->syscall_cc &= ~PSR_CARRY;
}
env->regwptr[0] = ret;
/* next instruction */
--
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 <=
- [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, 2023/02/16
- [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