diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-05-17 10:28:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-05-17 10:28:23 +0100 |
| commit | b0f9690e78827d55a508c73432c73f057f59fd41 (patch) | |
| tree | edd913c2d05dd5d2113705e320c0c6c05ceee142 /target/m68k/cpu.h | |
| parent | d8276573da58e8ce78dab8c46dd660efd664bcb7 (diff) | |
| parent | 60d3d0cfeb1658d2827d6a4f0df27252bb36baba (diff) | |
| download | qemu-b0f9690e78827d55a508c73432c73f057f59fd41.zip qemu-b0f9690e78827d55a508c73432c73f057f59fd41.tar.gz qemu-b0f9690e78827d55a508c73432c73f057f59fd41.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier/tags/m68k-staging-pull-request' into staging
code cleanup, switch to transaction_failed hook
# gpg: Signature made Thu 16 May 2019 23:33:00 BST
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier/tags/m68k-staging-pull-request:
target/m68k: Optimize rotate_x() using extract_i32()
target/m68k: Fix a tcg_temp leak
target/m68k: Reduce the l1 TCGLabel scope
target/m68k: Switch to transaction_failed hook
target/m68k: In get_physical_address() check for memory access failures
target/m68k: In dump_address_map() check for memory access failures
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
# target/m68k/cpu.h
Diffstat (limited to 'target/m68k/cpu.h')
| -rw-r--r-- | target/m68k/cpu.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 683d3e2..9deff9e 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -545,9 +545,10 @@ static inline int cpu_mmu_index (CPUM68KState *env, bool ifetch) bool m68k_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); -void m68k_cpu_unassigned_access(CPUState *cs, hwaddr addr, - bool is_write, bool is_exec, int is_asi, - unsigned size); +void m68k_cpu_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, + unsigned size, MMUAccessType access_type, + int mmu_idx, MemTxAttrs attrs, + MemTxResult response, uintptr_t retaddr); #include "exec/cpu-all.h" |