openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/arm/boot: Use cpu_set_pc() 

Use cpu_set_pc() across the board for setting program counters. This
removes instances of system level code having to reach into the CPU
env.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
[AF: Avoid repeated casts with local variables]
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Peter Crosthwaite 2015-06-23 20:19:22 -07:00 committed by Andreas Färber
parent 4a2b24edb7
commit 4df81c6ed1
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/arm/boot.c
View File

@ -168,11 +168,11 @@ static void default_write_secondary(ARMCPU *cpu,
static void default_reset_secondary(ARMCPU *cpu, static void default_reset_secondary(ARMCPU *cpu,
const struct arm_boot_info *info) const struct arm_boot_info *info)
{ {
CPUARMState *env = &cpu->env; CPUState *cs = CPU(cpu);
address_space_stl_notdirty(&address_space_memory, info->smp_bootreg_addr, address_space_stl_notdirty(&address_space_memory, info->smp_bootreg_addr,
0, MEMTXATTRS_UNSPECIFIED, NULL); 0, MEMTXATTRS_UNSPECIFIED, NULL);
env->regs[15] = info->smp_loader_start; cpu_set_pc(cs, info->smp_loader_start);
} }
static inline bool have_dtb(const struct arm_boot_info *info) static inline bool have_dtb(const struct arm_boot_info *info)
@ -445,19 +445,21 @@ fail:
static void do_cpu_reset(void *opaque) static void do_cpu_reset(void *opaque)
{ {
ARMCPU *cpu = opaque; ARMCPU *cpu = opaque;
CPUState *cs = CPU(cpu);
CPUARMState *env = &cpu->env; CPUARMState *env = &cpu->env;
const struct arm_boot_info *info = env->boot_info; const struct arm_boot_info *info = env->boot_info;
cpu_reset(CPU(cpu)); cpu_reset(cs);
if (info) { if (info) {
if (!info->is_linux) { if (!info->is_linux) {
/* Jump to the entry point. */ /* Jump to the entry point. */
if (env->aarch64) { uint64_t entry = info->entry;
env->pc = info->entry;
} else { if (!env->aarch64) {
env->regs[15] = info->entry & 0xfffffffe;
env->thumb = info->entry & 1; env->thumb = info->entry & 1;
entry &= 0xfffffffe;
} }
cpu_set_pc(cs, entry);
} else { } else {
/* If we are booting Linux then we need to check whether we are /* If we are booting Linux then we need to check whether we are
* booting into secure or non-secure state and adjust the state * booting into secure or non-secure state and adjust the state
@ -487,12 +489,8 @@ static void do_cpu_reset(void *opaque)
} }
} }
if (CPU(cpu) == first_cpu) { if (cs == first_cpu) {
if (env->aarch64) { cpu_set_pc(cs, info->loader_start);
env->pc = info->loader_start;
} else {
env->regs[15] = info->loader_start;
}
if (!have_dtb(info)) { if (!have_dtb(info)) {
if (old_param) { if (old_param) {