On 28/9/26 07:20, Yonggang Luo wrote:
Drop TCG excp and call raise_excp. Keep C hppa_dynamic_excp and use
cpu_loop_exit_excp. Route leftover C callers through
hppa_dynamic_excp instead of helper_excp.
Signed-off-by: Yonggang Luo <[email protected]>
---
target/hppa/helper.h | 2 --
target/hppa/op_helper.c | 15 ++-------------
target/hppa/sys_helper.c | 4 ++--
target/hppa/translate.c | 2 +-
4 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/target/hppa/helper.h b/target/hppa/helper.h
index 8369855d78e..5ed39e01e31 100644
--- a/target/hppa/helper.h
+++ b/target/hppa/helper.h
@@ -1,5 +1,3 @@
-DEF_HELPER_2(excp, noreturn, env, int)
-
DEF_HELPER_FLAGS_3(stby_b, TCG_CALL_NO_WG, void, env, tl, tl)
DEF_HELPER_FLAGS_3(stby_b_parallel, TCG_CALL_NO_WG, void, env, tl, tl)
DEF_HELPER_FLAGS_3(stby_e, TCG_CALL_NO_WG, void, env, tl, tl)
diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c
index 76a8d8a0d34..c4651f0d85a 100644
--- a/target/hppa/op_helper.c
+++ b/target/hppa/op_helper.c
@@ -30,20 +30,9 @@
#include "user/page-protection.h"
#endif
-G_NORETURN void HELPER(excp)(CPUHPPAState *env, int excp)
-{
- CPUState *cs = env_cpu(env);
-
- cs->exception_index = excp;
- cpu_loop_exit(cs);
-}
-
G_NORETURN void hppa_dynamic_excp(CPUHPPAState *env, int excp, uintptr_t ra)
{
- CPUState *cs = env_cpu(env);
-
- cs->exception_index = excp;
- cpu_loop_exit_restore(cs, ra);
+ cpu_loop_exit_excp(env_cpu(env), excp, ra);
cpu_loop_exit_excp() replacement is one logical change, ...
}
static void atomic_store_mask32(CPUHPPAState *env, target_ulong addr,
@@ -341,7 +330,7 @@ target_ulong HELPER(probe)(CPUHPPAState *env, target_ulong
addr,
if (excp == EXCP_DTLB_MISS) {
excp = EXCP_NA_DTLB_MISS;
}
- helper_excp(env, excp);
+ hppa_dynamic_excp(env, excp, 0);
... removing helper_excp() and calling hppa_dynamic_excp()
another one. Please split in 2 distinct patches.
}
return (want & prot) != 0;
#endif
