[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 17/17] target/m68k: Mark helper_raise_exception as noreturn
From: |
Richard Henderson |
Subject: |
[PATCH v5 17/17] target/m68k: Mark helper_raise_exception as noreturn |
Date: |
Fri, 27 May 2022 09:48:07 -0700 |
Also mark raise_exception_ra and raise_exception, lest we
generate a warning about helper_raise_exception returning.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/m68k/helper.h | 2 +-
target/m68k/op_helper.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/target/m68k/helper.h b/target/m68k/helper.h
index f016c4c1c2..c9bed2b884 100644
--- a/target/m68k/helper.h
+++ b/target/m68k/helper.h
@@ -109,7 +109,7 @@ DEF_HELPER_3(set_mac_extu, void, env, i32, i32)
DEF_HELPER_2(flush_flags, void, env, i32)
DEF_HELPER_2(set_ccr, void, env, i32)
DEF_HELPER_FLAGS_1(get_ccr, TCG_CALL_NO_WG_SE, i32, env)
-DEF_HELPER_2(raise_exception, void, env, i32)
+DEF_HELPER_2(raise_exception, noreturn, env, i32)
DEF_HELPER_FLAGS_3(bfffo_reg, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32)
diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c
index 61948d92bb..d9937ca8dc 100644
--- a/target/m68k/op_helper.c
+++ b/target/m68k/op_helper.c
@@ -532,7 +532,8 @@ bool m68k_cpu_exec_interrupt(CPUState *cs, int
interrupt_request)
#endif /* !CONFIG_USER_ONLY */
-static void raise_exception_ra(CPUM68KState *env, int tt, uintptr_t raddr)
+G_NORETURN static void
+raise_exception_ra(CPUM68KState *env, int tt, uintptr_t raddr)
{
CPUState *cs = env_cpu(env);
@@ -540,7 +541,7 @@ static void raise_exception_ra(CPUM68KState *env, int tt,
uintptr_t raddr)
cpu_loop_exit_restore(cs, raddr);
}
-static void raise_exception(CPUM68KState *env, int tt)
+G_NORETURN static void raise_exception(CPUM68KState *env, int tt)
{
raise_exception_ra(env, tt, 0);
}
--
2.34.1
- [PATCH v5 10/17] target/m68k: Implement TRAPcc, (continued)
- [PATCH v5 10/17] target/m68k: Implement TRAPcc, Richard Henderson, 2022/05/27
- [PATCH v5 08/17] target/m68k: Fix address argument for EXCP_TRACE, Richard Henderson, 2022/05/27
- [PATCH v5 09/17] target/m68k: Fix stack frame for EXCP_ILLEGAL, Richard Henderson, 2022/05/27
- [PATCH v5 11/17] target/m68k: Implement TPF in terms of TRAPcc, Richard Henderson, 2022/05/27
- [PATCH v5 12/17] target/m68k: Implement TRAPV, Richard Henderson, 2022/05/27
- [PATCH v5 02/17] target/m68k: Switch over exception type in m68k_interrupt_all, Richard Henderson, 2022/05/27
- [PATCH v5 13/17] target/m68k: Implement FTRAPcc, Richard Henderson, 2022/05/27
- [PATCH v5 15/17] linux-user/strace: Use is_error in print_syscall_err, Richard Henderson, 2022/05/27
- [PATCH v5 16/17] linux-user/strace: Adjust get_thread_area for m68k, Richard Henderson, 2022/05/27
- [PATCH v5 17/17] target/m68k: Mark helper_raise_exception as noreturn,
Richard Henderson <=
- [PATCH v5 14/17] tests/tcg/m68k: Add trap.c, Richard Henderson, 2022/05/27
- Re: [PATCH v5 00/17] target/m68k: Conditional traps + trap cleanup, Laurent Vivier, 2022/05/28