From 19ecd4f7324b1738ce651bf956f9c4276b642f00 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 5 Mar 2018 03:25:46 -0500 Subject: [PATCH] target/arm: Add M profile secure MMU index values to get_a32_user_mem_index() Add the M profile secure MMU index values to the switch in get_a32_user_mem_index() so that LDRT/STRT work correctly rather than asserting at translate time. Backports commit b9f587d62cebed427206539750ebf59bde4df422 from qemu --- qemu/target/arm/translate.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qemu/target/arm/translate.c b/qemu/target/arm/translate.c index 1a08c39d..c46b0801 100644 --- a/qemu/target/arm/translate.c +++ b/qemu/target/arm/translate.c @@ -151,6 +151,10 @@ static inline int get_a32_user_mem_index(DisasContext *s) case ARMMMUIdx_MPriv: case ARMMMUIdx_MNegPri: return arm_to_core_mmu_idx(ARMMMUIdx_MUser); + case ARMMMUIdx_MSUser: + case ARMMMUIdx_MSPriv: + case ARMMMUIdx_MSNegPri: + return arm_to_core_mmu_idx(ARMMMUIdx_MSUser); case ARMMMUIdx_S2NS: default: g_assert_not_reached();