Re: [PATCH v3 13/33] target/arm/helper: use i64 for exception_pc_alignment

[Pierrick Bouvier]

On 5/1/25 9:30 AM, Richard Henderson wrote:

On 4/30/25 23:23, Pierrick Bouvier wrote:

--- a/target/arm/helper.h
+++ b/target/arm/helper.h
@@ -49,7 +49,7 @@ DEF_HELPER_3(exception_with_syndrome, noreturn, env, i32, i32)
   DEF_HELPER_4(exception_with_syndrome_el, noreturn, env, i32, i32, i32)
   DEF_HELPER_2(exception_bkpt_insn, noreturn, env, i32)
   DEF_HELPER_2(exception_swstep, noreturn, env, i32)
-DEF_HELPER_2(exception_pc_alignment, noreturn, env, tl)
+DEF_HELPER_2(exception_pc_alignment, noreturn, env, i64)
   DEF_HELPER_1(setend, void, env)
   DEF_HELPER_2(wfi, void, env, i32)
   DEF_HELPER_1(wfe, void, env)
diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c
index 8841f039bc6..943b8438fc7 100644
--- a/target/arm/tcg/tlb_helper.c
+++ b/target/arm/tcg/tlb_helper.c
@@ -277,7 +277,7 @@ void arm_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr,
       arm_deliver_fault(cpu, vaddr, access_type, mmu_idx, &fi);
   }

-void helper_exception_pc_alignment(CPUARMState *env, target_ulong pc)

+void helper_exception_pc_alignment(CPUARMState *env, uint64_t pc)
   {
       ARMMMUFaultInfo fi = { .type = ARMFault_Alignment };
       int target_el = exception_target_el(env);

I think for this and the next patch, it would be worth extending
include/exec/helper-head.h.inc and include/tcg/ to allow vaddr.

Ok, I'll add it.

r~