Skip to content

Commit

Permalink
Fix compilation errors on esp-idf platform (bytecodealliance#3224)
Browse files Browse the repository at this point in the history
The issue was reported in bytecodealliance#3208.
  • Loading branch information
wenyongh authored Mar 14, 2024
1 parent de803b2 commit 5e2011c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 5 deletions.
2 changes: 1 addition & 1 deletion core/iwasm/interpreter/wasm_loader.c
Original file line number Diff line number Diff line change
Expand Up @@ -11421,7 +11421,7 @@ wasm_loader_prepare_bytecode(WASMModule *module, WASMFunction *func,

case WASM_OP_BR_TABLE:
{
uint32 depth, default_arity, arity = 0;
uint32 depth = 0, default_arity, arity = 0;
BranchBlock *target_block;
BlockType *target_block_type;
#if WASM_ENABLE_FAST_INTERP == 0
Expand Down
2 changes: 1 addition & 1 deletion core/iwasm/libraries/libc-builtin/libc_builtin_wrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ sprintf_wrapper(wasm_exec_env_t exec_env, char *str, const char *format,
if (!wasm_runtime_get_native_addr_range(module_inst, (uint8 *)str, NULL,
&native_end_offset)) {
wasm_runtime_set_exception(module_inst, "out of bounds memory access");
return false;
return 0;
}

ctx.str = str;
Expand Down
6 changes: 6 additions & 0 deletions core/shared/platform/esp-idf/espidf_memmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file)
}
}

void *
os_mremap(void *old_addr, size_t old_size, size_t new_size)
{
return os_mremap_slow(old_addr, old_size, new_size);
}

void
os_munmap(void *addr, size_t size)
{
Expand Down
6 changes: 3 additions & 3 deletions core/shared/platform/esp-idf/espidf_platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ unlinkat(int fd, const char *path, int flag)
}

int
utimensat(int fd, const char *path, const struct timespec *ts, int flag)
utimensat(int fd, const char *path, const struct timespec ts[2], int flag)
{
errno = ENOSYS;
return -1;
Expand All @@ -257,7 +257,7 @@ ftruncate(int fd, off_t length)
#endif

int
futimens(int fd, const struct timespec *times)
futimens(int fd, const struct timespec times[2])
{
errno = ENOSYS;
return -1;
Expand All @@ -268,4 +268,4 @@ nanosleep(const struct timespec *req, struct timespec *rem)
{
errno = ENOSYS;
return -1;
}
}
6 changes: 6 additions & 0 deletions core/shared/platform/esp-idf/platform_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ typedef unsigned int korp_sem;
#define DT_LNK DTYPE_LINK
#define DT_SOCK DTYPE_SOCK

static inline int
os_getpagesize()
{
return 4096;
}

typedef int os_file_handle;
typedef DIR *os_dir_stream;
typedef int os_raw_file_handle;
Expand Down

0 comments on commit 5e2011c

Please sign in to comment.