adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

llext: hotfix: fix function pointer logging

Browse source 
Some function pointers were being passed via `%p` to LOG_DBG, and this
was causing the following issues in SOF CI with the `sparse` checker:

   subsys/llext/llext.c: error: arithmetics on pointers to functions
   subsys/llext/llext.c: error: incompatible types for operation (+)

This patch fixes the issue by casting the function pointers to void*.
Also fix a misleading error message in `llext_get_fn_table()`.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
This commit is contained in:
Luca Burelli 2024-09-11 09:23:28 +02:00 committed by Anas Nashif
parent 884a4e5a35
commit e6b32ab681
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subsys/llext/llext.c
View file

@ -297,7 +297,7 @@ static int call_fn_table(struct llext *ext, bool is_init)
for (int i = 0; i < fn_count; i++) {
LOG_DBG("calling %s function %p()",
is_init ? "bringup" : "teardown", fn_table[i]);
is_init ? "bringup" : "teardown", (void *)fn_table[i]);
fn_table[i]();
}
@ -326,7 +326,7 @@ void llext_bootstrap(struct llext *ext, llext_entry_fn_t entry_fn, void *user_da
}
/* Start extension main function */
LOG_DBG("calling entry function %p(%p)", entry_fn, user_data);
LOG_DBG("calling entry function %p(%p)", (void *)entry_fn, user_data);
entry_fn(user_data);
/* Call de-initialization functions */

3
subsys/llext/llext_handlers.c
View file

@ -60,7 +60,8 @@ ssize_t z_impl_llext_get_fn_table(struct llext *ext, bool is_init, void *buf, si
for (int i = 0; i < table_size / sizeof(void *); i++) {
if (fn_ptrs[i] < text_start || fn_ptrs[i] >= text_end) {
LOG_ERR("init function %i (%p) outside text region",
LOG_ERR("%s function %i (%p) outside text region",
is_init ? "bringup" : "teardown",
i, fn_ptrs[i]);
return -EFAULT;
}