gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-11-28 10:31:05 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fix mismatch of enum sizes between WASM and host

Browse Source 
Signed-off-by: Dan Kouba <dan@atym.io>
This commit is contained in:
Dan Kouba 2025-10-21 12:44:47 -07:00
parent 3bf08a0eda
commit 8b614145d3
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/shared/platform/include/platform_wasi_types.h
View File

@ -530,12 +530,6 @@ assert_wasi_layout(offsetof(__wasi_subscription_t, userdata) == 0, "witx calcula
assert_wasi_layout(offsetof(__wasi_subscription_t, u) == 8, "witx calculated offset"); assert_wasi_layout(offsetof(__wasi_subscription_t, u) == 8, "witx calculated offset");
/* keep syncing with wasi_socket_ext.h */ /* keep syncing with wasi_socket_ext.h */
typedef enum {
/* Used only for sock_addr_resolve hints */
SOCKET_ANY = -1,
SOCKET_DGRAM = 0,
SOCKET_STREAM,
} __wasi_sock_type_t;
typedef uint16_t __wasi_ip_port_t; typedef uint16_t __wasi_ip_port_t;
@ -589,7 +583,12 @@ typedef struct __wasi_addr_t {
} addr; } addr;
} __wasi_addr_t; } __wasi_addr_t;
typedef enum { INET4 = 0, INET6, INET_UNSPEC } __wasi_address_family_t; /* Force 32-bit wire width for cross-boundary fields */
typedef int32_t __wasi_sock_type_t;
enum { SOCKET_ANY = -1, SOCKET_DGRAM = 0, SOCKET_STREAM = 1 };
typedef int32_t __wasi_address_family_t;
enum { INET4 = 0, INET6 = 1, INET_UNSPEC = 2 };
typedef struct __wasi_addr_info_t { typedef struct __wasi_addr_info_t {
__wasi_addr_t addr; __wasi_addr_t addr;
@ -597,12 +596,23 @@ typedef struct __wasi_addr_info_t {
} __wasi_addr_info_t; } __wasi_addr_info_t;
typedef struct __wasi_addr_info_hints_t { typedef struct __wasi_addr_info_hints_t {
__wasi_sock_type_t type; __wasi_sock_type_t type; // 4 bytes
__wasi_address_family_t family; __wasi_address_family_t family; // 4 bytes
// this is to workaround lack of optional parameters uint8_t hints_enabled; // 1 byte
uint8_t hints_enabled; uint8_t _pad[3]; // enforce layout
} __wasi_addr_info_hints_t; } __wasi_addr_info_hints_t;
assert_wasi_layout(sizeof(__wasi_sock_type_t) == 4, "sock_type must be 4 bytes");
assert_wasi_layout(sizeof(__wasi_address_family_t) == 4, "addr_family must be 4 bytes");
assert_wasi_layout(sizeof(__wasi_addr_info_hints_t) == 12, "hints_t must be 12 bytes");
assert_wasi_layout(offsetof(__wasi_addr_info_hints_t, type) == 0, "hints.type@0");
assert_wasi_layout(offsetof(__wasi_addr_info_hints_t, family) == 4, "hints.family@4");
assert_wasi_layout(offsetof(__wasi_addr_info_hints_t, hints_enabled) == 8, "hints.enabled@8");
assert_wasi_layout(offsetof(__wasi_addr_info_t, type) == sizeof(__wasi_addr_t),
"addr_info.type follows addr");
#undef assert_wasi_layout #undef assert_wasi_layout
/* clang-format on */ /* clang-format on */