arm: Clarify the logic of set_pc()
PATCH 1/1 arm: Clarify the logic of set_pc()
Until now, the set_pc logic was unclear, which raised questions about whether it should be used directly, applying a value to PC or adding additional checks, for example, set the Thumb bit in Arm cpu. Let's set the set_pc logic for “Configure the PC, as was done in the ELF file” and implement synchronize_with_tb hook for preserving PC to cpu_tb_exec.
--- hw/arm/boot.c | 4 ---- include/qom/cpu.h | 16 ++++++++++++++-- target/arm/arm-powerctl.c | 3 --- target/arm/cpu.c | 26 +++++++++++++++++++++++++- target/arm/cpu64.c | 15 --------------- 5 files changed, 39 insertions(+), 25 deletions(-)
hw/arm/boot.c +0 -4
@@ -697,10 +697,6 @@ static void do_cpu_reset(void *opaque)g_assert_not_reached (); } -if (!env->aarch64) { - env->thumb = info->entry &1 ; - entry &=0xfffffffe ; - }cpu_set_pc (cs, entry); }else {/* If we are booting Linux then we need to check whether we are
include/qom/cpu.h +14 -2
@@ -103,9 +103,21 @@ struct TranslationBlock;* @get_arch_id: Callback for getting architecture-dependent CPU ID. * @get_paging_enabled: Callback for inquiring whether paging is enabled. * @get_memory_mapping: Callback for obtaining the memory mappings. -* @set_pc: Callback for setting the Program Counter register. +* @set_pc: Callback for setting the Program Counter register. This +* should have the semantics used by the target architecture when +* setting the PC from a source such as an ELF file entry point; +* for example on Arm it will also set the Thumb mode bit based +* on the least significant bit of the new PC value. +* If the target behaviour here is anything other than "set +* the PC register to the value passed in" then the target must +* also implement the synchronize_from_tb hook. * @synchronize_from_tb: Callback for synchronizing state from a TCG -* #TranslationBlock. +* #TranslationBlock. This is called when we abandon execution +* of a TB before starting it, and must set all parts of the CPU +* state which the previous TB in the chain may not have updated. +* This always includes at least the program counter; some targets +* will need to do more. If this hook is not implemented then the +* default is to call @set_pc(tb->pc). * @handle_mmu_fault: Callback for handling an MMU fault. * @get_phys_page_debug: Callback for obtaining a physical address. * @get_phys_page_attrs_debug: Callback for obtaining a physical address and the
target/arm/arm-powerctl.c +0 -3
@@ -120,11 +120,8 @@ static void arm_set_cpu_on_async_work(CPUState *target_cpu_state,if (info->target_aa64) { target_cpu->env.xregs[0 ] = info->context_id; - target_cpu->env.thumb = false; }else { target_cpu->env.regs[0 ] = info->context_id; - target_cpu->env.thumb = info->entry &1 ; - info->entry &=0xfffffffe ; }/* Start the new CPU at the requested address */
target/arm/cpu.c +25 -1
@@ -40,8 +40,31 @@static void arm_cpu_set_pc (CPUState *cs,vaddr value) {ARMCPU *cpu =ARM_CPU (cs); +CPUARMState *env = &cpu->env; + +if (is_a64 (env)) { + env->pc = value; + env->thumb =0 ; + }else { + env->regs[15 ] = value & ~1 ; + env->thumb = value &1 ; + } +} - cpu->env.regs[15 ] = value; +static void arm_cpu_synchronize_from_tb (CPUState *cs,TranslationBlock *tb) +{ +ARMCPU *cpu =ARM_CPU (cs); +CPUARMState *env = &cpu->env; + +/* +* It's OK to look at env for the current mode here, because it's +* never possible for an AArch64 TB to chain to an AArch32 TB. +*/ +if (is_a64 (env)) { + env->pc = tb->pc; + }else { + env->regs[15 ] = tb->pc; + } }static bool arm_cpu_has_work (CPUState *cs)
@@ -2088,6 +2111,7 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) cc->cpu_exec_interrupt = arm_cpu_exec_interrupt; cc->dump_state = arm_cpu_dump_state; cc->set_pc = arm_cpu_set_pc; + cc->synchronize_from_tb = arm_cpu_synchronize_from_tb; cc->gdb_read_register = arm_cpu_gdb_read_register; cc->gdb_write_register = arm_cpu_gdb_write_register;#ifdef CONFIG_USER_ONLY
target/arm/cpu64.c +0 -15
@@ -480,20 +480,6 @@ static void aarch64_cpu_finalizefn(Object *obj) { } -static void aarch64_cpu_set_pc (CPUState *cs,vaddr value) -{ -ARMCPU *cpu =ARM_CPU (cs); -/* It's OK to look at env for the current mode here, because it's -* never possible for an AArch64 TB to chain to an AArch32 TB. -* (Otherwise we would need to use synchronize_from_tb instead.) -*/ -if (is_a64 (&cpu->env)) { - cpu->env.pc = value; - }else { - cpu->env.regs[15 ] = value; - } -} -static gchar *aarch64_gdb_arch_name (CPUState *cs) {return g_strdup ("aarch64" );
@@ -504,7 +490,6 @@ static void aarch64_cpu_class_init(ObjectClass *oc, void *data)CPUClass *cc =CPU_CLASS (oc); cc->cpu_exec_interrupt = arm_cpu_exec_interrupt; - cc->set_pc = aarch64_cpu_set_pc; cc->gdb_read_register = aarch64_cpu_gdb_read_register; cc->gdb_write_register = aarch64_cpu_gdb_write_register; cc->gdb_num_core_regs =34 ;
Signature · 1 line
2.17.1
Quoted 6 lines · Julia Suvorova
Until now, the
set_pclogic was unclear, which raised questions about whether it should be used directly, applying a value to PC or adding additional checks, for example, set the Thumb bit in Arm cpu. Let's set theset_pclogic for “Configure the PC, as was done in the ELF file” and implementsynchronize_with_tbhook for preserving PC tocpu_tb_exec.
Quoted 8 lines
Signed-off-by Julia Suvorova <[email protected]>--- hw/arm/boot.c | 4 ---- include/qom/cpu.h | 16 ++++++++++++++-- target/arm/arm-powerctl.c | 3 --- target/arm/cpu.c | 26 +++++++++++++++++++++++++- target/arm/cpu64.c | 15 --------------- 5 files changed, 39 insertions(+), 25 deletions(-)
I'm not familiar enough with ARM TCG to review this properly but it looks like what I would expect:
Peter Maydell
AppliedQuoted 8 lines · Julia Suvorova
Until now, the
set_pclogic was unclear, which raised questions about whether it should be used directly, applying a value to PC or adding additional checks, for example, set the Thumb bit in Arm cpu. Let's set theset_pclogic for “Configure the PC, as was done in the ELF file” and implementsynchronize_with_tbhook for preserving PC tocpu_tb_exec.Signed-off-by Julia Suvorova <[email protected]>
Applied to target-arm.next, thanks.
-- PMM
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [Qemu-devel] [PATCH] arm: Clarify the logic of set_pc()
Type: series
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'eeb2bfb67f arm: Clarify the logic of set_pc()
=== OUTPUT BEGIN ===
ERROR: Author email address is mangled by the mailing list #2:
Author: Julia Suvorova via Qemu-devel <[email protected]>
total: 1 errors, 0 warnings, 110 lines checked
Commit eeb2bfb67f8d (arm: Clarify the logic of set_pc()) has style problems, please review. If any of these errors are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]