aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-12-14 17:36:22 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-01-08 13:32:55 +0000
commitf785d59aaeadd4d8f1707f2c5fffcf143de9da2c (patch)
tree25d4d38827b5109308804ef48aa264574daf5100
parent9691946f69c8aff1e77313fbe1573cae9e3d01e3 (diff)
downloadqemu-arm-f785d59aaeadd4d8f1707f2c5fffcf143de9da2c.tar.gz
target-arm: Implement asidx_from_attrs
Implement the asidx_from_attrs CPU method to return the Secure or NonSecure address space as appropriate. (The function is inline so we can use it directly in target-arm code to be added in later patches.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--target-arm/cpu.c1
-rw-r--r--target-arm/cpu.h8
2 files changed, 9 insertions, 0 deletions
diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 34caa1bbd0..ab0021e860 100644
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -1451,6 +1451,7 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data)
cc->do_interrupt = arm_cpu_do_interrupt;
cc->do_unaligned_access = arm_cpu_do_unaligned_access;
cc->get_phys_page_debug = arm_cpu_get_phys_page_debug;
+ cc->asidx_from_attrs = arm_asidx_from_attrs;
cc->vmsd = &vmstate_arm_cpu;
cc->virtio_is_big_endian = arm_cpu_is_big_endian;
#endif
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 9108b5bd6d..ee873b7079 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -1997,4 +1997,12 @@ enum {
QEMU_PSCI_CONDUIT_HVC = 2,
};
+#ifndef CONFIG_USER_ONLY
+/* Return the address space index to use for a memory access */
+static inline int arm_asidx_from_attrs(CPUState *cs, MemTxAttrs attrs)
+{
+ return attrs.secure ? ARMASIdx_S : ARMASIdx_NS;
+}
+#endif
+
#endif