diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-01-26 10:08:53 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-01-26 10:08:53 +0000 |
| commit | fca3dad533741ef90650a949cb0cab7ba8437c5e (patch) | |
| tree | 58e2cdfd13991b82b64dcaed987e0bcec1c451e4 /include/exec/exec-all.h | |
| parent | d2bc6e1f62241085351005c88bed0b576b23da91 (diff) | |
| parent | 2097dca6d3a30b80ac5a6232f518548d5ae644a9 (diff) | |
Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.12-pull-request' into staging
# gpg: Signature made Thu 25 Jan 2018 15:15:03 GMT
# gpg: using RSA key 0xF30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg: aka "Laurent Vivier <laurent@vivier.eu>"
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier/tags/m68k-for-2.12-pull-request:
target/m68k: add HMP command "info tlb"
target/m68k: add pflush/ptest
target/m68k: add moves
target/m68k: add index parameter to gen_load()/gen_store() and Co.
target/m68k: add Transparent Translation
target/m68k: add MC68040 MMU
accel/tcg: add size paremeter in tlb_fill()
target/m68k: fix TCG variable double free
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec/exec-all.h')
| -rw-r--r-- | include/exec/exec-all.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index b37f7d8d92..e5afd2e6d3 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -253,7 +253,7 @@ void tlb_set_page(CPUState *cpu, target_ulong vaddr, hwaddr paddr, int prot, int mmu_idx, target_ulong size); void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr); -void probe_write(CPUArchState *env, target_ulong addr, int mmu_idx, +void probe_write(CPUArchState *env, target_ulong addr, int size, int mmu_idx, uintptr_t retaddr); #else static inline void tlb_flush_page(CPUState *cpu, target_ulong addr) @@ -436,8 +436,8 @@ void tb_lock_reset(void); struct MemoryRegion *iotlb_to_region(CPUState *cpu, hwaddr index, MemTxAttrs attrs); -void tlb_fill(CPUState *cpu, target_ulong addr, MMUAccessType access_type, - int mmu_idx, uintptr_t retaddr); +void tlb_fill(CPUState *cpu, target_ulong addr, int size, + MMUAccessType access_type, int mmu_idx, uintptr_t retaddr); #endif |