From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhYc9-0004wF-JU for qemu-devel@nongnu.org; Tue, 06 May 2014 02:12:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WhYc2-00010C-44 for qemu-devel@nongnu.org; Tue, 06 May 2014 02:12:29 -0400 Received: from mail-qc0-x234.google.com ([2607:f8b0:400d:c01::234]:33448) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhYc2-000108-0F for qemu-devel@nongnu.org; Tue, 06 May 2014 02:12:22 -0400 Received: by mail-qc0-f180.google.com with SMTP id i17so8015019qcy.25 for ; Mon, 05 May 2014 23:12:21 -0700 (PDT) From: "Edgar E. Iglesias" Date: Tue, 6 May 2014 16:08:09 +1000 Message-Id: <1399356506-5609-6-git-send-email-edgar.iglesias@gmail.com> In-Reply-To: <1399356506-5609-1-git-send-email-edgar.iglesias@gmail.com> References: <1399356506-5609-1-git-send-email-edgar.iglesias@gmail.com> Subject: [Qemu-devel] [PATCH v1 05/22] target-arm: Add arm_el_to_mmu_idx() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: rob.herring@linaro.org, peter.crosthwaite@xilinx.com, john.williams@xilinx.com, alex.bennee@linaro.org, agraf@suse.de From: "Edgar E. Iglesias" Maps a given EL to the corresponding MMU index. Signed-off-by: Edgar E. Iglesias --- target-arm/cpu.h | 21 ++++++++++++++++++++- target-arm/translate-a64.c | 8 ++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index ff86250..938f389 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -1086,9 +1086,28 @@ static inline CPUARMState *cpu_init(const char *cpu_model) #define MMU_MODE0_SUFFIX _kernel #define MMU_MODE1_SUFFIX _user #define MMU_USER_IDX 1 +static inline int arm_el_to_mmu_idx(int current_el) +{ +#ifdef CONFIG_USER_ONLY + return MMU_USER_IDX; +#else + switch (current_el) { + case 0: + return MMU_USER_IDX; + case 1: + return 0; + default: + /* Unsupported EL. */ + assert(0); + return 0; + } +#endif +} + static inline int cpu_mmu_index (CPUARMState *env) { - return arm_current_pl(env) ? 0 : 1; + int cur_el = arm_current_pl(env); + return arm_el_to_mmu_idx(cur_el); } #include "exec/cpu-all.h" diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 4f8246f..8523e76 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -164,13 +164,9 @@ void aarch64_cpu_dump_state(CPUState *cs, FILE *f, } } -static int get_mem_index(DisasContext *s) +static inline int get_mem_index(DisasContext *s) { -#ifdef CONFIG_USER_ONLY - return 1; -#else - return s->user; -#endif + return arm_el_to_mmu_idx(s->current_pl); } void gen_a64_set_pc_im(uint64_t val) -- 1.8.3.2