From 147a867771fffce96114934e82b79f4b4f3640d8 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 14 Jan 2016 12:54:41 +0000 Subject: target-arm: Implement cpu_get_phys_page_attrs_debug Implement cpu_get_phys_page_attrs_debug instead of cpu_get_phys_page_debug. Signed-off-by: Peter Maydell Acked-by: Edgar E. Iglesias --- target-arm/helper.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'target-arm/helper.c') diff --git a/target-arm/helper.c b/target-arm/helper.c index 59d5a41b58..26cd74b2e8 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -7341,7 +7341,8 @@ bool arm_tlb_fill(CPUState *cs, vaddr address, return ret; } -hwaddr arm_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) +hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, + MemTxAttrs *attrs) { ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; @@ -7350,16 +7351,16 @@ hwaddr arm_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) int prot; bool ret; uint32_t fsr; - MemTxAttrs attrs = {}; ARMMMUFaultInfo fi = {}; + *attrs = (MemTxAttrs) {}; + ret = get_phys_addr(env, addr, 0, cpu_mmu_index(env, false), &phys_addr, - &attrs, &prot, &page_size, &fsr, &fi); + attrs, &prot, &page_size, &fsr, &fi); if (ret) { return -1; } - return phys_addr; } -- cgit v1.2.3