Re: [PATCH 1/2] linux-user/hexagon: Fix sigcontext

[Richard Henderson <richard.henderson@linaro.org>]

On 10/8/25 08:27, Anton Johansson wrote:
> On 08/10/25, Brian Cain wrote:
>> 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>
>> Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>
>> ---
>>   linux-user/hexagon/signal.c | 199 ++++++++++++++++++++----------------
>>   1 file changed, 111 insertions(+), 88 deletions(-)
>>
>> diff --git a/linux-user/hexagon/signal.c b/linux-user/hexagon/signal.c
>> index 492b51f155..6c3dbf91fa 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,21 @@ 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;
>>   };
> 
> struct layout looks good assuming it must correspond to
> `arch/hexagon/include/uapi/asm/user.h`.  Add a `/* pad to 48 words */`
> comment to pad1, and static assert following the struct definition
> 
>    QEMU_BUILD_BUG_ON(sizeof(struct target_user_regs_struct) != 48*4);

As long as you're fixing things, all of these target_ulong should be abi_ulong, because 
user_regs_struct uses 'unsigned long'.


r~