[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v12 30/65] target/arm: fix style of arm_cpu_do_interrupt functions
From: |
Claudio Fontana |
Subject: |
[RFC v12 30/65] target/arm: fix style of arm_cpu_do_interrupt functions before move |
Date: |
Fri, 26 Mar 2021 20:36:26 +0100 |
before refactoring the exception code, fix the style of the
functions being moved.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
target/arm/tcg/helper.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/target/arm/tcg/helper.c b/target/arm/tcg/helper.c
index aaa307daca..b03ac630af 100644
--- a/target/arm/tcg/helper.c
+++ b/target/arm/tcg/helper.c
@@ -894,10 +894,11 @@ static void arm_cpu_do_interrupt_aarch32(CPUState *cs)
new_mode = ARM_CPU_MODE_UND;
addr = 0x04;
mask = CPSR_I;
- if (env->thumb)
+ if (env->thumb) {
offset = 2;
- else
+ } else {
offset = 4;
+ }
break;
case EXCP_SWI:
new_mode = ARM_CPU_MODE_SVC;
@@ -983,7 +984,8 @@ static void arm_cpu_do_interrupt_aarch32(CPUState *cs)
/* High vectors. When enabled, base address cannot be remapped. */
addr += 0xffff0000;
} else {
- /* ARM v7 architectures provide a vector base address register to remap
+ /*
+ * ARM v7 architectures provide a vector base address register to remap
* the interrupt vector table.
* This register is only followed in non-monitor mode, and is banked.
* Note: only bits 31:5 are valid.
@@ -1092,7 +1094,8 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs)
aarch64_sve_change_el(env, cur_el, new_el, is_a64(env));
if (cur_el < new_el) {
- /* Entry vector offset depends on whether the implemented EL
+ /*
+ * Entry vector offset depends on whether the implemented EL
* immediately lower than the target level is using AArch32 or AArch64
*/
bool is_aa64;
@@ -1279,7 +1282,8 @@ static void handle_semihosting(CPUState *cs)
}
#endif
-/* Handle a CPU exception for A and R profile CPUs.
+/*
+ * Handle a CPU exception for A and R profile CPUs.
* Do any appropriate logging, handle PSCI calls, and then hand off
* to the AArch64-entry or AArch32-entry function depending on the
* target exception level's register width.
@@ -1324,7 +1328,8 @@ void arm_cpu_do_interrupt(CPUState *cs)
}
#endif
- /* Hooks may change global state so BQL should be held, also the
+ /*
+ * Hooks may change global state so BQL should be held, also the
* BQL needs to be held for any modification of
* cs->interrupt_request.
*/
--
2.26.2
- Re: [RFC v12 14/65] target/arm: split cpregs from tcg/helper.c, (continued)
- [RFC v12 21/65] target/arm: split vfp state setting from tcg helpers, Claudio Fontana, 2021/03/26
- [RFC v12 22/65] target/arm: move arm_mmu_idx* to cpu-mmu, Claudio Fontana, 2021/03/26
- [RFC v12 24/65] target/arm: move arm_sctlr away from tcg helpers, Claudio Fontana, 2021/03/26
- [RFC v12 28/65] target/arm: fixup sve_exception_el code style before move, Claudio Fontana, 2021/03/26
- [RFC v12 23/65] target/arm: move sve_zcr_len_for_el to common_cpu, Claudio Fontana, 2021/03/26
- [RFC v12 25/65] target/arm: move arm_cpu_list to common_cpu, Claudio Fontana, 2021/03/26
- [RFC v12 30/65] target/arm: fix style of arm_cpu_do_interrupt functions before move,
Claudio Fontana <=
- [RFC v12 26/65] target/arm: move aarch64_sync_32_to_64 (and vv) to cpu code, Claudio Fontana, 2021/03/26
- [RFC v12 29/65] target/arm: move sve_exception_el out of TCG helpers, Claudio Fontana, 2021/03/26
- [RFC v12 31/65] target/arm: move exception code out of tcg/helper.c, Claudio Fontana, 2021/03/26
- [RFC v12 32/65] target/arm: move TCGCPUOps to tcg/tcg-cpu.c, Claudio Fontana, 2021/03/26
- [RFC v12 38/65] target/arm: remove broad "else" statements when checking accels, Claudio Fontana, 2021/03/26