Commit 6f7a6993 authored by David Gibson's avatar David Gibson
Browse files

target/ppc: Style fixes for machine.c 



Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarCédric Le Goater <clg@kaod.org>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
parent c995e942

target/ppc/machine.c

+63 −43
Original line number Diff line number Diff line
@@ -24,22 +24,26 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int version_id) 
#endif

    target_ulong xer;



    for (i = 0; i < 32; i++)

    for (i = 0; i < 32; i++) {

        qemu_get_betls(f, &env->gpr[i]);

    }

#if !defined(TARGET_PPC64)

    for (i = 0; i < 32; i++)

    for (i = 0; i < 32; i++) {

        qemu_get_betls(f, &env->gprh[i]);

    }

#endif

    qemu_get_betls(f, &env->lr);

    qemu_get_betls(f, &env->ctr);

    for (i = 0; i < 8; i++)

    for (i = 0; i < 8; i++) {

        qemu_get_be32s(f, &env->crf[i]);

    }

    qemu_get_betls(f, &xer);

    cpu_write_xer(env, xer);

    qemu_get_betls(f, &env->reserve_addr);

    qemu_get_betls(f, &env->msr);

    for (i = 0; i < 4; i++)

    for (i = 0; i < 4; i++) {

        qemu_get_betls(f, &env->tgpr[i]);

    }

    for (i = 0; i < 32; i++) {

        union {

            float64 d;
@@ -56,14 +60,19 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int version_id) 
    qemu_get_sbe32s(f, &slb_nr);

#endif

    qemu_get_betls(f, &sdr1);

    for (i = 0; i < 32; i++)

    for (i = 0; i < 32; i++) {

        qemu_get_betls(f, &env->sr[i]);

    for (i = 0; i < 2; i++)

        for (j = 0; j < 8; j++)

    }

    for (i = 0; i < 2; i++) {

        for (j = 0; j < 8; j++) {

            qemu_get_betls(f, &env->DBAT[i][j]);

    for (i = 0; i < 2; i++)

        for (j = 0; j < 8; j++)

        }

    }

    for (i = 0; i < 2; i++) {

        for (j = 0; j < 8; j++) {

            qemu_get_betls(f, &env->IBAT[i][j]);

        }

    }

    qemu_get_sbe32s(f, &env->nb_tlb);

    qemu_get_sbe32s(f, &env->tlb_per_way);

    qemu_get_sbe32s(f, &env->nb_ways);
@@ -71,17 +80,19 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int version_id) 
    qemu_get_sbe32s(f, &env->id_tlbs);

    qemu_get_sbe32s(f, &env->nb_pids);

    if (env->tlb.tlb6) {

        // XXX assumes 6xx

        /* XXX assumes 6xx */

        for (i = 0; i < env->nb_tlb; i++) {

            qemu_get_betls(f, &env->tlb.tlb6[i].pte0);

            qemu_get_betls(f, &env->tlb.tlb6[i].pte1);

            qemu_get_betls(f, &env->tlb.tlb6[i].EPN);

        }

    }

    for (i = 0; i < 4; i++)

    for (i = 0; i < 4; i++) {

        qemu_get_betls(f, &env->pb[i]);

    for (i = 0; i < 1024; i++)

    }

    for (i = 0; i < 1024; i++) {

        qemu_get_betls(f, &env->spr[i]);

    }

    if (!cpu->vhyp) {

        ppc_store_sdr1(env, sdr1);

    }
@@ -94,8 +105,9 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int version_id) 
    qemu_get_sbe32s(f, &env->error_code);

    qemu_get_be32s(f, &env->pending_interrupts);

    qemu_get_be32s(f, &env->irq_input_state);

    for (i = 0; i < POWERPC_EXCP_NB; i++)

    for (i = 0; i < POWERPC_EXCP_NB; i++) {

        qemu_get_betls(f, &env->excp_vectors[i]);

    }

    qemu_get_betls(f, &env->excp_prefix);

    qemu_get_betls(f, &env->ivor_mask);

    qemu_get_betls(f, &env->ivpr_mask);
@@ -267,8 +279,10 @@ static int cpu_pre_save(void *opaque) 


    /* Hacks for migration compatibility between 2.6, 2.7 & 2.8 */

    if (cpu->pre_2_8_migration) {

        /* Mask out bits that got added to msr_mask since the versions

         * which stupidly included it in the migration stream. */

        /*

         * Mask out bits that got added to msr_mask since the versions

         * which stupidly included it in the migration stream.

         */

        target_ulong metamask = 0

#if defined(TARGET_PPC64)

            | (1ULL << MSR_TS0)
@@ -277,9 +291,10 @@ static int cpu_pre_save(void *opaque) 
            ;

        cpu->mig_msr_mask = env->msr_mask & ~metamask;

        cpu->mig_insns_flags = env->insns_flags & insns_compat_mask;

        /* CPU models supported by old machines all have PPC_MEM_TLBIE,

         * so we set it unconditionally to allow backward migration from

         * a POWER9 host to a POWER8 host.

        /*

         * CPU models supported by old machines all have

         * PPC_MEM_TLBIE, so we set it unconditionally to allow

         * backward migration from a POWER9 host to a POWER8 host.

         */

        cpu->mig_insns_flags |= PPC_MEM_TLBIE;

        cpu->mig_insns_flags2 = env->insns_flags2 & insns_compat_mask2;
@@ -395,7 +410,10 @@ static int cpu_post_load(void *opaque, int version_id) 
        ppc_store_sdr1(env, env->spr[SPR_SDR1]);

    }



    /* Invalidate all supported msr bits except MSR_TGPR/MSR_HVB before restoring */

    /*

     * Invalidate all supported msr bits except MSR_TGPR/MSR_HVB

     * before restoring

     */

    msr = env->msr;

    env->msr ^= env->msr_mask & ~((1ULL << MSR_TGPR) | MSR_HVB);

    ppc_store_msr(env, msr);
@@ -409,7 +427,7 @@ static bool fpu_needed(void *opaque) 
{

    PowerPCCPU *cpu = opaque;



    return (cpu->env.insns_flags & PPC_FLOAT);

    return cpu->env.insns_flags & PPC_FLOAT;

}



static const VMStateDescription vmstate_fpu = {
@@ -428,7 +446,7 @@ static bool altivec_needed(void *opaque) 
{

    PowerPCCPU *cpu = opaque;



    return (cpu->env.insns_flags & PPC_ALTIVEC);

    return cpu->env.insns_flags & PPC_ALTIVEC;

}



static int get_vscr(QEMUFile *f, void *opaque, size_t size,
@@ -483,7 +501,7 @@ static bool vsx_needed(void *opaque) 
{

    PowerPCCPU *cpu = opaque;



    return (cpu->env.insns_flags2 & PPC2_VSX);

    return cpu->env.insns_flags2 & PPC2_VSX;

}



static const VMStateDescription vmstate_vsx = {
@@ -591,7 +609,7 @@ static bool slb_needed(void *opaque) 
    PowerPCCPU *cpu = opaque;



    /* We don't support any of the old segment table based 64-bit CPUs */

    return (cpu->env.mmu_model & POWERPC_MMU_64);

    return cpu->env.mmu_model & POWERPC_MMU_64;

}



static int slb_post_load(void *opaque, int version_id)
@@ -600,8 +618,10 @@ static int slb_post_load(void *opaque, int version_id) 
    CPUPPCState *env = &cpu->env;

    int i;



    /* We've pulled in the raw esid and vsid values from the migration

     * stream, but we need to recompute the page size pointers */

    /*

     * We've pulled in the raw esid and vsid values from the migration

     * stream, but we need to recompute the page size pointers

     */

    for (i = 0; i < cpu->hash64_opts->slb_size; i++) {

        if (ppc_store_slb(cpu, i, env->slb[i].esid, env->slb[i].vsid) < 0) {

            /* Migration source had bad values in its SLB */