Commit be1b21e8 authored by Kurban Mallachiev's avatar Kurban Mallachiev Committed by David Gibson
Browse files

target-ppc: Don't invalidate non-supported msr bits 



The msr invalidation code (commits 993eb and 2360b) inverts all
bits except MSR_TGPR and MSR_HVB. On non PowerPC 601 processors
this leads to incorrect change of excp_prefix in hreg_store_msr()
function. The problem is that new msr value get multiplied by msr_mask
and inverted msr does not, thus values of MSR_EP bit in new msr value
and inverted msr are distinct, so that excp_prefix changes but should
not.

Signed-off-by: default avatarKurban Mallachiev <mallachiev@ispras.ru>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 0c86b2df

target/ppc/machine.c

+2 −2
Original line number Diff line number Diff line
@@ -300,9 +300,9 @@ static int cpu_post_load(void *opaque, int version_id) 
        ppc_store_sdr1(env, env->spr[SPR_SDR1]);

    }



    /* Invalidate all 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 ^= ~((1ULL << MSR_TGPR) | MSR_HVB);

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

    ppc_store_msr(env, msr);



    hreg_compute_mem_idx(env);