On Mon, May 19, 2014 at 7:23 PM, Edgar E. Iglesias
<edgar.igles...@gmail.com> wrote:
> From: "Edgar E. Iglesias" <edgar.igles...@gmail.com>
>
> Signed-off-by: Edgar E. Iglesias <edgar.igles...@gmail.com>
> ---
> target-arm/cpu.h | 26 ++++----------------------
> target-arm/translate.h | 2 +-
> 2 files changed, 5 insertions(+), 23 deletions(-)
>
> diff --git a/target-arm/cpu.h b/target-arm/cpu.h
> index 566f9ed..3b7ef32 100644
> --- a/target-arm/cpu.h
> +++ b/target-arm/cpu.h
> @@ -1084,32 +1084,14 @@ static inline CPUARMState *cpu_init(const char
> *cpu_model)
> #define cpu_list arm_cpu_list
>
> /* MMU modes definitions */
> -#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
> -}
> +#define MMU_MODE0_SUFFIX _user
> +#define MMU_MODE1_SUFFIX _kernel
> +#define MMU_USER_IDX 0
>
> static inline int cpu_mmu_index (CPUARMState *env)
> {
> int cur_el = arm_current_pl(env);
> - return arm_el_to_mmu_idx(cur_el);
> + return cur_el;
> }
>
> #include "exec/cpu-all.h"
> diff --git a/target-arm/translate.h b/target-arm/translate.h
> index db6f0af..31a0104 100644
> --- a/target-arm/translate.h
> +++ b/target-arm/translate.h
> @@ -54,7 +54,7 @@ static inline int arm_dc_feature(DisasContext *dc, int
> feature)
>
> static inline int get_mem_index(DisasContext *s)
> {
> - return arm_el_to_mmu_idx(s->current_pl);
> + return s->current_pl;
> }
>
> /* target-specific extra values for is_jmp */
> --
> 1.8.3.2
>
>
I'm a fan of this change. Should it squash into earlier in the series?
Regards,
Peter
