On 05/27/2018 11:13 AM, Richard Henderson wrote:
> This allows us to limit the amount of ifdefs and isolate
> the test for usermode.
>
> Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> target/openrisc/translate.c | 27 ++++++++++++---------------
> 1 file changed, 12 insertions(+), 15 deletions(-)
>
> diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c
> index a8afb9a562..61e6deef69 100644
> --- a/target/openrisc/translate.c
> +++ b/target/openrisc/translate.c
> @@ -54,6 +54,15 @@ typedef struct DisasContext {
> target_ulong jmp_pc_imm;
> } DisasContext;
>
> +static inline bool is_user(DisasContext *dc)
> +{
> +#ifdef CONFIG_USER_ONLY
> + return true;
> +#else
> + return dc->mem_idx == MMU_USER_IDX;
> +#endif
> +}
> +
> /* Include the auto-generated decoder. */
> #include "decode.inc.c"
>
> @@ -914,17 +923,13 @@ static bool trans_l_mfspr(DisasContext *dc, arg_l_mfspr
> *a, uint32_t insn)
> LOG_DIS("l.mfspr r%d, r%d, %d\n", a->d, a->a, a->k);
> check_r0_write(a->d);
>
> -#ifdef CONFIG_USER_ONLY
> - gen_illegal_exception(dc);
> -#else
> - if (dc->mem_idx == MMU_USER_IDX) {
> + if (is_user(dc)) {
> gen_illegal_exception(dc);
> } else {
> TCGv_i32 ti = tcg_const_i32(a->k);
> gen_helper_mfspr(cpu_R[a->d], cpu_env, cpu_R[a->d], cpu_R[a->a], ti);
> tcg_temp_free_i32(ti);
> }
> -#endif
> return true;
> }
>
> @@ -932,17 +937,13 @@ static bool trans_l_mtspr(DisasContext *dc, arg_l_mtspr
> *a, uint32_t insn)
> {
> LOG_DIS("l.mtspr r%d, r%d, %d\n", a->a, a->b, a->k);
>
> -#ifdef CONFIG_USER_ONLY
> - gen_illegal_exception(dc);
> -#else
> - if (dc->mem_idx == MMU_USER_IDX) {
> + if (is_user(dc)) {
> gen_illegal_exception(dc);
> } else {
> TCGv_i32 ti = tcg_const_i32(a->k);
> gen_helper_mtspr(cpu_env, cpu_R[a->a], cpu_R[a->b], ti);
> tcg_temp_free_i32(ti);
> }
> -#endif
> return true;
> }
>
> @@ -1204,16 +1205,12 @@ static bool trans_l_rfe(DisasContext *dc, arg_l_rfe
> *a, uint32_t insn)
> {
> LOG_DIS("l.rfe\n");
>
> -#ifdef CONFIG_USER_ONLY
> - gen_illegal_exception(dc);
> -#else
> - if (dc->mem_idx == MMU_USER_IDX) {
> + if (is_user(dc)) {
> gen_illegal_exception(dc);
> } else {
> gen_helper_rfe(cpu_env);
> dc->base.is_jmp = DISAS_EXIT;
> }
> -#endif
> return true;
> }
>
>
