On 05/27/2018 11:13 AM, Richard Henderson wrote:
> With tlb_fill in mmu.c, we can simplify things further.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> target/openrisc/mmu.c | 11 ++++++++++
> target/openrisc/mmu_helper.c | 40 -----------------------------------
> target/openrisc/Makefile.objs | 2 +-
> 3 files changed, 12 insertions(+), 41 deletions(-)
> delete mode 100644 target/openrisc/mmu_helper.c
>
> diff --git a/target/openrisc/mmu.c b/target/openrisc/mmu.c
> index b2effaa6d7..9b4b5cf04f 100644
> --- a/target/openrisc/mmu.c
> +++ b/target/openrisc/mmu.c
> @@ -240,4 +240,15 @@ hwaddr openrisc_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
> return phys_addr;
> }
> }
> +
> +void tlb_fill(CPUState *cs, target_ulong addr, int size,
> + MMUAccessType access_type, int mmu_idx, uintptr_t retaddr)
> +{
> + int ret = openrisc_cpu_handle_mmu_fault(cs, addr, size,
> + access_type, mmu_idx);
> + if (ret) {
> + /* Raise Exception. */
> + cpu_loop_exit_restore(cs, retaddr);
> + }
> +}
> #endif
> diff --git a/target/openrisc/mmu_helper.c b/target/openrisc/mmu_helper.c
> deleted file mode 100644
> index 97e1d17b5a..0000000000
> --- a/target/openrisc/mmu_helper.c
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -/*
> - * OpenRISC MMU helper routines
> - *
> - * Copyright (c) 2011-2012 Jia Liu <proljc@gmail.com>
> - * Zhizhou Zhang <etouzh@gmail.com>
> - *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> - */
> -
> -#include "qemu/osdep.h"
> -#include "cpu.h"
> -#include "exec/exec-all.h"
> -#include "exec/cpu_ldst.h"
> -
> -#ifndef CONFIG_USER_ONLY
> -
> -void tlb_fill(CPUState *cs, target_ulong addr, int size,
> - MMUAccessType access_type, int mmu_idx, uintptr_t retaddr)
> -{
> - int ret;
> -
> - ret = openrisc_cpu_handle_mmu_fault(cs, addr, size, access_type, mmu_idx);
> -
> - if (ret) {
> - /* Raise Exception. */
> - cpu_loop_exit_restore(cs, retaddr);
> - }
> -}
> -#endif
> diff --git a/target/openrisc/Makefile.objs b/target/openrisc/Makefile.objs
> index 1b98a911ea..957ce02199 100644
> --- a/target/openrisc/Makefile.objs
> +++ b/target/openrisc/Makefile.objs
> @@ -1,7 +1,7 @@
> obj-$(CONFIG_SOFTMMU) += machine.o
> obj-y += cpu.o exception.o interrupt.o mmu.o translate.o
> obj-y += exception_helper.o fpu_helper.o \
> - interrupt_helper.o mmu_helper.o sys_helper.o
> + interrupt_helper.o sys_helper.o
> obj-y += gdbstub.o
>
> DECODETREE = $(SRC_PATH)/scripts/decodetree.py
>