[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 9/9] linux-user/syscall: Align target_sockaddr fields using AB
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v8 9/9] linux-user/syscall: Align target_sockaddr fields using ABI types |
Date: |
Mon, 21 Oct 2019 13:48:57 +0200 |
Target architectures align types differently for instance m68k
aligns on 16bit whereas others on 32bit).
Use ABI types to keep alignments good.
Suggested-by: Laurent Vivier <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
v8: Use abi_int for target_sockaddr_ll.sll_ifindex
---
linux-user/syscall_defs.h | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 7694d72446..98c2119de9 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -134,22 +134,22 @@
#define TARGET_IOWRU(type,nr)
TARGET_IOC(TARGET_IOC_READ|TARGET_IOC_WRITE,(type),(nr),TARGET_IOC_SIZEMASK)
struct target_sockaddr {
- uint16_t sa_family;
+ abi_ushort sa_family;
uint8_t sa_data[14];
};
struct target_sockaddr_ll {
- uint16_t sll_family; /* Always AF_PACKET */
- uint16_t sll_protocol; /* Physical layer protocol */
- int sll_ifindex; /* Interface number */
- uint16_t sll_hatype; /* ARP hardware type */
- uint8_t sll_pkttype; /* Packet type */
- uint8_t sll_halen; /* Length of address */
- uint8_t sll_addr[8]; /* Physical layer address */
+ abi_ushort sll_family; /* Always AF_PACKET */
+ abi_ushort sll_protocol; /* Physical layer protocol */
+ abi_int sll_ifindex; /* Interface number */
+ abi_ushort sll_hatype; /* ARP hardware type */
+ uint8_t sll_pkttype; /* Packet type */
+ uint8_t sll_halen; /* Length of address */
+ uint8_t sll_addr[8]; /* Physical layer address */
};
struct target_sockaddr_un {
- uint16_t su_family;
+ abi_ushort su_family;
uint8_t sun_path[108];
};
@@ -161,24 +161,24 @@ struct target_sockaddr_nl {
};
struct target_in_addr {
- uint32_t s_addr; /* big endian */
+ abi_uint s_addr; /* big endian */
};
struct target_sockaddr_in {
- uint16_t sin_family;
- int16_t sin_port; /* big endian */
+ abi_ushort sin_family;
+ abi_short sin_port; /* big endian */
struct target_in_addr sin_addr;
uint8_t __pad[sizeof(struct target_sockaddr) -
- sizeof(uint16_t) - sizeof(int16_t) -
+ sizeof(abi_ushort) - sizeof(abi_short) -
sizeof(struct target_in_addr)];
};
struct target_sockaddr_in6 {
- uint16_t sin6_family;
- uint16_t sin6_port; /* big endian */
- uint32_t sin6_flowinfo; /* big endian */
+ abi_ushort sin6_family;
+ abi_ushort sin6_port; /* big endian */
+ abi_uint sin6_flowinfo; /* big endian */
struct in6_addr sin6_addr; /* IPv6 address, big endian */
- uint32_t sin6_scope_id;
+ abi_uint sin6_scope_id;
};
struct target_sock_filter {
--
2.21.0
- [PATCH v8 0/9] linux-user: strace improvements, Philippe Mathieu-Daudé, 2019/10/21
- [PATCH v8 1/9] linux-user/strace: Display invalid pointer in print_timeval(), Philippe Mathieu-Daudé, 2019/10/21
- [PATCH v8 3/9] linux-user/strace: Improve settimeofday(), Philippe Mathieu-Daudé, 2019/10/21
- [PATCH v8 5/9] linux-user/strace: Dump AF_NETLINK sockaddr content, Philippe Mathieu-Daudé, 2019/10/21
- [PATCH v8 9/9] linux-user/syscall: Align target_sockaddr fields using ABI types,
Philippe Mathieu-Daudé <=
- [PATCH v8 6/9] linux-user/strace: Add print_sockfd(), Philippe Mathieu-Daudé, 2019/10/21
- [PATCH v8 8/9] linux-user/strace: Let print_sockaddr() have a 'last' argument, Philippe Mathieu-Daudé, 2019/10/21
- [PATCH v8 4/9] linux-user/syscall: Introduce target_sockaddr_nl, Philippe Mathieu-Daudé, 2019/10/21
- [PATCH v8 2/9] linux-user/strace: Add print_timezone(), Philippe Mathieu-Daudé, 2019/10/21