diff mbox

[v7,5/7] linux-user: Fix certain argument alignment cases for Mips64

Message ID 20160919114456.66629-6-aleksandar.markovic@rt-rk.com (mailing list archive)
State New, archived
Headers show

Commit Message

Aleksandar Markovic Sept. 19, 2016, 11:44 a.m. UTC
From: Aleksandar Markovic <aleksandar.markovic@imgtec.com>

The function that is changed in this patch is supposed to indicate that
there was certain argument rearrangement related to 64-bit arguments on
32-bit platforms. The background on such rearrangements can be found,
for example, in the man page for syscall(2).

However, for 64-bit Mips architectures there is no such rearrangement,
and this patch reflects it.

Signed-off-by: Aleksandar Rikalo <aleksandar.rikalo@imgtec.com>
Signed-off-by: Aleksandar Markovic <aleksandar.markovic@imgtec.com>
---
 linux-user/syscall.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Laurent Vivier Sept. 20, 2016, 7:03 a.m. UTC | #1
Le 19/09/2016 à 13:44, Aleksandar Markovic a écrit :
> From: Aleksandar Markovic <aleksandar.markovic@imgtec.com>
> 
> The function that is changed in this patch is supposed to indicate that
> there was certain argument rearrangement related to 64-bit arguments on
> 32-bit platforms. The background on such rearrangements can be found,
> for example, in the man page for syscall(2).
> 
> However, for 64-bit Mips architectures there is no such rearrangement,
> and this patch reflects it.
> 
> Signed-off-by: Aleksandar Rikalo <aleksandar.rikalo@imgtec.com>
> Signed-off-by: Aleksandar Markovic <aleksandar.markovic@imgtec.com>

Reviewed-by: Laurent Vivier <laurent@vivier.eu>

> ---
>  linux-user/syscall.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index ca06943..4f52f09 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -619,7 +619,7 @@ static inline int next_free_host_timer(void)
>  static inline int regpairs_aligned(void *cpu_env) {
>      return ((((CPUARMState *)cpu_env)->eabi) == 1) ;
>  }
> -#elif defined(TARGET_MIPS)
> +#elif defined(TARGET_MIPS) && (TARGET_ABI_BITS == 32)
>  static inline int regpairs_aligned(void *cpu_env) { return 1; }
>  #elif defined(TARGET_PPC) && !defined(TARGET_PPC64)
>  /* SysV AVI for PPC32 expects 64bit parameters to be passed on odd/even pairs
>
diff mbox

Patch

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ca06943..4f52f09 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -619,7 +619,7 @@  static inline int next_free_host_timer(void)
 static inline int regpairs_aligned(void *cpu_env) {
     return ((((CPUARMState *)cpu_env)->eabi) == 1) ;
 }
-#elif defined(TARGET_MIPS)
+#elif defined(TARGET_MIPS) && (TARGET_ABI_BITS == 32)
 static inline int regpairs_aligned(void *cpu_env) { return 1; }
 #elif defined(TARGET_PPC) && !defined(TARGET_PPC64)
 /* SysV AVI for PPC32 expects 64bit parameters to be passed on odd/even pairs