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 /target/arm | |
| parent | d2bc6e1f62241085351005c88bed0b576b23da91 (diff) | |
| parent | 2097dca6d3a30b80ac5a6232f518548d5ae644a9 (diff) | |
| download | qemu-fca3dad533741ef90650a949cb0cab7ba8437c5e.zip qemu-fca3dad533741ef90650a949cb0cab7ba8437c5e.tar.gz qemu-fca3dad533741ef90650a949cb0cab7ba8437c5e.tar.bz2 | |
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 'target/arm')
| -rw-r--r-- | target/arm/cpu.c | 4 | ||||
| -rw-r--r-- | target/arm/op_helper.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/arm/cpu.c b/target/arm/cpu.c index cc1856c..9da6ea5 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1689,8 +1689,8 @@ static Property arm_cpu_properties[] = { }; #ifdef CONFIG_USER_ONLY -static int arm_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, - int mmu_idx) +static int arm_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, + int rw, int mmu_idx) { ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index a937e76..7a88fd2 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -169,8 +169,8 @@ static void deliver_fault(ARMCPU *cpu, vaddr addr, MMUAccessType access_type, * NULL, it means that the function was called in C code (i.e. not * from generated code or from helper.c) */ -void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type, - int mmu_idx, uintptr_t retaddr) +void tlb_fill(CPUState *cs, target_ulong addr, int size, + MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) { bool ret; ARMMMUFaultInfo fi = {}; |