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 <[email protected]>
Acked-by: Edgar E. Iglesias <[email protected]>

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 57f1754cbf20e3fc5f4af09b636940e59a446e8f..808ec484206888de6e574c414ff659a578e56940 100644 (file)
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -1452,6 +1452,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;
     cc->write_elf64_note = arm_cpu_write_elf64_note;

diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 9108b5bd6d0197a38153e70522ac6acb6405f516..ee873b7079a3707e88ed228028ea50deda30b0f2 100644 (file)
--- 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