From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34212) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4jhb-0004k8-3g for qemu-devel@nongnu.org; Tue, 16 Jun 2015 01:46:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4jhY-0006dl-QC for qemu-devel@nongnu.org; Tue, 16 Jun 2015 01:46:27 -0400 Received: from mail-pd0-x233.google.com ([2607:f8b0:400e:c02::233]:36390) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4jhY-0006dd-IU for qemu-devel@nongnu.org; Tue, 16 Jun 2015 01:46:24 -0400 Received: by pdjm12 with SMTP id m12so6445857pdj.3 for ; Mon, 15 Jun 2015 22:46:23 -0700 (PDT) From: Peter Crosthwaite Date: Mon, 15 Jun 2015 22:46:07 -0700 Message-Id: <3735588e6f472378c99b595f2502e13013726e56.1434432813.git.crosthwaite.peter@gmail.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH v2 3/4] arm: boot: Use cpu_set_pc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Peter Crosthwaite , afaerber@suse.de, edgar.iglesias@gmail.com 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. Signed-off-by: Peter Crosthwaite --- Changed since v1: Lease thumb masking in boot.c --- hw/arm/boot.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index d036624..a54add6 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -168,11 +168,9 @@ static void default_write_secondary(ARMCPU *cpu, static void default_reset_secondary(ARMCPU *cpu, const struct arm_boot_info *info) { - CPUARMState *env = &cpu->env; - address_space_stl_notdirty(&address_space_memory, info->smp_bootreg_addr, 0, MEMTXATTRS_UNSPECIFIED, NULL); - env->regs[15] = info->smp_loader_start; + cpu_set_pc(CPU(cpu), info->smp_loader_start, &error_abort); } static inline bool have_dtb(const struct arm_boot_info *info) @@ -452,12 +450,13 @@ static void do_cpu_reset(void *opaque) if (info) { if (!info->is_linux) { /* Jump to the entry point. */ - if (env->aarch64) { - env->pc = info->entry; - } else { - env->regs[15] = info->entry & 0xfffffffe; + uint64_t entry = info->entry; + + if (!env->aarch64) { env->thumb = info->entry & 1; + entry &= 0xfffffffe; } + cpu_set_pc(CPU(cpu), entry, &error_abort); } else { /* If we are booting Linux then we need to check whether we are * booting into secure or non-secure state and adjust the state @@ -488,11 +487,7 @@ static void do_cpu_reset(void *opaque) } if (CPU(cpu) == first_cpu) { - if (env->aarch64) { - env->pc = info->loader_start; - } else { - env->regs[15] = info->loader_start; - } + cpu_set_pc(CPU(cpu), info->loader_start, &error_abort); if (!have_dtb(info)) { if (old_param) { -- 1.9.1