hmn
/
orca
5
Fork 2
Code Issues 21 Pull Requests 1 Packages Projects Releases Wiki Activity

valid handle bugfix

This commit is contained in:
Reuben Dunnington 2023-08-09 20:30:41 -07:00
parent f922473ada
commit d5ab09366d
Signed by: rdunnington
GPG Key ID: 4EC5290E704FD482
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.c
View File

@ -380,7 +380,6 @@ i32 orca_runloop(void* user)
} }
// TODO [ReubenD] - allow specifying stack size // TODO [ReubenD] - allow specifying stack size
// TODO [ReubenD] - allow overriding wasm memory alloc/resize/free
// u32 stackSize = 65536; // u32 stackSize = 65536;
// app->runtime.m3Env = m3_NewEnvironment(); // app->runtime.m3Env = m3_NewEnvironment();
@ -445,22 +444,19 @@ i32 orca_runloop(void* user)
bb_import_package_deinit(module_imports); // safe to deinit this now that the module has been instantiated bb_import_package_deinit(module_imports); // safe to deinit this now that the module has been instantiated
// TODO up next: expose a cached handle to functions to invoke instead of a string search
//NOTE: Find and type check event handlers. //NOTE: Find and type check event handlers.
for(int i=0; i<G_EXPORT_COUNT; i++) for(int i=0; i<G_EXPORT_COUNT; i++)
{ {
const g_export_desc* desc = &G_EXPORT_DESC[i]; const g_export_desc* desc = &G_EXPORT_DESC[i];
bb_func_handle handler; const bb_error find_func_err = bb_module_instance_find_func(app->runtime.bbModuleInst, desc->name.ptr, &app->runtime.exports[i]);
const bb_error find_func_err = bb_module_instance_find_func(app->runtime.bbModuleInst, desc->name.ptr, &handler);
// IM3Function handler = 0; // IM3Function handler = 0;
// m3_FindFunction(&handler, app->runtime.m3Runtime, desc->name.ptr); // m3_FindFunction(&handler, app->runtime.m3Runtime, desc->name.ptr);
if(find_func_err == BB_ERROR_OK) if(find_func_err == BB_ERROR_OK)
{ {
//NOTE: check function signature //NOTE: check function signature
bb_func_info func_info = bb_module_instance_func_info(app->runtime.bbModuleInst, handler); bb_func_info func_info = bb_module_instance_func_info(app->runtime.bbModuleInst, app->runtime.exports[i]);
bool checked = func_info.num_returns == desc->retTags.len && func_info.num_params == desc->argTags.len; bool checked = func_info.num_returns == desc->retTags.len && func_info.num_params == desc->argTags.len;
@ -514,11 +510,7 @@ i32 orca_runloop(void* user)
// } // }
// } // }
if(checked) if(bb_func_handle_isvalid(app->runtime.exports[i]) == false)
{
app->runtime.exports[i] = handler;
}
else
{ {
log_error("type mismatch for event handler %.*s\n", (int)desc->name.len, desc->name.ptr); log_error("type mismatch for event handler %.*s\n", (int)desc->name.len, desc->name.ptr);
} }