diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2024-03-04 16:01:33 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2024-03-04 16:01:33 +0000 |
| commit | 52e7db443bd8d233acc3977bd150bdadb62db86c (patch) | |
| tree | c9a101ecb4a0486cdc7899346fd63dfe9576a518 /target/hppa/mem_helper.c | |
| parent | 9ea920dc28254cd9a363aaef01985dffd8abedd7 (diff) | |
| parent | 839a88e8bd1a1efe05844c39a59985482894f4de (diff) | |
| download | focaccia-qemu-52e7db443bd8d233acc3977bd150bdadb62db86c.tar.gz focaccia-qemu-52e7db443bd8d233acc3977bd150bdadb62db86c.zip | |
Merge tag 'hppa-latest-pull-request' of https://github.com/hdeller/qemu-hppa into staging
HPPA64 updates # -----BEGIN PGP SIGNATURE----- # # iHUEABYKAB0WIQS86RI+GtKfB8BJu973ErUQojoPXwUCZeQOtQAKCRD3ErUQojoP # Xzh6AP9Gs8sJzRbR+HLlbrs3ACR7kQEVGOYuuBEJpKqkTyDbLwD/YdOjzgtTRKLd # imxaWOJaLhpvBrmFLxn3Q58K3n9u1wY= # =bnMy # -----END PGP SIGNATURE----- # gpg: Signature made Sun 03 Mar 2024 05:46:29 GMT # gpg: using EDDSA key BCE9123E1AD29F07C049BBDEF712B510A23A0F5F # gpg: Good signature from "Helge Deller <deller@gmx.de>" [unknown] # gpg: aka "Helge Deller <deller@kernel.org>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 4544 8228 2CD9 10DB EF3D 25F8 3E5F 3D04 A7A2 4603 # Subkey fingerprint: BCE9 123E 1AD2 9F07 C049 BBDE F712 B510 A23A 0F5F * tag 'hppa-latest-pull-request' of https://github.com/hdeller/qemu-hppa: roms/hppa: Add build rules for hppa-firmware pc-bios/README: Add information about hppa-firmware pc-bios/meson: Add hppa-firmware64.img blob target/hppa: Restore unwind_breg before calculating ior target: hppa: Fix unaligned double word accesses for hppa64 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/hppa/mem_helper.c')
| -rw-r--r-- | target/hppa/mem_helper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index 66b8fa7d72..3fc895c1c2 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -348,9 +348,10 @@ raise_exception_with_ior(CPUHPPAState *env, int excp, uintptr_t retaddr, CPUState *cs = env_cpu(env); cs->exception_index = excp; + cpu_restore_state(cs, retaddr); hppa_set_ior_and_isr(env, addr, mmu_disabled); - cpu_loop_exit_restore(cs, retaddr); + cpu_loop_exit(cs); } void hppa_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, |