* [PATCH] target/arm: Replace magic GIC values by proper definitions
@ 2025-09-25 3:21 Philippe Mathieu-Daudé
2025-09-25 19:19 ` Richard Henderson
2025-09-26 10:06 ` Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-09-25 3:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, qemu-arm, Philippe Mathieu-Daudé
Prefer the FIELD_DP64() macro and self-describing GIC
definitions over magic values.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/arm/helper.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index c44294711f8..da8aa7b9d08 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -5184,7 +5184,7 @@ static uint64_t id_pfr1_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t pfr1 = GET_IDREG(&cpu->isar, ID_PFR1);
if (env->gicv3state) {
- pfr1 |= 1 << 28;
+ pfr1 = FIELD_DP64(pfr1, ID_PFR1, GIC, 1);
}
return pfr1;
}
@@ -5195,7 +5195,7 @@ static uint64_t id_aa64pfr0_read(CPUARMState *env, const ARMCPRegInfo *ri)
uint64_t pfr0 = GET_IDREG(&cpu->isar, ID_AA64PFR0);
if (env->gicv3state) {
- pfr0 |= 1 << 24;
+ pfr0 = FIELD_DP64(pfr0, ID_AA64PFR0, GIC, 1);
}
return pfr0;
}
--
2.51.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] target/arm: Replace magic GIC values by proper definitions
2025-09-25 3:21 [PATCH] target/arm: Replace magic GIC values by proper definitions Philippe Mathieu-Daudé
@ 2025-09-25 19:19 ` Richard Henderson
2025-09-26 10:06 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Richard Henderson @ 2025-09-25 19:19 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: Peter Maydell, qemu-arm
On 9/24/25 20:21, Philippe Mathieu-Daudé wrote:
> Prefer the FIELD_DP64() macro and self-describing GIC
> definitions over magic values.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> target/arm/helper.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/target/arm/helper.c b/target/arm/helper.c
> index c44294711f8..da8aa7b9d08 100644
> --- a/target/arm/helper.c
> +++ b/target/arm/helper.c
> @@ -5184,7 +5184,7 @@ static uint64_t id_pfr1_read(CPUARMState *env, const ARMCPRegInfo *ri)
> uint64_t pfr1 = GET_IDREG(&cpu->isar, ID_PFR1);
>
> if (env->gicv3state) {
> - pfr1 |= 1 << 28;
> + pfr1 = FIELD_DP64(pfr1, ID_PFR1, GIC, 1);
> }
> return pfr1;
> }
> @@ -5195,7 +5195,7 @@ static uint64_t id_aa64pfr0_read(CPUARMState *env, const ARMCPRegInfo *ri)
> uint64_t pfr0 = GET_IDREG(&cpu->isar, ID_AA64PFR0);
>
> if (env->gicv3state) {
> - pfr0 |= 1 << 24;
> + pfr0 = FIELD_DP64(pfr0, ID_AA64PFR0, GIC, 1);
> }
> return pfr0;
> }
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] target/arm: Replace magic GIC values by proper definitions
2025-09-25 3:21 [PATCH] target/arm: Replace magic GIC values by proper definitions Philippe Mathieu-Daudé
2025-09-25 19:19 ` Richard Henderson
@ 2025-09-26 10:06 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2025-09-26 10:06 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: qemu-devel, qemu-arm
On Thu, 25 Sept 2025 at 04:21, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> Prefer the FIELD_DP64() macro and self-describing GIC
> definitions over magic values.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
Applied to target-arm.next, thanks.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-09-26 10:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-25 3:21 [PATCH] target/arm: Replace magic GIC values by proper definitions Philippe Mathieu-Daudé
2025-09-25 19:19 ` Richard Henderson
2025-09-26 10:06 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).