diff options
| author | Helge Deller <deller@gmx.de> | 2024-03-02 22:02:38 +0100 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2024-03-03 06:41:19 +0100 |
| commit | 5ccd50172a80ef9fe695714744b0747d7419b2c4 (patch) | |
| tree | 386364c31c953f6584453686ad5464458f8fe0bf /target/hppa/op_helper.c | |
| parent | a9bdc4c95e402599e4184d4814800668479adb2b (diff) | |
target/hppa: Restore unwind_breg before calculating ior
When calculating the IOR for the exception handlers, the current
unwind_breg value is needed on 64-bit hppa machines.
Restore that value by calling cpu_restore_state() earlier, which in turn
calls hppa_restore_state_to_opc() which restores the unwind_breg for the
current instruction.
Signed-off-by: Helge Deller <deller@gmx.de>
Fixes: 3824e0d643f3 ("target/hppa: Export function hppa_set_ior_and_isr()")
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/hppa/op_helper.c')
| -rw-r--r-- | target/hppa/op_helper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index b1f24a5aad..480fe80844 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -351,11 +351,12 @@ target_ulong HELPER(probe)(CPUHPPAState *env, target_ulong addr, excp = hppa_get_physical_address(env, addr, mmu_idx, 0, &phys, &prot, NULL); if (excp >= 0) { + cpu_restore_state(env_cpu(env), GETPC()); hppa_set_ior_and_isr(env, addr, MMU_IDX_MMU_DISABLED(mmu_idx)); if (excp == EXCP_DTLB_MISS) { excp = EXCP_NA_DTLB_MISS; } - hppa_dynamic_excp(env, excp, GETPC()); + helper_excp(env, excp); } return (want & prot) != 0; #endif |