Commit 5250ced8 authored by Alistair Francis's avatar Alistair Francis Committed by Edgar E. Iglesias
Browse files

target-microblaze: Set the PC in reset instead of realize 



Set the Microblaze CPU PC in the reset instead of setting it
in the realize. This is required as the PC is zeroed in the
reset function and causes problems in some situations.

Signed-off-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
parent c8667283

target-microblaze/cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ static void mb_cpu_reset(CPUState *s) 
    /* Disable stack protector.  */

    env->shr = ~0;



    env->sregs[SR_PC] = cpu->cfg.base_vectors;



#if defined(CONFIG_USER_ONLY)

    /* start in user mode with interrupts enabled.  */

    env->sregs[SR_MSR] = MSR_EE | MSR_IE | MSR_VM | MSR_UM;
@@ -183,8 +185,6 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp) 
    env->pvr.regs[10] = 0x0c000000; /* Default to spartan 3a dsp family.  */

    env->pvr.regs[11] = PVR11_USE_MMU | (16 << 17);



    env->sregs[SR_PC] = cpu->cfg.base_vectors;



    mcc->parent_realize(dev, errp);

}