* [PULL 1/8] linux-user/hexagon: Fix sigcontext
2025-10-17 20:50 [PULL 0/8] hex queue Brian Cain
@ 2025-10-17 20:50 ` Brian Cain
2025-10-17 20:50 ` [PULL 2/8] linux-user/hexagon: use abi_ulong Brian Cain
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Brian Cain @ 2025-10-17 20:50 UTC (permalink / raw)
To: qemu-devel
Cc: brian.cain, richard.henderson, Alex Rønne Petersen,
Taylor Simpson, Laurent Vivier
In order to correspond with the kernel, we've now (1) moved the
preds[] to the right offset and combined the representation as a single
ulong "p3_0", (2), added the cs{0,1} registers, (3) added a pad for 48
words, (4) added the user regs structure to an 8-byte aligned
target_sigcontext structure.
Co-authored-by: Alex Rønne Petersen <alex@alexrp.com>
Reviewed-by: Taylor Simpson <ltaylorsimpson@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>
---
linux-user/hexagon/signal.c | 209 ++++++++++++++++++++----------------
1 file changed, 117 insertions(+), 92 deletions(-)
diff --git a/linux-user/hexagon/signal.c b/linux-user/hexagon/signal.c
index 492b51f155..2847952216 100644
--- a/linux-user/hexagon/signal.c
+++ b/linux-user/hexagon/signal.c
@@ -23,7 +23,7 @@
#include "signal-common.h"
#include "linux-user/trace.h"
-struct target_sigcontext {
+struct target_user_regs_struct {
target_ulong r0, r1, r2, r3;
target_ulong r4, r5, r6, r7;
target_ulong r8, r9, r10, r11;
@@ -39,14 +39,23 @@ struct target_sigcontext {
target_ulong m0;
target_ulong m1;
target_ulong usr;
+ target_ulong p3_0;
target_ulong gp;
target_ulong ugp;
target_ulong pc;
target_ulong cause;
target_ulong badva;
- target_ulong pred[NUM_PREGS];
+ target_ulong cs0;
+ target_ulong cs1;
+ target_ulong pad1; /* pad to 48 words */
};
+QEMU_BUILD_BUG_ON(sizeof(struct target_user_regs_struct) != 48 * 4);
+
+struct target_sigcontext {
+ struct target_user_regs_struct sc_regs;
+} QEMU_ALIGNED(8);
+
struct target_ucontext {
unsigned long uc_flags;
target_ulong uc_link; /* target pointer */
@@ -76,53 +85,63 @@ static abi_ulong get_sigframe(struct target_sigaction *ka,
static void setup_sigcontext(struct target_sigcontext *sc, CPUHexagonState *env)
{
- __put_user(env->gpr[HEX_REG_R00], &sc->r0);
- __put_user(env->gpr[HEX_REG_R01], &sc->r1);
- __put_user(env->gpr[HEX_REG_R02], &sc->r2);
- __put_user(env->gpr[HEX_REG_R03], &sc->r3);
- __put_user(env->gpr[HEX_REG_R04], &sc->r4);
- __put_user(env->gpr[HEX_REG_R05], &sc->r5);
- __put_user(env->gpr[HEX_REG_R06], &sc->r6);
- __put_user(env->gpr[HEX_REG_R07], &sc->r7);
- __put_user(env->gpr[HEX_REG_R08], &sc->r8);
- __put_user(env->gpr[HEX_REG_R09], &sc->r9);
- __put_user(env->gpr[HEX_REG_R10], &sc->r10);
- __put_user(env->gpr[HEX_REG_R11], &sc->r11);
- __put_user(env->gpr[HEX_REG_R12], &sc->r12);
- __put_user(env->gpr[HEX_REG_R13], &sc->r13);
- __put_user(env->gpr[HEX_REG_R14], &sc->r14);
- __put_user(env->gpr[HEX_REG_R15], &sc->r15);
- __put_user(env->gpr[HEX_REG_R16], &sc->r16);
- __put_user(env->gpr[HEX_REG_R17], &sc->r17);
- __put_user(env->gpr[HEX_REG_R18], &sc->r18);
- __put_user(env->gpr[HEX_REG_R19], &sc->r19);
- __put_user(env->gpr[HEX_REG_R20], &sc->r20);
- __put_user(env->gpr[HEX_REG_R21], &sc->r21);
- __put_user(env->gpr[HEX_REG_R22], &sc->r22);
- __put_user(env->gpr[HEX_REG_R23], &sc->r23);
- __put_user(env->gpr[HEX_REG_R24], &sc->r24);
- __put_user(env->gpr[HEX_REG_R25], &sc->r25);
- __put_user(env->gpr[HEX_REG_R26], &sc->r26);
- __put_user(env->gpr[HEX_REG_R27], &sc->r27);
- __put_user(env->gpr[HEX_REG_R28], &sc->r28);
- __put_user(env->gpr[HEX_REG_R29], &sc->r29);
- __put_user(env->gpr[HEX_REG_R30], &sc->r30);
- __put_user(env->gpr[HEX_REG_R31], &sc->r31);
- __put_user(env->gpr[HEX_REG_SA0], &sc->sa0);
- __put_user(env->gpr[HEX_REG_LC0], &sc->lc0);
- __put_user(env->gpr[HEX_REG_SA1], &sc->sa1);
- __put_user(env->gpr[HEX_REG_LC1], &sc->lc1);
- __put_user(env->gpr[HEX_REG_M0], &sc->m0);
- __put_user(env->gpr[HEX_REG_M1], &sc->m1);
- __put_user(env->gpr[HEX_REG_USR], &sc->usr);
- __put_user(env->gpr[HEX_REG_GP], &sc->gp);
- __put_user(env->gpr[HEX_REG_UGP], &sc->ugp);
- __put_user(env->gpr[HEX_REG_PC], &sc->pc);
+ target_ulong preds = 0;
- int i;
- for (i = 0; i < NUM_PREGS; i++) {
- __put_user(env->pred[i], &(sc->pred[i]));
+ __put_user(env->gpr[HEX_REG_R00], &sc->sc_regs.r0);
+ __put_user(env->gpr[HEX_REG_R01], &sc->sc_regs.r1);
+ __put_user(env->gpr[HEX_REG_R02], &sc->sc_regs.r2);
+ __put_user(env->gpr[HEX_REG_R03], &sc->sc_regs.r3);
+ __put_user(env->gpr[HEX_REG_R04], &sc->sc_regs.r4);
+ __put_user(env->gpr[HEX_REG_R05], &sc->sc_regs.r5);
+ __put_user(env->gpr[HEX_REG_R06], &sc->sc_regs.r6);
+ __put_user(env->gpr[HEX_REG_R07], &sc->sc_regs.r7);
+ __put_user(env->gpr[HEX_REG_R08], &sc->sc_regs.r8);
+ __put_user(env->gpr[HEX_REG_R09], &sc->sc_regs.r9);
+ __put_user(env->gpr[HEX_REG_R10], &sc->sc_regs.r10);
+ __put_user(env->gpr[HEX_REG_R11], &sc->sc_regs.r11);
+ __put_user(env->gpr[HEX_REG_R12], &sc->sc_regs.r12);
+ __put_user(env->gpr[HEX_REG_R13], &sc->sc_regs.r13);
+ __put_user(env->gpr[HEX_REG_R14], &sc->sc_regs.r14);
+ __put_user(env->gpr[HEX_REG_R15], &sc->sc_regs.r15);
+ __put_user(env->gpr[HEX_REG_R16], &sc->sc_regs.r16);
+ __put_user(env->gpr[HEX_REG_R17], &sc->sc_regs.r17);
+ __put_user(env->gpr[HEX_REG_R18], &sc->sc_regs.r18);
+ __put_user(env->gpr[HEX_REG_R19], &sc->sc_regs.r19);
+ __put_user(env->gpr[HEX_REG_R20], &sc->sc_regs.r20);
+ __put_user(env->gpr[HEX_REG_R21], &sc->sc_regs.r21);
+ __put_user(env->gpr[HEX_REG_R22], &sc->sc_regs.r22);
+ __put_user(env->gpr[HEX_REG_R23], &sc->sc_regs.r23);
+ __put_user(env->gpr[HEX_REG_R24], &sc->sc_regs.r24);
+ __put_user(env->gpr[HEX_REG_R25], &sc->sc_regs.r25);
+ __put_user(env->gpr[HEX_REG_R26], &sc->sc_regs.r26);
+ __put_user(env->gpr[HEX_REG_R27], &sc->sc_regs.r27);
+ __put_user(env->gpr[HEX_REG_R28], &sc->sc_regs.r28);
+ __put_user(env->gpr[HEX_REG_R29], &sc->sc_regs.r29);
+ __put_user(env->gpr[HEX_REG_R30], &sc->sc_regs.r30);
+ __put_user(env->gpr[HEX_REG_R31], &sc->sc_regs.r31);
+ __put_user(env->gpr[HEX_REG_SA0], &sc->sc_regs.sa0);
+ __put_user(env->gpr[HEX_REG_LC0], &sc->sc_regs.lc0);
+ __put_user(env->gpr[HEX_REG_SA1], &sc->sc_regs.sa1);
+ __put_user(env->gpr[HEX_REG_LC1], &sc->sc_regs.lc1);
+ __put_user(env->gpr[HEX_REG_M0], &sc->sc_regs.m0);
+ __put_user(env->gpr[HEX_REG_M1], &sc->sc_regs.m1);
+ __put_user(env->gpr[HEX_REG_USR], &sc->sc_regs.usr);
+ __put_user(env->gpr[HEX_REG_GP], &sc->sc_regs.gp);
+ __put_user(env->gpr[HEX_REG_UGP], &sc->sc_regs.ugp);
+ __put_user(env->gpr[HEX_REG_PC], &sc->sc_regs.pc);
+
+ /* Consolidate predicates into p3_0 */
+ for (int i = 0; i < NUM_PREGS; i++) {
+ preds |= (env->pred[i] & 0xff) << (i * 8);
}
+ __put_user(preds, &sc->sc_regs.p3_0);
+
+ /* Set cause and badva to 0 - these are set by kernel on exceptions */
+ __put_user(0, &sc->sc_regs.cause);
+ __put_user(0, &sc->sc_regs.badva);
+
+ __put_user(env->gpr[HEX_REG_CS0], &sc->sc_regs.cs0);
+ __put_user(env->gpr[HEX_REG_CS1], &sc->sc_regs.cs1);
}
static void setup_ucontext(struct target_ucontext *uc,
@@ -192,53 +211,59 @@ badframe:
static void restore_sigcontext(CPUHexagonState *env,
struct target_sigcontext *sc)
{
- __get_user(env->gpr[HEX_REG_R00], &sc->r0);
- __get_user(env->gpr[HEX_REG_R01], &sc->r1);
- __get_user(env->gpr[HEX_REG_R02], &sc->r2);
- __get_user(env->gpr[HEX_REG_R03], &sc->r3);
- __get_user(env->gpr[HEX_REG_R04], &sc->r4);
- __get_user(env->gpr[HEX_REG_R05], &sc->r5);
- __get_user(env->gpr[HEX_REG_R06], &sc->r6);
- __get_user(env->gpr[HEX_REG_R07], &sc->r7);
- __get_user(env->gpr[HEX_REG_R08], &sc->r8);
- __get_user(env->gpr[HEX_REG_R09], &sc->r9);
- __get_user(env->gpr[HEX_REG_R10], &sc->r10);
- __get_user(env->gpr[HEX_REG_R11], &sc->r11);
- __get_user(env->gpr[HEX_REG_R12], &sc->r12);
- __get_user(env->gpr[HEX_REG_R13], &sc->r13);
- __get_user(env->gpr[HEX_REG_R14], &sc->r14);
- __get_user(env->gpr[HEX_REG_R15], &sc->r15);
- __get_user(env->gpr[HEX_REG_R16], &sc->r16);
- __get_user(env->gpr[HEX_REG_R17], &sc->r17);
- __get_user(env->gpr[HEX_REG_R18], &sc->r18);
- __get_user(env->gpr[HEX_REG_R19], &sc->r19);
- __get_user(env->gpr[HEX_REG_R20], &sc->r20);
- __get_user(env->gpr[HEX_REG_R21], &sc->r21);
- __get_user(env->gpr[HEX_REG_R22], &sc->r22);
- __get_user(env->gpr[HEX_REG_R23], &sc->r23);
- __get_user(env->gpr[HEX_REG_R24], &sc->r24);
- __get_user(env->gpr[HEX_REG_R25], &sc->r25);
- __get_user(env->gpr[HEX_REG_R26], &sc->r26);
- __get_user(env->gpr[HEX_REG_R27], &sc->r27);
- __get_user(env->gpr[HEX_REG_R28], &sc->r28);
- __get_user(env->gpr[HEX_REG_R29], &sc->r29);
- __get_user(env->gpr[HEX_REG_R30], &sc->r30);
- __get_user(env->gpr[HEX_REG_R31], &sc->r31);
- __get_user(env->gpr[HEX_REG_SA0], &sc->sa0);
- __get_user(env->gpr[HEX_REG_LC0], &sc->lc0);
- __get_user(env->gpr[HEX_REG_SA1], &sc->sa1);
- __get_user(env->gpr[HEX_REG_LC1], &sc->lc1);
- __get_user(env->gpr[HEX_REG_M0], &sc->m0);
- __get_user(env->gpr[HEX_REG_M1], &sc->m1);
- __get_user(env->gpr[HEX_REG_USR], &sc->usr);
- __get_user(env->gpr[HEX_REG_GP], &sc->gp);
- __get_user(env->gpr[HEX_REG_UGP], &sc->ugp);
- __get_user(env->gpr[HEX_REG_PC], &sc->pc);
+ target_ulong preds;
- int i;
- for (i = 0; i < NUM_PREGS; i++) {
- __get_user(env->pred[i], &(sc->pred[i]));
+ __get_user(env->gpr[HEX_REG_R00], &sc->sc_regs.r0);
+ __get_user(env->gpr[HEX_REG_R01], &sc->sc_regs.r1);
+ __get_user(env->gpr[HEX_REG_R02], &sc->sc_regs.r2);
+ __get_user(env->gpr[HEX_REG_R03], &sc->sc_regs.r3);
+ __get_user(env->gpr[HEX_REG_R04], &sc->sc_regs.r4);
+ __get_user(env->gpr[HEX_REG_R05], &sc->sc_regs.r5);
+ __get_user(env->gpr[HEX_REG_R06], &sc->sc_regs.r6);
+ __get_user(env->gpr[HEX_REG_R07], &sc->sc_regs.r7);
+ __get_user(env->gpr[HEX_REG_R08], &sc->sc_regs.r8);
+ __get_user(env->gpr[HEX_REG_R09], &sc->sc_regs.r9);
+ __get_user(env->gpr[HEX_REG_R10], &sc->sc_regs.r10);
+ __get_user(env->gpr[HEX_REG_R11], &sc->sc_regs.r11);
+ __get_user(env->gpr[HEX_REG_R12], &sc->sc_regs.r12);
+ __get_user(env->gpr[HEX_REG_R13], &sc->sc_regs.r13);
+ __get_user(env->gpr[HEX_REG_R14], &sc->sc_regs.r14);
+ __get_user(env->gpr[HEX_REG_R15], &sc->sc_regs.r15);
+ __get_user(env->gpr[HEX_REG_R16], &sc->sc_regs.r16);
+ __get_user(env->gpr[HEX_REG_R17], &sc->sc_regs.r17);
+ __get_user(env->gpr[HEX_REG_R18], &sc->sc_regs.r18);
+ __get_user(env->gpr[HEX_REG_R19], &sc->sc_regs.r19);
+ __get_user(env->gpr[HEX_REG_R20], &sc->sc_regs.r20);
+ __get_user(env->gpr[HEX_REG_R21], &sc->sc_regs.r21);
+ __get_user(env->gpr[HEX_REG_R22], &sc->sc_regs.r22);
+ __get_user(env->gpr[HEX_REG_R23], &sc->sc_regs.r23);
+ __get_user(env->gpr[HEX_REG_R24], &sc->sc_regs.r24);
+ __get_user(env->gpr[HEX_REG_R25], &sc->sc_regs.r25);
+ __get_user(env->gpr[HEX_REG_R26], &sc->sc_regs.r26);
+ __get_user(env->gpr[HEX_REG_R27], &sc->sc_regs.r27);
+ __get_user(env->gpr[HEX_REG_R28], &sc->sc_regs.r28);
+ __get_user(env->gpr[HEX_REG_R29], &sc->sc_regs.r29);
+ __get_user(env->gpr[HEX_REG_R30], &sc->sc_regs.r30);
+ __get_user(env->gpr[HEX_REG_R31], &sc->sc_regs.r31);
+ __get_user(env->gpr[HEX_REG_SA0], &sc->sc_regs.sa0);
+ __get_user(env->gpr[HEX_REG_LC0], &sc->sc_regs.lc0);
+ __get_user(env->gpr[HEX_REG_SA1], &sc->sc_regs.sa1);
+ __get_user(env->gpr[HEX_REG_LC1], &sc->sc_regs.lc1);
+ __get_user(env->gpr[HEX_REG_M0], &sc->sc_regs.m0);
+ __get_user(env->gpr[HEX_REG_M1], &sc->sc_regs.m1);
+ __get_user(env->gpr[HEX_REG_USR], &sc->sc_regs.usr);
+ __get_user(env->gpr[HEX_REG_GP], &sc->sc_regs.gp);
+ __get_user(env->gpr[HEX_REG_UGP], &sc->sc_regs.ugp);
+ __get_user(env->gpr[HEX_REG_PC], &sc->sc_regs.pc);
+
+ /* Restore predicates from p3_0 */
+ __get_user(preds, &sc->sc_regs.p3_0);
+ for (int i = 0; i < NUM_PREGS; i++) {
+ env->pred[i] = (preds >> (i * 8)) & 0xff;
}
+
+ __get_user(env->gpr[HEX_REG_CS0], &sc->sc_regs.cs0);
+ __get_user(env->gpr[HEX_REG_CS1], &sc->sc_regs.cs1);
}
static void restore_ucontext(CPUHexagonState *env, struct target_ucontext *uc)
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PULL 2/8] linux-user/hexagon: use abi_ulong
2025-10-17 20:50 [PULL 0/8] hex queue Brian Cain
2025-10-17 20:50 ` [PULL 1/8] linux-user/hexagon: Fix sigcontext Brian Cain
@ 2025-10-17 20:50 ` Brian Cain
2025-10-17 20:50 ` [PULL 3/8] linux-user/hexagon: Use an array for GPRs Brian Cain
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Brian Cain @ 2025-10-17 20:50 UTC (permalink / raw)
To: qemu-devel
Cc: brian.cain, richard.henderson, Taylor Simpson,
Philippe Mathieu-Daudé, Laurent Vivier
Change the user_regs_struct to use abi_ulong instead of
target_ulong.
Link: https://lore.kernel.org/qemu-devel/7bf3d8c5-df07-4cbd-ba62-4c7246a5f96b@linaro.org/
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Taylor Simpson <ltaylorsimpson@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>
---
linux-user/hexagon/signal.c | 52 ++++++++++++++++++-------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/linux-user/hexagon/signal.c b/linux-user/hexagon/signal.c
index 2847952216..e5514b2bec 100644
--- a/linux-user/hexagon/signal.c
+++ b/linux-user/hexagon/signal.c
@@ -24,30 +24,30 @@
#include "linux-user/trace.h"
struct target_user_regs_struct {
- target_ulong r0, r1, r2, r3;
- target_ulong r4, r5, r6, r7;
- target_ulong r8, r9, r10, r11;
- target_ulong r12, r13, r14, r15;
- target_ulong r16, r17, r18, r19;
- target_ulong r20, r21, r22, r23;
- target_ulong r24, r25, r26, r27;
- target_ulong r28, r29, r30, r31;
- target_ulong sa0;
- target_ulong lc0;
- target_ulong sa1;
- target_ulong lc1;
- target_ulong m0;
- target_ulong m1;
- target_ulong usr;
- target_ulong p3_0;
- target_ulong gp;
- target_ulong ugp;
- target_ulong pc;
- target_ulong cause;
- target_ulong badva;
- target_ulong cs0;
- target_ulong cs1;
- target_ulong pad1; /* pad to 48 words */
+ abi_ulong r0, r1, r2, r3;
+ abi_ulong r4, r5, r6, r7;
+ abi_ulong r8, r9, r10, r11;
+ abi_ulong r12, r13, r14, r15;
+ abi_ulong r16, r17, r18, r19;
+ abi_ulong r20, r21, r22, r23;
+ abi_ulong r24, r25, r26, r27;
+ abi_ulong r28, r29, r30, r31;
+ abi_ulong sa0;
+ abi_ulong lc0;
+ abi_ulong sa1;
+ abi_ulong lc1;
+ abi_ulong m0;
+ abi_ulong m1;
+ abi_ulong usr;
+ abi_ulong p3_0;
+ abi_ulong gp;
+ abi_ulong ugp;
+ abi_ulong pc;
+ abi_ulong cause;
+ abi_ulong badva;
+ abi_ulong cs0;
+ abi_ulong cs1;
+ abi_ulong pad1; /* pad to 48 words */
};
QEMU_BUILD_BUG_ON(sizeof(struct target_user_regs_struct) != 48 * 4);
@@ -85,7 +85,7 @@ static abi_ulong get_sigframe(struct target_sigaction *ka,
static void setup_sigcontext(struct target_sigcontext *sc, CPUHexagonState *env)
{
- target_ulong preds = 0;
+ abi_ulong preds = 0;
__put_user(env->gpr[HEX_REG_R00], &sc->sc_regs.r0);
__put_user(env->gpr[HEX_REG_R01], &sc->sc_regs.r1);
@@ -211,7 +211,7 @@ badframe:
static void restore_sigcontext(CPUHexagonState *env,
struct target_sigcontext *sc)
{
- target_ulong preds;
+ abi_ulong preds;
__get_user(env->gpr[HEX_REG_R00], &sc->sc_regs.r0);
__get_user(env->gpr[HEX_REG_R01], &sc->sc_regs.r1);
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PULL 3/8] linux-user/hexagon: Use an array for GPRs
2025-10-17 20:50 [PULL 0/8] hex queue Brian Cain
2025-10-17 20:50 ` [PULL 1/8] linux-user/hexagon: Fix sigcontext Brian Cain
2025-10-17 20:50 ` [PULL 2/8] linux-user/hexagon: use abi_ulong Brian Cain
@ 2025-10-17 20:50 ` Brian Cain
2025-10-17 20:50 ` [PULL 4/8] tests/tcg/hexagon: Add cs{0,1} coverage Brian Cain
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Brian Cain @ 2025-10-17 20:50 UTC (permalink / raw)
To: qemu-devel
Cc: brian.cain, richard.henderson, Taylor Simpson,
Philippe Mathieu-Daudé, Laurent Vivier
Link: https://lore.kernel.org/qemu-devel/023e01dc389c$faf84320$f0e8c960$@gmail.com/
Suggested-by: Taylor Simpson <ltaylorsimpson@gmail.com>
Reviewed-by: Taylor Simpson <ltaylorsimpson@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>
---
linux-user/hexagon/signal.c | 79 ++++---------------------------------
1 file changed, 7 insertions(+), 72 deletions(-)
diff --git a/linux-user/hexagon/signal.c b/linux-user/hexagon/signal.c
index e5514b2bec..183ecfaa19 100644
--- a/linux-user/hexagon/signal.c
+++ b/linux-user/hexagon/signal.c
@@ -24,14 +24,7 @@
#include "linux-user/trace.h"
struct target_user_regs_struct {
- abi_ulong r0, r1, r2, r3;
- abi_ulong r4, r5, r6, r7;
- abi_ulong r8, r9, r10, r11;
- abi_ulong r12, r13, r14, r15;
- abi_ulong r16, r17, r18, r19;
- abi_ulong r20, r21, r22, r23;
- abi_ulong r24, r25, r26, r27;
- abi_ulong r28, r29, r30, r31;
+ abi_ulong gpr[32];
abi_ulong sa0;
abi_ulong lc0;
abi_ulong sa1;
@@ -87,38 +80,9 @@ static void setup_sigcontext(struct target_sigcontext *sc, CPUHexagonState *env)
{
abi_ulong preds = 0;
- __put_user(env->gpr[HEX_REG_R00], &sc->sc_regs.r0);
- __put_user(env->gpr[HEX_REG_R01], &sc->sc_regs.r1);
- __put_user(env->gpr[HEX_REG_R02], &sc->sc_regs.r2);
- __put_user(env->gpr[HEX_REG_R03], &sc->sc_regs.r3);
- __put_user(env->gpr[HEX_REG_R04], &sc->sc_regs.r4);
- __put_user(env->gpr[HEX_REG_R05], &sc->sc_regs.r5);
- __put_user(env->gpr[HEX_REG_R06], &sc->sc_regs.r6);
- __put_user(env->gpr[HEX_REG_R07], &sc->sc_regs.r7);
- __put_user(env->gpr[HEX_REG_R08], &sc->sc_regs.r8);
- __put_user(env->gpr[HEX_REG_R09], &sc->sc_regs.r9);
- __put_user(env->gpr[HEX_REG_R10], &sc->sc_regs.r10);
- __put_user(env->gpr[HEX_REG_R11], &sc->sc_regs.r11);
- __put_user(env->gpr[HEX_REG_R12], &sc->sc_regs.r12);
- __put_user(env->gpr[HEX_REG_R13], &sc->sc_regs.r13);
- __put_user(env->gpr[HEX_REG_R14], &sc->sc_regs.r14);
- __put_user(env->gpr[HEX_REG_R15], &sc->sc_regs.r15);
- __put_user(env->gpr[HEX_REG_R16], &sc->sc_regs.r16);
- __put_user(env->gpr[HEX_REG_R17], &sc->sc_regs.r17);
- __put_user(env->gpr[HEX_REG_R18], &sc->sc_regs.r18);
- __put_user(env->gpr[HEX_REG_R19], &sc->sc_regs.r19);
- __put_user(env->gpr[HEX_REG_R20], &sc->sc_regs.r20);
- __put_user(env->gpr[HEX_REG_R21], &sc->sc_regs.r21);
- __put_user(env->gpr[HEX_REG_R22], &sc->sc_regs.r22);
- __put_user(env->gpr[HEX_REG_R23], &sc->sc_regs.r23);
- __put_user(env->gpr[HEX_REG_R24], &sc->sc_regs.r24);
- __put_user(env->gpr[HEX_REG_R25], &sc->sc_regs.r25);
- __put_user(env->gpr[HEX_REG_R26], &sc->sc_regs.r26);
- __put_user(env->gpr[HEX_REG_R27], &sc->sc_regs.r27);
- __put_user(env->gpr[HEX_REG_R28], &sc->sc_regs.r28);
- __put_user(env->gpr[HEX_REG_R29], &sc->sc_regs.r29);
- __put_user(env->gpr[HEX_REG_R30], &sc->sc_regs.r30);
- __put_user(env->gpr[HEX_REG_R31], &sc->sc_regs.r31);
+ for (int i = 0; i < 32; i++) {
+ __put_user(env->gpr[HEX_REG_R00 + i], &sc->sc_regs.gpr[i]);
+ }
__put_user(env->gpr[HEX_REG_SA0], &sc->sc_regs.sa0);
__put_user(env->gpr[HEX_REG_LC0], &sc->sc_regs.lc0);
__put_user(env->gpr[HEX_REG_SA1], &sc->sc_regs.sa1);
@@ -213,38 +177,9 @@ static void restore_sigcontext(CPUHexagonState *env,
{
abi_ulong preds;
- __get_user(env->gpr[HEX_REG_R00], &sc->sc_regs.r0);
- __get_user(env->gpr[HEX_REG_R01], &sc->sc_regs.r1);
- __get_user(env->gpr[HEX_REG_R02], &sc->sc_regs.r2);
- __get_user(env->gpr[HEX_REG_R03], &sc->sc_regs.r3);
- __get_user(env->gpr[HEX_REG_R04], &sc->sc_regs.r4);
- __get_user(env->gpr[HEX_REG_R05], &sc->sc_regs.r5);
- __get_user(env->gpr[HEX_REG_R06], &sc->sc_regs.r6);
- __get_user(env->gpr[HEX_REG_R07], &sc->sc_regs.r7);
- __get_user(env->gpr[HEX_REG_R08], &sc->sc_regs.r8);
- __get_user(env->gpr[HEX_REG_R09], &sc->sc_regs.r9);
- __get_user(env->gpr[HEX_REG_R10], &sc->sc_regs.r10);
- __get_user(env->gpr[HEX_REG_R11], &sc->sc_regs.r11);
- __get_user(env->gpr[HEX_REG_R12], &sc->sc_regs.r12);
- __get_user(env->gpr[HEX_REG_R13], &sc->sc_regs.r13);
- __get_user(env->gpr[HEX_REG_R14], &sc->sc_regs.r14);
- __get_user(env->gpr[HEX_REG_R15], &sc->sc_regs.r15);
- __get_user(env->gpr[HEX_REG_R16], &sc->sc_regs.r16);
- __get_user(env->gpr[HEX_REG_R17], &sc->sc_regs.r17);
- __get_user(env->gpr[HEX_REG_R18], &sc->sc_regs.r18);
- __get_user(env->gpr[HEX_REG_R19], &sc->sc_regs.r19);
- __get_user(env->gpr[HEX_REG_R20], &sc->sc_regs.r20);
- __get_user(env->gpr[HEX_REG_R21], &sc->sc_regs.r21);
- __get_user(env->gpr[HEX_REG_R22], &sc->sc_regs.r22);
- __get_user(env->gpr[HEX_REG_R23], &sc->sc_regs.r23);
- __get_user(env->gpr[HEX_REG_R24], &sc->sc_regs.r24);
- __get_user(env->gpr[HEX_REG_R25], &sc->sc_regs.r25);
- __get_user(env->gpr[HEX_REG_R26], &sc->sc_regs.r26);
- __get_user(env->gpr[HEX_REG_R27], &sc->sc_regs.r27);
- __get_user(env->gpr[HEX_REG_R28], &sc->sc_regs.r28);
- __get_user(env->gpr[HEX_REG_R29], &sc->sc_regs.r29);
- __get_user(env->gpr[HEX_REG_R30], &sc->sc_regs.r30);
- __get_user(env->gpr[HEX_REG_R31], &sc->sc_regs.r31);
+ for (int i = 0; i < 32; i++) {
+ __get_user(env->gpr[HEX_REG_R00 + i], &sc->sc_regs.gpr[i]);
+ }
__get_user(env->gpr[HEX_REG_SA0], &sc->sc_regs.sa0);
__get_user(env->gpr[HEX_REG_LC0], &sc->sc_regs.lc0);
__get_user(env->gpr[HEX_REG_SA1], &sc->sc_regs.sa1);
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PULL 4/8] tests/tcg/hexagon: Add cs{0,1} coverage
2025-10-17 20:50 [PULL 0/8] hex queue Brian Cain
` (2 preceding siblings ...)
2025-10-17 20:50 ` [PULL 3/8] linux-user/hexagon: Use an array for GPRs Brian Cain
@ 2025-10-17 20:50 ` Brian Cain
2025-10-17 20:50 ` [PULL 5/8] target/hexagon: handle .new values Brian Cain
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Brian Cain @ 2025-10-17 20:50 UTC (permalink / raw)
To: qemu-devel; +Cc: brian.cain, richard.henderson, Anton Johansson, Taylor Simpson
Cover cs0,1 register corruption in the signal_context test case.
lc0, sa0 registers previously omitted from the clobbers list
are now captured.
Reviewed-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Taylor Simpson <ltaylorsimpson@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>
---
tests/tcg/hexagon/signal_context.c | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/tests/tcg/hexagon/signal_context.c b/tests/tcg/hexagon/signal_context.c
index 7202fa64b6..9de7f6be4f 100644
--- a/tests/tcg/hexagon/signal_context.c
+++ b/tests/tcg/hexagon/signal_context.c
@@ -26,7 +26,11 @@ void sig_user(int sig, siginfo_t *info, void *puc)
"p1 = r7\n\t"
"p2 = r7\n\t"
"p3 = r7\n\t"
- : : : "r7", "p0", "p1", "p2", "p3");
+ "r6 = #0x12345678\n\t"
+ "cs0 = r6\n\t"
+ "r6 = #0x87654321\n\t"
+ "cs1 = r6\n\t"
+ : : : "r6", "r7", "p0", "p1", "p2", "p3", "cs0", "cs1");
}
int main()
@@ -53,7 +57,11 @@ int main()
timer_settime(tid, 0, &it, NULL);
asm("loop0(1f, %1)\n\t"
- "1: r8 = #0xff\n\t"
+ "1: r9 = #0xdeadbeef\n\t"
+ " cs0 = r9\n\t"
+ " r9 = #0xbadc0fee\n\t"
+ " cs1 = r9\n\t"
+ " r8 = #0xff\n\t"
" p0 = r8\n\t"
" p1 = r8\n\t"
" p2 = r8\n\t"
@@ -74,10 +82,19 @@ int main()
" r8 = p3\n\t"
" p0 = cmp.eq(r8, #0xff)\n\t"
" if (!p0) jump 2b\n\t"
+ " r8 = cs0\n\t"
+ " r9 = #0xdeadbeef\n\t"
+ " p0 = cmp.eq(r8, r9)\n\t"
+ " if (!p0) jump 2b\n\t"
+ " r8 = cs1\n\t"
+ " r9 = #0xbadc0fee\n\t"
+ " p0 = cmp.eq(r8, r9)\n\t"
+ " if (!p0) jump 2b\n\t"
"4: {}: endloop0\n\t"
:
: "r"(&err), "r"(i)
- : "memory", "r8", "p0", "p1", "p2", "p3");
+ : "memory", "r8", "r9", "p0", "p1", "p2", "p3", "cs0", "cs1", "lc0",
+ "sa0");
puts(err ? "FAIL" : "PASS");
return err;
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PULL 5/8] target/hexagon: handle .new values
2025-10-17 20:50 [PULL 0/8] hex queue Brian Cain
` (3 preceding siblings ...)
2025-10-17 20:50 ` [PULL 4/8] tests/tcg/hexagon: Add cs{0,1} coverage Brian Cain
@ 2025-10-17 20:50 ` Brian Cain
2025-10-17 20:50 ` [PULL 6/8] target/hexagon: s/pkt_has_store/pkt_has_scalar_store Brian Cain
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Brian Cain @ 2025-10-17 20:50 UTC (permalink / raw)
To: qemu-devel
Cc: brian.cain, richard.henderson, Taylor Simpson,
Matheus Tavares Bernardino
Reviewed-by: Taylor Simpson <ltaylorsimpson@gmail.com>
Reviewed-by: Matheus Tavares Bernardino <matheus.bernardino@oss.qualcomm.com>
Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>
---
target/hexagon/hex_common.py | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/target/hexagon/hex_common.py b/target/hexagon/hex_common.py
index 758e5fd12d..6803908718 100755
--- a/target/hexagon/hex_common.py
+++ b/target/hexagon/hex_common.py
@@ -350,6 +350,7 @@ def helper_arg(self):
f"{self.helper_arg_type()} {self.helper_arg_name()}"
)
+
#
# Every register is either Single or Pair or Hvx
#
@@ -1070,11 +1071,22 @@ def init_registers():
for reg in new_regs:
new_registers[f"{reg.regtype}{reg.regid}"] = reg
-def get_register(tag, regtype, regid):
- if f"{regtype}{regid}V" in semdict[tag]:
- return registers[f"{regtype}{regid}"]
- else:
- return new_registers[f"{regtype}{regid}"]
+def is_new_reg(tag, regid):
+ if regid[0] in "NO":
+ return True
+ return regid[0] == "P" and \
+ f"{regid}N" in semdict[tag] and \
+ f"{regid}V" not in semdict[tag]
+
+def get_register(tag, regtype, regid, subtype=""):
+ regid = f"{regtype}{regid}"
+ is_new = is_new_reg(tag, regid)
+ try:
+ reg = new_registers[regid] if is_new else registers[regid]
+ except KeyError:
+ raise Exception(f"Unknown {'new ' if is_new else ''}register {regid}" +\
+ f"from '{tag}' with syntax '{semdict[tag]}'") from None
+ return reg
def helper_ret_type(tag, regs):
## If there is a scalar result, it is the return type
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PULL 6/8] target/hexagon: s/pkt_has_store/pkt_has_scalar_store
2025-10-17 20:50 [PULL 0/8] hex queue Brian Cain
` (4 preceding siblings ...)
2025-10-17 20:50 ` [PULL 5/8] target/hexagon: handle .new values Brian Cain
@ 2025-10-17 20:50 ` Brian Cain
2025-10-17 20:50 ` [PULL 7/8] target/hexagon: Replace `prepare` script with meson target Brian Cain
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Brian Cain @ 2025-10-17 20:50 UTC (permalink / raw)
To: qemu-devel
Cc: brian.cain, richard.henderson, Taylor Simpson,
Matheus Tavares Bernardino, Alessandro Di Federico,
Anton Johansson
To remove any confusion with HVX or other potential store instructions,
we'll qualify this context var with "scalar".
Reviewed-by: Taylor Simpson <ltaylorsimpson@gmail.com>
Reviewed-by: Matheus Tavares Bernardino <matheus.bernardino@oss.qualcomm.com>
Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>
---
target/hexagon/idef-parser/README.rst | 2 +-
target/hexagon/insn.h | 4 ++--
target/hexagon/macros.h | 8 ++++----
target/hexagon/decode.c | 4 ++--
target/hexagon/genptr.c | 3 ++-
target/hexagon/idef-parser/parser-helpers.c | 4 ++--
target/hexagon/op_helper.c | 4 ++--
target/hexagon/translate.c | 9 +++++----
target/hexagon/gen_helper_funcs.py | 2 +-
9 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/target/hexagon/idef-parser/README.rst b/target/hexagon/idef-parser/README.rst
index 7199177ee3..235e3debee 100644
--- a/target/hexagon/idef-parser/README.rst
+++ b/target/hexagon/idef-parser/README.rst
@@ -637,7 +637,7 @@ tinycode for the Hexagon ``add`` instruction
::
---- 00021094
- mov_i32 pkt_has_store_s1,$0x0
+ mov_i32 pkt_has_scalar_store_s1,$0x0
add_i32 tmp0,r2,r2
mov_i32 loc2,tmp0
mov_i32 new_r1,loc2
diff --git a/target/hexagon/insn.h b/target/hexagon/insn.h
index 24dcf7fe9f..5d59430da9 100644
--- a/target/hexagon/insn.h
+++ b/target/hexagon/insn.h
@@ -66,8 +66,8 @@ struct Packet {
bool pkt_has_dczeroa;
- bool pkt_has_store_s0;
- bool pkt_has_store_s1;
+ bool pkt_has_scalar_store_s0;
+ bool pkt_has_scalar_store_s1;
bool pkt_has_hvx;
Insn *vhist_insn;
diff --git a/target/hexagon/macros.h b/target/hexagon/macros.h
index 9ba9be408d..088e5961ab 100644
--- a/target/hexagon/macros.h
+++ b/target/hexagon/macros.h
@@ -83,7 +83,7 @@
*/
#define CHECK_NOSHUF(VA, SIZE) \
do { \
- if (insn->slot == 0 && ctx->pkt->pkt_has_store_s1) { \
+ if (insn->slot == 0 && ctx->pkt->pkt_has_scalar_store_s1) { \
probe_noshuf_load(VA, SIZE, ctx->mem_idx); \
process_store(ctx, 1); \
} \
@@ -94,11 +94,11 @@
TCGLabel *noshuf_label = gen_new_label(); \
tcg_gen_brcondi_tl(TCG_COND_EQ, PRED, 0, noshuf_label); \
GET_EA; \
- if (insn->slot == 0 && ctx->pkt->pkt_has_store_s1) { \
+ if (insn->slot == 0 && ctx->pkt->pkt_has_scalar_store_s1) { \
probe_noshuf_load(EA, SIZE, ctx->mem_idx); \
} \
gen_set_label(noshuf_label); \
- if (insn->slot == 0 && ctx->pkt->pkt_has_store_s1) { \
+ if (insn->slot == 0 && ctx->pkt->pkt_has_scalar_store_s1) { \
process_store(ctx, 1); \
} \
} while (0)
@@ -525,7 +525,7 @@ static inline TCGv gen_read_ireg(TCGv result, TCGv val, int shift)
#define fLOAD(NUM, SIZE, SIGN, EA, DST) \
do { \
- check_noshuf(env, pkt_has_store_s1, slot, EA, SIZE, GETPC()); \
+ check_noshuf(env, pkt_has_scalar_store_s1, slot, EA, SIZE, GETPC()); \
DST = (size##SIZE##SIGN##_t)MEM_LOAD##SIZE(env, EA, GETPC()); \
} while (0)
#endif
diff --git a/target/hexagon/decode.c b/target/hexagon/decode.c
index 23deba2426..b5ece60450 100644
--- a/target/hexagon/decode.c
+++ b/target/hexagon/decode.c
@@ -236,9 +236,9 @@ static void decode_set_insn_attr_fields(Packet *pkt)
if (GET_ATTRIB(opcode, A_SCALAR_STORE) &&
!GET_ATTRIB(opcode, A_MEMSIZE_0B)) {
if (pkt->insn[i].slot == 0) {
- pkt->pkt_has_store_s0 = true;
+ pkt->pkt_has_scalar_store_s0 = true;
} else {
- pkt->pkt_has_store_s1 = true;
+ pkt->pkt_has_scalar_store_s1 = true;
}
}
}
diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c
index 08fc5413de..cecaece4ae 100644
--- a/target/hexagon/genptr.c
+++ b/target/hexagon/genptr.c
@@ -395,7 +395,8 @@ static inline void gen_store_conditional8(DisasContext *ctx,
#ifndef CONFIG_HEXAGON_IDEF_PARSER
static TCGv gen_slotval(DisasContext *ctx)
{
- int slotval = (ctx->pkt->pkt_has_store_s1 & 1) | (ctx->insn->slot << 1);
+ int slotval =
+ (ctx->pkt->pkt_has_scalar_store_s1 & 1) | (ctx->insn->slot << 1);
return tcg_constant_tl(slotval);
}
#endif
diff --git a/target/hexagon/idef-parser/parser-helpers.c b/target/hexagon/idef-parser/parser-helpers.c
index 542af8d0a6..1dc52b4e02 100644
--- a/target/hexagon/idef-parser/parser-helpers.c
+++ b/target/hexagon/idef-parser/parser-helpers.c
@@ -1725,7 +1725,7 @@ void gen_cancel(Context *c, YYLTYPE *locp)
void gen_load_cancel(Context *c, YYLTYPE *locp)
{
- OUT(c, locp, "if (insn->slot == 0 && pkt->pkt_has_store_s1) {\n");
+ OUT(c, locp, "if (insn->slot == 0 && pkt->pkt_has_scalar_store_s1) {\n");
OUT(c, locp, "ctx->s1_store_processed = false;\n");
OUT(c, locp, "process_store(ctx, 1);\n");
OUT(c, locp, "}\n");
@@ -1750,7 +1750,7 @@ void gen_load(Context *c, YYLTYPE *locp, HexValue *width,
/* Lookup the effective address EA */
find_variable(c, locp, ea, ea);
- OUT(c, locp, "if (insn->slot == 0 && pkt->pkt_has_store_s1) {\n");
+ OUT(c, locp, "if (insn->slot == 0 && pkt->pkt_has_scalar_store_s1) {\n");
OUT(c, locp, "probe_noshuf_load(", ea, ", ", width, ", ctx->mem_idx);\n");
OUT(c, locp, "process_store(ctx, 1);\n");
OUT(c, locp, "}\n");
diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c
index 444799d3ad..e2e80ca7ef 100644
--- a/target/hexagon/op_helper.c
+++ b/target/hexagon/op_helper.c
@@ -463,11 +463,11 @@ void HELPER(probe_pkt_scalar_hvx_stores)(CPUHexagonState *env, int mask)
* If the load is in slot 0 and there is a store in slot1 (that
* wasn't cancelled), we have to do the store first.
*/
-static void check_noshuf(CPUHexagonState *env, bool pkt_has_store_s1,
+static void check_noshuf(CPUHexagonState *env, bool pkt_has_scalar_store_s1,
uint32_t slot, target_ulong vaddr, int size,
uintptr_t ra)
{
- if (slot == 0 && pkt_has_store_s1 &&
+ if (slot == 0 && pkt_has_scalar_store_s1 &&
((env->slot_cancelled & (1 << 1)) == 0)) {
probe_read(env, vaddr, size, MMU_USER_IDX, ra);
commit_store(env, 1, ra);
diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c
index 50766eafe2..8fce219c0d 100644
--- a/target/hexagon/translate.c
+++ b/target/hexagon/translate.c
@@ -693,11 +693,11 @@ static void process_store_log(DisasContext *ctx)
* the memory accesses overlap.
*/
Packet *pkt = ctx->pkt;
- if (pkt->pkt_has_store_s1) {
+ if (pkt->pkt_has_scalar_store_s1) {
g_assert(!pkt->pkt_has_dczeroa);
process_store(ctx, 1);
}
- if (pkt->pkt_has_store_s0) {
+ if (pkt->pkt_has_scalar_store_s0) {
g_assert(!pkt->pkt_has_dczeroa);
process_store(ctx, 0);
}
@@ -822,8 +822,9 @@ static void gen_commit_packet(DisasContext *ctx)
* involved in committing the packet.
*/
Packet *pkt = ctx->pkt;
- bool has_store_s0 = pkt->pkt_has_store_s0;
- bool has_store_s1 = (pkt->pkt_has_store_s1 && !ctx->s1_store_processed);
+ bool has_store_s0 = pkt->pkt_has_scalar_store_s0;
+ bool has_store_s1 =
+ (pkt->pkt_has_scalar_store_s1 && !ctx->s1_store_processed);
bool has_hvx_store = pkt_has_hvx_store(pkt);
if (pkt->pkt_has_dczeroa) {
/*
diff --git a/target/hexagon/gen_helper_funcs.py b/target/hexagon/gen_helper_funcs.py
index c1f806ac4b..a9c0e27a80 100755
--- a/target/hexagon/gen_helper_funcs.py
+++ b/target/hexagon/gen_helper_funcs.py
@@ -69,7 +69,7 @@ def gen_helper_function(f, tag, tagregs, tagimms):
if hex_common.need_slot(tag):
if "A_LOAD" in hex_common.attribdict[tag]:
f.write(hex_common.code_fmt(f"""\
- bool pkt_has_store_s1 = slotval & 0x1;
+ bool pkt_has_scalar_store_s1 = slotval & 0x1;
"""))
f.write(hex_common.code_fmt(f"""\
uint32_t slot = slotval >> 1;
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PULL 7/8] target/hexagon: Replace `prepare` script with meson target
2025-10-17 20:50 [PULL 0/8] hex queue Brian Cain
` (5 preceding siblings ...)
2025-10-17 20:50 ` [PULL 6/8] target/hexagon: s/pkt_has_store/pkt_has_scalar_store Brian Cain
@ 2025-10-17 20:50 ` Brian Cain
2025-10-17 20:50 ` [PULL 8/8] target/hexagon: Only indent on linux Brian Cain
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Brian Cain @ 2025-10-17 20:50 UTC (permalink / raw)
To: qemu-devel; +Cc: brian.cain, richard.henderson, Anton Johansson
From: Anton Johansson <anjo@rev.ng>
The purpose of the prepare script is to invoke `cpp` to preprocess input
to idef-parser by expanding a few select macros. On macOS `cpp`
expands into `clang ... -traditional-cpp` which breaks macro
concatenation. Replace `cpp` with `${compiler} -E`
and replace the script with a meson custom_target.
Signed-off-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Brian Cain <brian.cain@oss.qualcomm.com>
Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>
---
target/hexagon/idef-parser/prepare | 24 ------------------------
target/hexagon/meson.build | 3 ++-
2 files changed, 2 insertions(+), 25 deletions(-)
delete mode 100755 target/hexagon/idef-parser/prepare
diff --git a/target/hexagon/idef-parser/prepare b/target/hexagon/idef-parser/prepare
deleted file mode 100755
index cb3622d4f8..0000000000
--- a/target/hexagon/idef-parser/prepare
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# Copyright(c) 2019-2021 rev.ng Labs Srl. All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-
-set -e
-set -o pipefail
-
-# Run the preprocessor and drop comments
-cpp "$@"
diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build
index bb4ebaae81..abcf00ca1f 100644
--- a/target/hexagon/meson.build
+++ b/target/hexagon/meson.build
@@ -280,12 +280,13 @@ if idef_parser_enabled and 'hexagon-linux-user' in target_dirs
command: [python, files('gen_idef_parser_funcs.py'), semantics_generated, '@OUTPUT@'],
)
+ compiler = meson.get_compiler('c').get_id()
preprocessed_idef_parser_input_generated = custom_target(
'idef_parser_input.preprocessed.h.inc',
output: 'idef_parser_input.preprocessed.h.inc',
input: idef_parser_input_generated,
depend_files: [idef_parser_dir / 'macros.h.inc'],
- command: [idef_parser_dir / 'prepare', '@INPUT@', '-I' + idef_parser_dir, '-o', '@OUTPUT@'],
+ command: [compiler, '-x', 'c', '-E', '-I', idef_parser_dir, '-o', '@OUTPUT@', '@INPUT@'],
)
flex = generator(
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PULL 8/8] target/hexagon: Only indent on linux
2025-10-17 20:50 [PULL 0/8] hex queue Brian Cain
` (6 preceding siblings ...)
2025-10-17 20:50 ` [PULL 7/8] target/hexagon: Replace `prepare` script with meson target Brian Cain
@ 2025-10-17 20:50 ` Brian Cain
2025-10-17 23:20 ` [PULL 0/8] hex queue Richard Henderson
2025-10-18 5:30 ` Michael Tokarev
9 siblings, 0 replies; 11+ messages in thread
From: Brian Cain @ 2025-10-17 20:50 UTC (permalink / raw)
To: qemu-devel; +Cc: brian.cain, richard.henderson, Anton Johansson
From: Anton Johansson <anjo@rev.ng>
indent on macOS, installed via homebrew, doesn't support -linux. Only
run indent on linux hosts.
Signed-off-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Brian Cain <brian.cain@oss.qualcomm.com>
Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>
---
target/hexagon/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build
index abcf00ca1f..d26787a9b9 100644
--- a/target/hexagon/meson.build
+++ b/target/hexagon/meson.build
@@ -324,7 +324,7 @@ if idef_parser_enabled and 'hexagon-linux-user' in target_dirs
)
indent = find_program('indent', required: false)
- if indent.found()
+ if indent.found() and host_os == 'linux'
idef_generated_tcg_c = custom_target(
'indent',
input: idef_generated_tcg[0],
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PULL 0/8] hex queue
2025-10-17 20:50 [PULL 0/8] hex queue Brian Cain
` (7 preceding siblings ...)
2025-10-17 20:50 ` [PULL 8/8] target/hexagon: Only indent on linux Brian Cain
@ 2025-10-17 23:20 ` Richard Henderson
2025-10-18 5:30 ` Michael Tokarev
9 siblings, 0 replies; 11+ messages in thread
From: Richard Henderson @ 2025-10-17 23:20 UTC (permalink / raw)
To: Brian Cain, qemu-devel
On 10/17/25 13:50, Brian Cain wrote:
> The following changes since commit 18f6f30b0089b470f3e737637a86dfb81ebd6eae:
>
> Merge tag 'pull-request-2025-10-16' ofhttps://gitlab.com/thuth/qemu into staging (2025-10-16 12:27:12 -0700)
>
> are available in the Git repository at:
>
> https://github.com/quic/qemu tags/pull-hex-20251017
>
> for you to fetch changes up to f97700e0752753e294db11de8462aef5d8009a89:
>
> target/hexagon: Only indent on linux (2025-10-17 13:45:46 -0700)
>
> ----------------------------------------------------------------
> Fixes for linux-user sigcontext save/restore, etc.
>
> misc: avoid inconsistencies w/indent on macOS
> fix hexagon linux-user sigcontext discrepancy, found by Alex @ Zig
Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/10.2 as appropriate.
r~
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PULL 0/8] hex queue
2025-10-17 20:50 [PULL 0/8] hex queue Brian Cain
` (8 preceding siblings ...)
2025-10-17 23:20 ` [PULL 0/8] hex queue Richard Henderson
@ 2025-10-18 5:30 ` Michael Tokarev
9 siblings, 0 replies; 11+ messages in thread
From: Michael Tokarev @ 2025-10-18 5:30 UTC (permalink / raw)
To: Brian Cain, qemu-devel; +Cc: Brian Cain, Anton Johansson
On 10/17/25 23:50, Brian Cain wrote:
> The following changes since commit 18f6f30b0089b470f3e737637a86dfb81ebd6eae:
>
> Merge tag 'pull-request-2025-10-16' of https://gitlab.com/thuth/qemu into staging (2025-10-16 12:27:12 -0700)
>
> are available in the Git repository at:
>
> https://github.com/quic/qemu tags/pull-hex-20251017
>
> for you to fetch changes up to f97700e0752753e294db11de8462aef5d8009a89:
>
> target/hexagon: Only indent on linux (2025-10-17 13:45:46 -0700)
>
> ----------------------------------------------------------------
> Fixes for linux-user sigcontext save/restore, etc.
>
> misc: avoid inconsistencies w/indent on macOS
> fix hexagon linux-user sigcontext discrepancy, found by Alex @ Zig
>
> ----------------------------------------------------------------
> Anton Johansson (2):
> target/hexagon: Replace `prepare` script with meson target
> target/hexagon: Only indent on linux
>
> Brian Cain (6):
> linux-user/hexagon: Fix sigcontext
> linux-user/hexagon: use abi_ulong
> linux-user/hexagon: Use an array for GPRs
> tests/tcg/hexagon: Add cs{0,1} coverage
> target/hexagon: handle .new values
> target/hexagon: s/pkt_has_store/pkt_has_scalar_store
Is there anything in there which should be picked up for active
qemu stable series (10.0 & 10.1), or is it not worth the effort?
(the sigcontext fixes seems to be good candidates, though are
a bit large).
Thanks,
/mjt
^ permalink raw reply [flat|nested] 11+ messages in thread