diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-02-15 19:45:04 -1000 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2023-03-10 20:45:47 +0100 |
| commit | 9cee640a444a5b861d15178a19a26065d77aae8b (patch) | |
| tree | 5b2585e08471f6bbf9919a482431ce2ba865aa8b /linux-user/sparc | |
| parent | 3116f020d455a0bff7bdc86c20dfc1a63a36f729 (diff) | |
| download | qemu-9cee640a444a5b861d15178a19a26065d77aae8b.zip qemu-9cee640a444a5b861d15178a19a26065d77aae8b.tar.gz qemu-9cee640a444a5b861d15178a19a26065d77aae8b.tar.bz2 | |
linux-user/sparc: Tidy syscall error return
Reduce ifdefs with #define syscall_cc.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230216054516.1267305-4-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'linux-user/sparc')
| -rw-r--r-- | linux-user/sparc/cpu_loop.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c index d31ea05..051a292 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 */ |