summaryrefslogtreecommitdiffstats
path: root/target-arm/helper.c
diff options
context:
space:
mode:
authorPeter Maydell2016-01-21 15:15:07 +0100
committerPeter Maydell2016-01-21 15:15:07 +0100
commit0faea0c7e6b729c64035b3591b184eeeeef6f1d4 (patch)
treeef6886ae5070c5b7e75f5c2a71d9e34368c47806 /target-arm/helper.c
parenttarget-arm: Implement asidx_from_attrs (diff)
downloadqemu-0faea0c7e6b729c64035b3591b184eeeeef6f1d4.tar.gz
qemu-0faea0c7e6b729c64035b3591b184eeeeef6f1d4.tar.xz
qemu-0faea0c7e6b729c64035b3591b184eeeeef6f1d4.zip
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 <peter.maydell@linaro.org> Acked-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Diffstat (limited to 'target-arm/helper.c')
-rw-r--r--target-arm/helper.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c
index f956b67ded..16a5406e21 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -7346,7 +7346,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;
@@ -7355,16 +7356,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;
}