Skip to content

Fix some warings and enable -Werror for NuttX #1756

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

Merged
merged 9 commits into from
Nov 28, 2022
Merged

Fix some warings and enable -Werror for NuttX #1756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
34d2bd0
Fix some waring and enable Werror for NuttX
no1wudi Nov 26, 2022
4bdb9e2
Fix warning in bh_log.c
no1wudi Nov 26, 2022
c6cf7aa
Fix warning in wasm_interp_classic.c
no1wudi Nov 26, 2022
7d241ea
Fix code style
no1wudi Nov 26, 2022
8844796
Fix code style
no1wudi Nov 26, 2022
d7f72f1
Fix warning in wasm_native
no1wudi Nov 26, 2022
7020dc5
Change nuttx board to avoid warning from nuttx
no1wudi Nov 26, 2022
3a0262a
Change board
no1wudi Nov 26, 2022
a242fab
Change board
no1wudi Nov 26, 2022
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
6 changes: 1 addition & 5 deletions .github/workflows/compilation_on_nuttx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,8 @@ jobs:
"boards/sim/sim/sim/configs/nsh",
# cortex-m0
"boards/arm/rp2040/raspberrypi-pico/configs/nsh",
# cortex-m4
"boards/arm/stm32/stm32f4discovery/configs/nsh",
# cortex-m7
"boards/arm/stm32h7/nucleo-h743zi/configs/nsh",
# cortex-a9
"boards/arm/imx6/sabre-6quad/configs/nsh",
# riscv32imac
"boards/risc-v/qemu-rv/rv-virt/configs/nsh",
# riscv64imac
Expand Down Expand Up @@ -123,4 +119,4 @@ jobs:
run: |
cd nuttx
tools/configure.sh ${{ matrix.nuttx_board_config }}
make -j$(nproc)
make -j$(nproc) EXTRAFLAGS=-Werror
2 changes: 1 addition & 1 deletion core/iwasm/common/wasm_application.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ execute_func(WASMModuleInstanceCommon *module_inst, const char *name,
case VALUE_TYPE_FUNCREF:
{
if (argv1[k] != NULL_REF)
os_printf("%u:ref.func", argv1[k]);
os_printf("%" PRIu32 ":ref.func", argv1[k]);
else
os_printf("func:ref.null");
k++;
Expand Down
10 changes: 10 additions & 0 deletions core/iwasm/common/wasm_native.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,13 @@ wasm_native_unregister_natives(const char *module_name,
bool
wasm_native_init()
{
#if WASM_ENABLE_SPEC_TEST != 0 || WASM_ENABLE_LIBC_BUILTIN != 0 \
|| WASM_ENABLE_BASE_LIB != 0 || WASM_ENABLE_LIBC_EMCC != 0 \
|| WASM_ENABLE_LIB_RATS != 0 || WASM_ENABLE_WASI_NN != 0 \
|| WASM_ENABLE_APP_FRAMEWORK != 0
NativeSymbol *native_symbols;
uint32 n_native_symbols;
#endif

#if WASM_ENABLE_LIBC_BUILTIN != 0
n_native_symbols = get_libc_builtin_export_apis(&native_symbols);
Expand Down Expand Up @@ -456,9 +461,14 @@ wasm_native_init()
#endif

return true;
#if WASM_ENABLE_SPEC_TEST != 0 || WASM_ENABLE_LIBC_BUILTIN != 0 \
|| WASM_ENABLE_BASE_LIB != 0 || WASM_ENABLE_LIBC_EMCC != 0 \
|| WASM_ENABLE_LIB_RATS != 0 || WASM_ENABLE_WASI_NN != 0 \
|| WASM_ENABLE_APP_FRAMEWORK != 0
fail:
wasm_native_destroy();
return false;
#endif
}

void
Expand Down
5 changes: 3 additions & 2 deletions core/iwasm/interpreter/wasm_interp_classic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4094,8 +4094,9 @@ wasm_interp_call_wasm(WASMModuleInstance *module_inst, WASMExecEnv *exec_env,
if (argc < function->param_cell_num) {
char buf[128];
snprintf(buf, sizeof(buf),
"invalid argument count %u, must be no smaller than %u", argc,
function->param_cell_num);
"invalid argument count %" PRIu32
", must be no smaller than %u",
argc, function->param_cell_num);
wasm_set_exception(module_inst, buf);
return;
}
Expand Down
4 changes: 2 additions & 2 deletions core/iwasm/libraries/libc-builtin/libc_builtin_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,13 +952,13 @@ print_wrapper(wasm_exec_env_t exec_env)
static void
print_i32_wrapper(wasm_exec_env_t exec_env, int32 i32)
{
os_printf("in specttest.print_i32(%d)\n", i32);
os_printf("in specttest.print_i32(%" PRId32 ")\n", i32);
}

static void
print_i32_f32_wrapper(wasm_exec_env_t exec_env, int32 i32, float f32)
{
os_printf("in specttest.print_i32_f32(%d, %f)\n", i32, f32);
os_printf("in specttest.print_i32_f32(%" PRId32 ", %f)\n", i32, f32);
}

static void
Expand Down
2 changes: 1 addition & 1 deletion core/shared/utils/bh_log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,6 @@ void
bh_log_proc_mem(const char *function, uint32 line)
{
char prompt[128] = { 0 };
snprintf(prompt, sizeof(prompt), "[MEM] %s(...) L%u", function, line);
snprintf(prompt, sizeof(prompt), "[MEM] %s(...) L%" PRIu32, function, line);
return bh_print_proc_mem(prompt);
}
4 changes: 2 additions & 2 deletions product-mini/platforms/posix/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ print_help()
}
/* clang-format on */

static void *
static const void *
app_instance_main(wasm_module_inst_t module_inst)
{
const char *exception;
Expand All @@ -89,7 +89,7 @@ app_instance_main(wasm_module_inst_t module_inst)
return exception;
}

static void *
static const void *
app_instance_func(wasm_module_inst_t module_inst, const char *func_name)
{
wasm_application_execute_func(module_inst, func_name, app_argc - 1,
Expand Down