From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 9 Oct 2017 13:48:31 +0000 (+0100)
Subject: target/arm: Add M profile secure MMU index values to get_a32_user_mem_index()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b9f587d62cebed427206539750ebf59bde4df422;p=qemu.git

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 <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 1507556919-24992-2-git-send-email-peter.maydell@linaro.org
---

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();