Re: [PATCH v4 01/17] target/ppc: Move helper_regs.h functions out-of-line

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 15628 bytes --]

On Mon, Mar 15, 2021 at 12:45:59PM -0600, Richard Henderson wrote:
> Move the functions to a new file, helper_regs.c.
> 
> Note int_helper.c was relying on helper_regs.h to
> indirectly include qemu/log.h.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Applied to ppc-for-6.0, thanks.

> ---
>  target/ppc/helper_regs.h | 184 ++----------------------------------
>  target/ppc/helper_regs.c | 197 +++++++++++++++++++++++++++++++++++++++
>  target/ppc/int_helper.c  |   1 +
>  target/ppc/meson.build   |   1 +
>  4 files changed, 207 insertions(+), 176 deletions(-)
>  create mode 100644 target/ppc/helper_regs.c
> 
> diff --git a/target/ppc/helper_regs.h b/target/ppc/helper_regs.h
> index efcc903427..4148a442b3 100644
> --- a/target/ppc/helper_regs.h
> +++ b/target/ppc/helper_regs.h
> @@ -20,184 +20,16 @@
>  #ifndef HELPER_REGS_H
>  #define HELPER_REGS_H
>  
> -#include "qemu/main-loop.h"
> -#include "exec/exec-all.h"
> -#include "sysemu/kvm.h"
> +void hreg_swap_gpr_tgpr(CPUPPCState *env);
> +void hreg_compute_mem_idx(CPUPPCState *env);
> +void hreg_compute_hflags(CPUPPCState *env);
> +void cpu_interrupt_exittb(CPUState *cs);
> +int hreg_store_msr(CPUPPCState *env, target_ulong value, int alter_hv);
>  
> -/* Swap temporary saved registers with GPRs */
> -static inline void hreg_swap_gpr_tgpr(CPUPPCState *env)
> -{
> -    target_ulong tmp;
> -
> -    tmp = env->gpr[0];
> -    env->gpr[0] = env->tgpr[0];
> -    env->tgpr[0] = tmp;
> -    tmp = env->gpr[1];
> -    env->gpr[1] = env->tgpr[1];
> -    env->tgpr[1] = tmp;
> -    tmp = env->gpr[2];
> -    env->gpr[2] = env->tgpr[2];
> -    env->tgpr[2] = tmp;
> -    tmp = env->gpr[3];
> -    env->gpr[3] = env->tgpr[3];
> -    env->tgpr[3] = tmp;
> -}
> -
> -static inline void hreg_compute_mem_idx(CPUPPCState *env)
> -{
> -    /*
> -     * This is our encoding for server processors. The architecture
> -     * specifies that there is no such thing as userspace with
> -     * translation off, however it appears that MacOS does it and some
> -     * 32-bit CPUs support it. Weird...
> -     *
> -     *   0 = Guest User space virtual mode
> -     *   1 = Guest Kernel space virtual mode
> -     *   2 = Guest User space real mode
> -     *   3 = Guest Kernel space real mode
> -     *   4 = HV User space virtual mode
> -     *   5 = HV Kernel space virtual mode
> -     *   6 = HV User space real mode
> -     *   7 = HV Kernel space real mode
> -     *
> -     * For BookE, we need 8 MMU modes as follow:
> -     *
> -     *  0 = AS 0 HV User space
> -     *  1 = AS 0 HV Kernel space
> -     *  2 = AS 1 HV User space
> -     *  3 = AS 1 HV Kernel space
> -     *  4 = AS 0 Guest User space
> -     *  5 = AS 0 Guest Kernel space
> -     *  6 = AS 1 Guest User space
> -     *  7 = AS 1 Guest Kernel space
> -     */
> -    if (env->mmu_model & POWERPC_MMU_BOOKE) {
> -        env->immu_idx = env->dmmu_idx = msr_pr ? 0 : 1;
> -        env->immu_idx += msr_is ? 2 : 0;
> -        env->dmmu_idx += msr_ds ? 2 : 0;
> -        env->immu_idx += msr_gs ? 4 : 0;
> -        env->dmmu_idx += msr_gs ? 4 : 0;
> -    } else {
> -        env->immu_idx = env->dmmu_idx = msr_pr ? 0 : 1;
> -        env->immu_idx += msr_ir ? 0 : 2;
> -        env->dmmu_idx += msr_dr ? 0 : 2;
> -        env->immu_idx += msr_hv ? 4 : 0;
> -        env->dmmu_idx += msr_hv ? 4 : 0;
> -    }
> -}
> -
> -static inline void hreg_compute_hflags(CPUPPCState *env)
> -{
> -    target_ulong hflags_mask;
> -
> -    /* We 'forget' FE0 & FE1: we'll never generate imprecise exceptions */
> -    hflags_mask = (1 << MSR_VR) | (1 << MSR_AP) | (1 << MSR_SA) |
> -        (1 << MSR_PR) | (1 << MSR_FP) | (1 << MSR_SE) | (1 << MSR_BE) |
> -        (1 << MSR_LE) | (1 << MSR_VSX) | (1 << MSR_IR) | (1 << MSR_DR);
> -    hflags_mask |= (1ULL << MSR_CM) | (1ULL << MSR_SF) | MSR_HVB;
> -    hreg_compute_mem_idx(env);
> -    env->hflags = env->msr & hflags_mask;
> -    /* Merge with hflags coming from other registers */
> -    env->hflags |= env->hflags_nmsr;
> -}
> -
> -static inline void cpu_interrupt_exittb(CPUState *cs)
> -{
> -    if (!kvm_enabled()) {
> -        return;
> -    }
> -
> -    if (!qemu_mutex_iothread_locked()) {
> -        qemu_mutex_lock_iothread();
> -        cpu_interrupt(cs, CPU_INTERRUPT_EXITTB);
> -        qemu_mutex_unlock_iothread();
> -    } else {
> -        cpu_interrupt(cs, CPU_INTERRUPT_EXITTB);
> -    }
> -}
> -
> -static inline int hreg_store_msr(CPUPPCState *env, target_ulong value,
> -                                 int alter_hv)
> -{
> -    int excp;
> -#if !defined(CONFIG_USER_ONLY)
> -    CPUState *cs = env_cpu(env);
> -#endif
> -
> -    excp = 0;
> -    value &= env->msr_mask;
> -#if !defined(CONFIG_USER_ONLY)
> -    /* Neither mtmsr nor guest state can alter HV */
> -    if (!alter_hv || !(env->msr & MSR_HVB)) {
> -        value &= ~MSR_HVB;
> -        value |= env->msr & MSR_HVB;
> -    }
> -    if (((value >> MSR_IR) & 1) != msr_ir ||
> -        ((value >> MSR_DR) & 1) != msr_dr) {
> -        cpu_interrupt_exittb(cs);
> -    }
> -    if ((env->mmu_model & POWERPC_MMU_BOOKE) &&
> -        ((value >> MSR_GS) & 1) != msr_gs) {
> -        cpu_interrupt_exittb(cs);
> -    }
> -    if (unlikely((env->flags & POWERPC_FLAG_TGPR) &&
> -                 ((value ^ env->msr) & (1 << MSR_TGPR)))) {
> -        /* Swap temporary saved registers with GPRs */
> -        hreg_swap_gpr_tgpr(env);
> -    }
> -    if (unlikely((value >> MSR_EP) & 1) != msr_ep) {
> -        /* Change the exception prefix on PowerPC 601 */
> -        env->excp_prefix = ((value >> MSR_EP) & 1) * 0xFFF00000;
> -    }
> -    /*
> -     * If PR=1 then EE, IR and DR must be 1
> -     *
> -     * Note: We only enforce this on 64-bit server processors.
> -     * It appears that:
> -     * - 32-bit implementations supports PR=1 and EE/DR/IR=0 and MacOS
> -     *   exploits it.
> -     * - 64-bit embedded implementations do not need any operation to be
> -     *   performed when PR is set.
> -     */
> -    if (is_book3s_arch2x(env) && ((value >> MSR_PR) & 1)) {
> -        value |= (1 << MSR_EE) | (1 << MSR_DR) | (1 << MSR_IR);
> -    }
> -#endif
> -    env->msr = value;
> -    hreg_compute_hflags(env);
> -#if !defined(CONFIG_USER_ONLY)
> -    if (unlikely(msr_pow == 1)) {
> -        if (!env->pending_interrupts && (*env->check_pow)(env)) {
> -            cs->halted = 1;
> -            excp = EXCP_HALTED;
> -        }
> -    }
> -#endif
> -
> -    return excp;
> -}
> -
> -#if !defined(CONFIG_USER_ONLY)
> -static inline void check_tlb_flush(CPUPPCState *env, bool global)
> -{
> -    CPUState *cs = env_cpu(env);
> -
> -    /* Handle global flushes first */
> -    if (global && (env->tlb_need_flush & TLB_NEED_GLOBAL_FLUSH)) {
> -        env->tlb_need_flush &= ~TLB_NEED_GLOBAL_FLUSH;
> -        env->tlb_need_flush &= ~TLB_NEED_LOCAL_FLUSH;
> -        tlb_flush_all_cpus_synced(cs);
> -        return;
> -    }
> -
> -    /* Then handle local ones */
> -    if (env->tlb_need_flush & TLB_NEED_LOCAL_FLUSH) {
> -        env->tlb_need_flush &= ~TLB_NEED_LOCAL_FLUSH;
> -        tlb_flush(cs);
> -    }
> -}
> -#else
> +#ifdef CONFIG_USER_ONLY
>  static inline void check_tlb_flush(CPUPPCState *env, bool global) { }
> +#else
> +void check_tlb_flush(CPUPPCState *env, bool global);
>  #endif
>  
>  #endif /* HELPER_REGS_H */
> diff --git a/target/ppc/helper_regs.c b/target/ppc/helper_regs.c
> new file mode 100644
> index 0000000000..5e18232b84
> --- /dev/null
> +++ b/target/ppc/helper_regs.c
> @@ -0,0 +1,197 @@
> +/*
> + *  PowerPC emulation special registers manipulation helpers for qemu.
> + *
> + *  Copyright (c) 2003-2007 Jocelyn Mayer
> + *
> + * 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.1 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 "qemu/main-loop.h"
> +#include "exec/exec-all.h"
> +#include "sysemu/kvm.h"
> +#include "helper_regs.h"
> +
> +/* Swap temporary saved registers with GPRs */
> +void hreg_swap_gpr_tgpr(CPUPPCState *env)
> +{
> +    target_ulong tmp;
> +
> +    tmp = env->gpr[0];
> +    env->gpr[0] = env->tgpr[0];
> +    env->tgpr[0] = tmp;
> +    tmp = env->gpr[1];
> +    env->gpr[1] = env->tgpr[1];
> +    env->tgpr[1] = tmp;
> +    tmp = env->gpr[2];
> +    env->gpr[2] = env->tgpr[2];
> +    env->tgpr[2] = tmp;
> +    tmp = env->gpr[3];
> +    env->gpr[3] = env->tgpr[3];
> +    env->tgpr[3] = tmp;
> +}
> +
> +void hreg_compute_mem_idx(CPUPPCState *env)
> +{
> +    /*
> +     * This is our encoding for server processors. The architecture
> +     * specifies that there is no such thing as userspace with
> +     * translation off, however it appears that MacOS does it and some
> +     * 32-bit CPUs support it. Weird...
> +     *
> +     *   0 = Guest User space virtual mode
> +     *   1 = Guest Kernel space virtual mode
> +     *   2 = Guest User space real mode
> +     *   3 = Guest Kernel space real mode
> +     *   4 = HV User space virtual mode
> +     *   5 = HV Kernel space virtual mode
> +     *   6 = HV User space real mode
> +     *   7 = HV Kernel space real mode
> +     *
> +     * For BookE, we need 8 MMU modes as follow:
> +     *
> +     *  0 = AS 0 HV User space
> +     *  1 = AS 0 HV Kernel space
> +     *  2 = AS 1 HV User space
> +     *  3 = AS 1 HV Kernel space
> +     *  4 = AS 0 Guest User space
> +     *  5 = AS 0 Guest Kernel space
> +     *  6 = AS 1 Guest User space
> +     *  7 = AS 1 Guest Kernel space
> +     */
> +    if (env->mmu_model & POWERPC_MMU_BOOKE) {
> +        env->immu_idx = env->dmmu_idx = msr_pr ? 0 : 1;
> +        env->immu_idx += msr_is ? 2 : 0;
> +        env->dmmu_idx += msr_ds ? 2 : 0;
> +        env->immu_idx += msr_gs ? 4 : 0;
> +        env->dmmu_idx += msr_gs ? 4 : 0;
> +    } else {
> +        env->immu_idx = env->dmmu_idx = msr_pr ? 0 : 1;
> +        env->immu_idx += msr_ir ? 0 : 2;
> +        env->dmmu_idx += msr_dr ? 0 : 2;
> +        env->immu_idx += msr_hv ? 4 : 0;
> +        env->dmmu_idx += msr_hv ? 4 : 0;
> +    }
> +}
> +
> +void hreg_compute_hflags(CPUPPCState *env)
> +{
> +    target_ulong hflags_mask;
> +
> +    /* We 'forget' FE0 & FE1: we'll never generate imprecise exceptions */
> +    hflags_mask = (1 << MSR_VR) | (1 << MSR_AP) | (1 << MSR_SA) |
> +        (1 << MSR_PR) | (1 << MSR_FP) | (1 << MSR_SE) | (1 << MSR_BE) |
> +        (1 << MSR_LE) | (1 << MSR_VSX) | (1 << MSR_IR) | (1 << MSR_DR);
> +    hflags_mask |= (1ULL << MSR_CM) | (1ULL << MSR_SF) | MSR_HVB;
> +    hreg_compute_mem_idx(env);
> +    env->hflags = env->msr & hflags_mask;
> +    /* Merge with hflags coming from other registers */
> +    env->hflags |= env->hflags_nmsr;
> +}
> +
> +void cpu_interrupt_exittb(CPUState *cs)
> +{
> +    if (!kvm_enabled()) {
> +        return;
> +    }
> +
> +    if (!qemu_mutex_iothread_locked()) {
> +        qemu_mutex_lock_iothread();
> +        cpu_interrupt(cs, CPU_INTERRUPT_EXITTB);
> +        qemu_mutex_unlock_iothread();
> +    } else {
> +        cpu_interrupt(cs, CPU_INTERRUPT_EXITTB);
> +    }
> +}
> +
> +int hreg_store_msr(CPUPPCState *env, target_ulong value, int alter_hv)
> +{
> +    int excp;
> +#if !defined(CONFIG_USER_ONLY)
> +    CPUState *cs = env_cpu(env);
> +#endif
> +
> +    excp = 0;
> +    value &= env->msr_mask;
> +#if !defined(CONFIG_USER_ONLY)
> +    /* Neither mtmsr nor guest state can alter HV */
> +    if (!alter_hv || !(env->msr & MSR_HVB)) {
> +        value &= ~MSR_HVB;
> +        value |= env->msr & MSR_HVB;
> +    }
> +    if (((value >> MSR_IR) & 1) != msr_ir ||
> +        ((value >> MSR_DR) & 1) != msr_dr) {
> +        cpu_interrupt_exittb(cs);
> +    }
> +    if ((env->mmu_model & POWERPC_MMU_BOOKE) &&
> +        ((value >> MSR_GS) & 1) != msr_gs) {
> +        cpu_interrupt_exittb(cs);
> +    }
> +    if (unlikely((env->flags & POWERPC_FLAG_TGPR) &&
> +                 ((value ^ env->msr) & (1 << MSR_TGPR)))) {
> +        /* Swap temporary saved registers with GPRs */
> +        hreg_swap_gpr_tgpr(env);
> +    }
> +    if (unlikely((value >> MSR_EP) & 1) != msr_ep) {
> +        /* Change the exception prefix on PowerPC 601 */
> +        env->excp_prefix = ((value >> MSR_EP) & 1) * 0xFFF00000;
> +    }
> +    /*
> +     * If PR=1 then EE, IR and DR must be 1
> +     *
> +     * Note: We only enforce this on 64-bit server processors.
> +     * It appears that:
> +     * - 32-bit implementations supports PR=1 and EE/DR/IR=0 and MacOS
> +     *   exploits it.
> +     * - 64-bit embedded implementations do not need any operation to be
> +     *   performed when PR is set.
> +     */
> +    if (is_book3s_arch2x(env) && ((value >> MSR_PR) & 1)) {
> +        value |= (1 << MSR_EE) | (1 << MSR_DR) | (1 << MSR_IR);
> +    }
> +#endif
> +    env->msr = value;
> +    hreg_compute_hflags(env);
> +#if !defined(CONFIG_USER_ONLY)
> +    if (unlikely(msr_pow == 1)) {
> +        if (!env->pending_interrupts && (*env->check_pow)(env)) {
> +            cs->halted = 1;
> +            excp = EXCP_HALTED;
> +        }
> +    }
> +#endif
> +
> +    return excp;
> +}
> +
> +#ifndef CONFIG_USER_ONLY
> +void check_tlb_flush(CPUPPCState *env, bool global)
> +{
> +    CPUState *cs = env_cpu(env);
> +
> +    /* Handle global flushes first */
> +    if (global && (env->tlb_need_flush & TLB_NEED_GLOBAL_FLUSH)) {
> +        env->tlb_need_flush &= ~TLB_NEED_GLOBAL_FLUSH;
> +        env->tlb_need_flush &= ~TLB_NEED_LOCAL_FLUSH;
> +        tlb_flush_all_cpus_synced(cs);
> +        return;
> +    }
> +
> +    /* Then handle local ones */
> +    if (env->tlb_need_flush & TLB_NEED_LOCAL_FLUSH) {
> +        env->tlb_need_flush &= ~TLB_NEED_LOCAL_FLUSH;
> +        tlb_flush(cs);
> +    }
> +}
> +#endif
> diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c
> index 429de28494..a44c2d90ea 100644
> --- a/target/ppc/int_helper.c
> +++ b/target/ppc/int_helper.c
> @@ -22,6 +22,7 @@
>  #include "internal.h"
>  #include "qemu/host-utils.h"
>  #include "qemu/main-loop.h"
> +#include "qemu/log.h"
>  #include "exec/helper-proto.h"
>  #include "crypto/aes.h"
>  #include "fpu/softfloat.h"
> diff --git a/target/ppc/meson.build b/target/ppc/meson.build
> index bbfef90e08..4079d01ee3 100644
> --- a/target/ppc/meson.build
> +++ b/target/ppc/meson.build
> @@ -6,6 +6,7 @@ ppc_ss.add(files(
>    'excp_helper.c',
>    'fpu_helper.c',
>    'gdbstub.c',
> +  'helper_regs.c',
>    'int_helper.c',
>    'mem_helper.c',
>    'misc_helper.c',

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]