From b9f587d62cebed427206539750ebf59bde4df422 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 9 Oct 2017 14:48:31 +0100 Subject: 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. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 1507556919-24992-2-git-send-email-peter.maydell@linaro.org --- target/arm/translate.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'target/arm/translate.c') diff --git a/target/arm/translate.c b/target/arm/translate.c index fdc46cc525..61fd0ef6b5 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -165,6 +165,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(); -- cgit v1.2.1