[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 08/12] linux-user: Fix up AArch64 syscall handler
From: |
John Rigby |
Subject: |
[Qemu-devel] [PATCH v4 08/12] linux-user: Fix up AArch64 syscall handlers |
Date: |
Mon, 13 May 2013 22:32:56 -0600 |
From: Alexander Graf <address@hidden>
Some syscall handlers have special code for ARM enabled that we don't
need on AArch64. Exclude AArch64 in those cases. In other places we
can share struct definitions with other targets or have to provide our
own.
With this patch applied, most syscall definitions in linux-user should
be sound for AArch64.
Signed-off-by: Alexander Graf <address@hidden>
Signed-off-by: John Rigby <address@hidden>
---
linux-user/syscall.c | 5 +++--
linux-user/syscall_defs.h | 28 ++++++++++++++++++++++++++--
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 30e93bc..3345508 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -4858,7 +4858,7 @@ static inline abi_long host_to_target_stat64(void
*cpu_env,
abi_ulong target_addr,
struct stat *host_st)
{
-#ifdef TARGET_ARM
+#if defined(TARGET_ARM) && defined(TARGET_ABI32)
if (((CPUARMState *)cpu_env)->eabi) {
struct target_eabi_stat64 *target_st;
@@ -6490,7 +6490,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
#endif
#ifdef TARGET_NR_mmap
case TARGET_NR_mmap:
-#if (defined(TARGET_I386) && defined(TARGET_ABI32)) || defined(TARGET_ARM) || \
+#if (defined(TARGET_I386) && defined(TARGET_ABI32)) || \
+ (defined(TARGET_ARM) && defined(TARGET_ABI32)) || \
defined(TARGET_M68K) || defined(TARGET_CRIS) || defined(TARGET_MICROBLAZE)
\
|| defined(TARGET_S390X)
{
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 92c01a9..08f7559 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -1137,7 +1137,8 @@ struct target_winsize {
#define TARGET_MAP_UNINITIALIZED 0x4000000 /* for anonymous mmap, memory
could be uninitialized */
#endif
-#if (defined(TARGET_I386) && defined(TARGET_ABI32)) || defined(TARGET_ARM) \
+#if (defined(TARGET_I386) && defined(TARGET_ABI32)) \
+ || (defined(TARGET_ARM) && defined(TARGET_ABI32)) \
|| defined(TARGET_CRIS) || defined(TARGET_UNICORE32) \
|| defined(TARGET_OPENRISC)
struct target_stat {
@@ -1836,6 +1837,28 @@ struct target_stat {
abi_long st_blocks;
abi_ulong __unused[3];
};
+#elif defined(TARGET_AARCH64)
+struct target_stat {
+ abi_ulong st_dev;
+ abi_ulong st_ino;
+ unsigned int st_mode;
+ unsigned int st_nlink;
+ unsigned int st_uid;
+ unsigned int st_gid;
+ abi_ulong st_rdev;
+ abi_ulong _pad1;
+ abi_long st_size;
+ int st_blksize;
+ int __pad2;
+ abi_long st_blocks;
+ abi_long target_st_atime;
+ abi_ulong target_st_atime_nsec;
+ abi_long target_st_mtime;
+ abi_ulong target_st_mtime_nsec;
+ abi_long target_st_ctime;
+ abi_ulong target_st_ctime_nsec;
+ unsigned int __unused[2];
+};
#elif defined(TARGET_OPENRISC)
struct target_stat {
abi_ulong st_dev;
@@ -1918,7 +1941,8 @@ struct target_statfs64 {
uint32_t f_spare[6];
};
#elif (defined(TARGET_PPC64) || defined(TARGET_X86_64) || \
- defined(TARGET_SPARC64)) && !defined(TARGET_ABI32)
+ defined(TARGET_SPARC64) || defined(TARGET_AARCH64)) && \
+ !defined(TARGET_ABI32)
struct target_statfs {
abi_long f_type;
abi_long f_bsize;
--
1.8.2.2
- [Qemu-devel] [PATCH v4 00/12] AArch64 preparation patch set, John Rigby, 2013/05/14
- [Qemu-devel] [PATCH v4 01/12] ARM: Extract the disas struct to a header file, John Rigby, 2013/05/14
- [Qemu-devel] [PATCH v4 02/12] ARM: Export cpu_env, John Rigby, 2013/05/14
- [Qemu-devel] [PATCH v4 03/12] ARM: Prepare translation for AArch64 code, John Rigby, 2013/05/14
- [Qemu-devel] [PATCH v4 04/12] ARM: Add AArch64 translation stub, John Rigby, 2013/05/14
- [Qemu-devel] [PATCH v4 05/12] AArch64: Add gdb stub, John Rigby, 2013/05/14
- [Qemu-devel] [PATCH v4 06/12] linux-user: Don't treat aarch64 cpu names specially, John Rigby, 2013/05/14
- [Qemu-devel] [PATCH v4 07/12] linux-user: Add syscall handling for AArch64, John Rigby, 2013/05/14
- [Qemu-devel] [PATCH v4 08/12] linux-user: Fix up AArch64 syscall handlers,
John Rigby <=
- [Qemu-devel] [PATCH v4 09/12] linux-user: Add signal handling for AArch64, John Rigby, 2013/05/14
- [Qemu-devel] [PATCH v4 10/12] linux-user: Add AArch64 support, John Rigby, 2013/05/14
- [Qemu-devel] [PATCH v4 11/12] ARM: Add aarch64 target to configure, John Rigby, 2013/05/14
- [Qemu-devel] [PATCH v4 12/12] linux-user: AArch64 requires at least 3.8.0, John Rigby, 2013/05/14