Skip to content

feat(zephyr): v4.4 migration fixes/improvements #4918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kr-t wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −15
Open

feat(zephyr): v4.4 migration fixes/improvements #4918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/iwasm/aot/arch/aot_reloc_thumb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ apply_relocation(AOTModule *module, uint8 *target_section_addr,
| ((lower & 0x7000) >> 4) | (lower & 0x00ff);
offset = (offset ^ 0x8000) - 0x8000;

offset += (symbol_addr + reloc_addend);
offset += ((intptr_t)symbol_addr + reloc_addend);

if (reloc_type == R_ARM_THM_MOVT_PREL
|| reloc_type == R_ARM_THM_MOVW_PREL_NC)
Expand Down
10 changes: 5 additions & 5 deletions core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2215,15 +2215,15 @@ wasmtime_ssp_poll_oneoff(wasm_exec_env_t exec_env, struct fd_table *curfds,
__WASI_RIGHT_POLL_FD_READWRITE, 0);
if (error == 0) {

// Temporary workaround (see PR#4377)
#ifdef BH_PLATFORM_ZEPHYR
os_file_handle tfd = fos[i]->file_handle->fd;
#else
// Temporary workaround (see PR#4377)
os_file_handle tfd = fos[i]->file_handle;
#endif
// Proper file descriptor on which we can poll().
pfds[i] = (os_poll_file_handle){
#ifdef BH_PLATFORM_ZEPHYR
.fd = tfd->fd,
#else
.fd = tfd,
#endif
.events = s->u.type == __WASI_EVENTTYPE_FD_READ
? POLLIN
: POLLOUT,
Expand Down
18 changes: 9 additions & 9 deletions core/shared/platform/zephyr/zephyr_socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ textual_addr_to_sockaddr(const char *textual, int port, struct sockaddr *out,
{
struct sockaddr_in *v4;
#ifdef IPPROTO_IPV6
struct sockaddr_in *v6;
struct sockaddr_in6 *v6;
#endif

assert(textual);
Expand All @@ -38,11 +38,11 @@ textual_addr_to_sockaddr(const char *textual, int port, struct sockaddr *out,
}

#ifdef IPPROTO_IPV6
v6 = (struct sockaddr_in *)out;
v6 = (struct sockaddr_in6 *)out;
if (zsock_inet_pton(AF_INET6, textual, &v6->sin6_addr.s6_addr) == 1) {
v6->sin6_family = AF_INET6;
v6->sin6_port = htons(port);
*out_len = sizeof(struct sockaddr_in);
*out_len = sizeof(struct sockaddr_in6);
return true;
}
#endif
Expand All @@ -67,7 +67,7 @@ sockaddr_to_bh_sockaddr(const struct sockaddr *sockaddr,
#ifdef IPPROTO_IPV6
case AF_INET6:
{
struct sockaddr_in *addr = (struct sockaddr_in *)sockaddr;
struct sockaddr_in6 *addr = (struct sockaddr_in6 *)sockaddr;
size_t i;

bh_sockaddr->port = ntohs(addr->sin6_port);
Expand Down Expand Up @@ -245,7 +245,7 @@ os_socket_bind(bh_socket_t socket, const char *host, int *port)
}
else {
#ifdef IPPROTO_IPV6
*port = ntohs(((struct sockaddr_in *)&addr)->sin6_port);
*port = ntohs(((struct sockaddr_in6 *)&addr)->sin6_port);
#else
return BHT_ERROR;
#endif
Expand Down Expand Up @@ -906,10 +906,10 @@ os_socket_set_ip_add_membership(bh_socket_t socket,
((uint16_t *)mreq.ipv6mr_multiaddr.s6_addr)[i] =
imr_multiaddr->ipv6[i];
}
mreq.ipv6mr_interface = imr_interface;
mreq.ipv6mr_ifindex = imr_interface;

if (setsockopt(socket->fd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq,
sizeof(mreq))
if (zsock_setsockopt(socket->fd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP,
&mreq, sizeof(mreq))
!= 0) {
return BHT_ERROR;
}
Expand Down Expand Up @@ -947,7 +947,7 @@ os_socket_set_ip_drop_membership(bh_socket_t socket,
((uint16_t *)mreq.ipv6mr_multiaddr.s6_addr)[i] =
imr_multiaddr->ipv6[i];
}
mreq.ipv6mr_interface = imr_interface;
mreq.ipv6mr_ifindex = imr_interface;

if (zsock_setsockopt(socket->fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP,
&mreq, sizeof(mreq))
Expand Down
Loading