linux-user: Fix fault address truncation AArch64

On AArch64 the si_addr field of siginfo_t is truncated to 32 bits because the fault address passes through an uint32_t variable. This is fixed by changing the variable to uint64_t.

Signed-off-by Amanieu d'Antras <[email protected]>

---
 linux-user/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

linux-user/main.c +1 -1

index 483eb3f..d63e093 100644
@@ -1006,7 +1006,7 @@ void cpu_loop(CPUARMState *env)
     CPUState *cs = CPU(arm_env_get_cpu(env));
     int trapnr, sig;
     target_siginfo_t info;
-    uint32_t addr;
+    uint64_t addr;
 
     for (;;) {
         cpu_exec_start(cs);

On AArch64 the si_addr field of siginfo_t is truncated to 32 bits because the fault address passes through an uint32_t variable. This is fixed by changing the variable to uint64_t.

Signed-off-by Amanieu d'Antras <[email protected]>

---
 linux-user/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

linux-user/main.c +0 -0

index 483eb3f..d63e093 100644

Quoted 14 lines · Amanieu d'Antras

On AArch64 the si_addr field of siginfo_t is truncated to 32 bits because the fault address passes through an uint32_t variable. This is fixed by changing the variable to uint64_t.

Signed-off-by Amanieu d'Antras <[email protected]>

---
 linux-user/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

linux-user/main.c +0 -0

index 483eb3f..d63e093 100644

linux-user/main.c void cpu_loop(CPUARMState *env) · line 1012

Quoted 8 lines

linux-user/main.c +1 -1

@@ -1006,7 +1006,7 @@ void cpu_loop(CPUARMState *env)
     CPUState *cs = CPU(arm_env_get_cpu(env));
     int trapnr, sig;
     target_siginfo_t info;
-    uint32_t addr;
+    uint64_t addr;
 
     for (;;) {
         cpu_exec_start(cs);

Thanks for catching this. Better to fix it by dropping the unnecessary local variable completely and just setting
info._sifields._sigfault._addr = env->exception.vaddress;
at the only point where we currently use 'addr', though, I think.

-- PMM

Quoted 5 lines · Peter Maydell

Thanks for catching this. Better to fix it by dropping the unnecessary local variable completely and just setting
info._sifields._sigfault._addr = env->exception.vaddress;
at the only point where we currently use 'addr', though, I think.

We do use the name code pattern in most of the functions of that file, meaning

uint32_t / uint64_t / target_ulong addr;

and then do_something_with_addr(addr);