Commit 691b9572 authored Jun 23, 2015 by Peter Crosthwaite Committed by Andreas Färber Jul 09, 2015

microblaze: boot: Use cpu_set_pc()



Use cpu_set_pc() for setting program counters when bootloading. This
removes an instance of system level code having to reach into the CPU
env.

Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
[AF: Avoid duplicated CPU() casts through local variable]
Signed-off-by: Andreas Färber <afaerber@suse.de>

parent 4df81c6e

hw/microblaze/boot.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -48,13 +48,14 @@ static struct
		static void main_cpu_reset(void *opaque)
		{
		MicroBlazeCPU *cpu = opaque;
		CPUState *cs = CPU(cpu);
		CPUMBState *env = &cpu->env;

		cpu_reset(CPU(cpu));
		cpu_reset(cs);
		env->regs[5] = boot_info.cmdline;
		env->regs[6] = boot_info.initrd_start;
		env->regs[7] = boot_info.fdt;
		env->sregs[SR_PC] = boot_info.bootstrap_pc;
		cpu_set_pc(cs, boot_info.bootstrap_pc);
		if (boot_info.machine_cpu_reset) {
		boot_info.machine_cpu_reset(cpu);
		}