Re: [Qemu-devel] [PATCH v4 3/8] target/arm/helper: Move M profile routines to m_helper.c

[Peter Maydell <peter.maydell@linaro.org>]

On Mon, 1 Jul 2019 at 20:50, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> In preparation for supporting TCG disablement on ARM, we move most
> of TCG related v7m/v8m helpers and APIs into their own file.
>
> Note: It is easier to review this commit using the 'histogram'
>       diff algorithm:
>
>     $ git diff --diff-algorithm=histogram ...
>   or
>     $ git diff --histogram ...
>
> Suggested-by: Samuel Ortiz <sameo@linux.intel.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> patch generated with git diff --histogram.
>
> v4: rebased
> ---
>  target/arm/Makefile.objs |    1 +
>  target/arm/helper.c      | 2661 +------------------------------------
>  target/arm/m_helper.c    | 2676 ++++++++++++++++++++++++++++++++++++++
>  3 files changed, 2681 insertions(+), 2657 deletions(-)
>  create mode 100644 target/arm/m_helper.c

This patch doesn't compile:

>
> -hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr,
> -                                         MemTxAttrs *attrs)
> -{
> -    ARMCPU *cpu = ARM_CPU(cs);
> -    CPUARMState *env = &cpu->env;
> -    hwaddr phys_addr;
> -    target_ulong page_size;
> -    int prot;
> -    bool ret;
> -    ARMMMUFaultInfo fi = {};
> -    ARMMMUIdx mmu_idx = arm_mmu_idx(env);
> -
> -    *attrs = (MemTxAttrs) {};
> -
> -    ret = get_phys_addr(env, addr, 0, mmu_idx, &phys_addr,
> -                        attrs, &prot, &page_size, &fi, NULL);
> -
> -    if (ret) {
> -        return -1;
> -    }
> -    return phys_addr;
> -}
> -

...it deletes the definition of arm_cpu_get_phys_page_attrs_debug(),
which should stay where it is.

thanks
-- PMM