teknomunk
/
wasm3
forked from Mirrors/wasm3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/wasm3/wasm3

Browse Source
opam-2.0.0
Vova 3 years ago
parent e247a4b4a4 1d3cd80afa
commit 5deaf9306f
3 changed files with 63 additions and 23 deletions
Show Stats Download Patch File Download Diff File

11
source/m3_api_uvwasi.c
Unescape View File

@ -17,8 +17,6 @@
#include <stdio.h>
#include <string.h>
#include "uvwasi.h"
#ifndef d_m3EnableWasiTracing
# define d_m3EnableWasiTracing 0
#endif
@ -1026,8 +1024,6 @@ m3_wasi_context_t* m3_GetWasiContext()
M3Result m3_LinkWASI (IM3Module module)
{
M3Result result = m3Err_none;
#define ENV_COUNT 9
char* env[ENV_COUNT];
@ -1056,6 +1052,13 @@ M3Result m3_LinkWASI (IM3Module module)
init_options.preopenc = PREOPENS_COUNT;
init_options.preopens = preopens;
return m3_LinkWASIWithOptions(module, init_options);
}
M3Result m3_LinkWASIWithOptions (IM3Module module, uvwasi_options_t init_options)
{
M3Result result = m3Err_none;
if (!wasi_context) {
wasi_context = (m3_wasi_context_t*)malloc(sizeof(m3_wasi_context_t));
wasi_context->exit_code = 0;

12
source/m3_api_wasi.h
Unescape View File

@ -10,6 +10,10 @@
#include "m3_core.h"
#if defined(d_m3HasUVWASI)
#include "uvwasi.h"
#endif
d_m3BeginExternC
typedef struct m3_wasi_context_t
@ -19,7 +23,13 @@ typedef struct m3_wasi_context_t
ccstr_t * argv;
} m3_wasi_context_t;
M3Result m3_LinkWASI (IM3Module io_module);
M3Result m3_LinkWASI (IM3Module io_module);
#if defined(d_m3HasUVWASI)
M3Result m3_LinkWASIWithOptions (IM3Module io_module, uvwasi_options_t uvwasiOptions);
#endif
m3_wasi_context_t* m3_GetWasiContext();

63
source/m3_env.c
Unescape View File

@ -543,6 +543,7 @@ M3Result m3_RunStart (IM3Module io_module)
#endif
M3Result result = m3Err_none;
i32 startFunctionTmp = -1;
if (io_module and io_module->startFunction >= 0)
{
@ -560,9 +561,17 @@ _ (CompileFunction (function));
IM3Module module = function->module;
IM3Runtime runtime = module->runtime;
_ ((M3Result) Call (function->compiled, (m3stack_t) runtime->stack, runtime->memory.mallocated, d_m3OpDefaultArgs));
startFunctionTmp = io_module->startFunction;
io_module->startFunction = -1;
result = (M3Result) Call (function->compiled, (m3stack_t) runtime->stack, runtime->memory.mallocated, d_m3OpDefaultArgs);
if (result)
{
io_module->startFunction = startFunctionTmp;
EXCEPTION_PRINT(result);
goto _catch;
}
}
_catch: return result;
@ -716,12 +725,6 @@ M3Result m3_FindFunction (IM3Function * o_function, IM3Runtime i_runtime, cons
{
_ (CompileFunction (function))
}
// Check if start function needs to be called
if (function->module->startFunction)
{
_ (m3_RunStart (function->module))
}
}
else _throw (ErrorModule (m3Err_functionLookupFailed, i_runtime->modules, "'%s'", i_functionName));
@ -734,6 +737,19 @@ _ (m3_RunStart (function->module))
return result;
}
static
M3Result checkStartFunction(IM3Module i_module)
{
M3Result result = m3Err_none; d_m3Assert(i_module);
// Check if start function needs to be called
if (i_module->startFunction >= 0)
{
result = m3_RunStart (i_module);
}
return result;
}
uint32_t m3_GetArgCount (IM3Function i_function)
{
@ -815,6 +831,7 @@ M3Result m3_CallVL (IM3Function i_function, va_list i_args)
{
IM3Runtime runtime = i_function->module->runtime;
IM3FuncType ftype = i_function->funcType;
M3Result result = m3Err_none;
if (!i_function->compiled) {
return m3Err_missingCompiledCode;
@ -839,18 +856,22 @@ M3Result m3_CallVL (IM3Function i_function, va_list i_args)
}
}
m3StackCheckInit();
M3Result r = (M3Result) Call (i_function->compiled, (m3stack_t)(runtime->stack), runtime->memory.mallocated, d_m3OpDefaultArgs);
_ (checkStartFunction(i_function->module))
result = (M3Result) Call (i_function->compiled, (m3stack_t)(runtime->stack), runtime->memory.mallocated, d_m3OpDefaultArgs);
ReportNativeStackUsage ();
runtime->lastCalled = r ? NULL : i_function;
runtime->lastCalled = result ? NULL : i_function;
return r;
_catch: return result;
}
M3Result m3_Call (IM3Function i_function, uint32_t i_argc, const void * i_argptrs[])
{
IM3Runtime runtime = i_function->module->runtime;
IM3FuncType ftype = i_function->funcType;
M3Result result = m3Err_none;
if (i_argc != ftype->numArgs) {
return m3Err_argumentCountMismatch;
@ -879,19 +900,22 @@ M3Result m3_Call (IM3Function i_function, uint32_t i_argc, const void * i_argp
}
m3StackCheckInit();
M3Result r = (M3Result) Call (i_function->compiled, (m3stack_t)(runtime->stack), runtime->memory.mallocated, d_m3OpDefaultArgs);
ReportNativeStackUsage ();
runtime->lastCalled = r ? NULL : i_function;
_ (checkStartFunction(i_function->module))
result = (M3Result) Call (i_function->compiled, (m3stack_t)(runtime->stack), runtime->memory.mallocated, d_m3OpDefaultArgs);
ReportNativeStackUsage ();
runtime->lastCalled = result ? NULL : i_function;
return r;
_catch: return result;
}
M3Result m3_CallArgv (IM3Function i_function, uint32_t i_argc, const char * i_argv[])
{
IM3FuncType ftype = i_function->funcType;
IM3Runtime runtime = i_function->module->runtime;
M3Result result = m3Err_none;
if (i_argc != ftype->numArgs) {
return m3Err_argumentCountMismatch;
@ -920,12 +944,15 @@ M3Result m3_CallArgv (IM3Function i_function, uint32_t i_argc, const char * i_
}
m3StackCheckInit();
M3Result r = (M3Result) Call (i_function->compiled, (m3stack_t)(runtime->stack), runtime->memory.mallocated, d_m3OpDefaultArgs);
_ (checkStartFunction(i_function->module))
result = (M3Result) Call (i_function->compiled, (m3stack_t)(runtime->stack), runtime->memory.mallocated, d_m3OpDefaultArgs);
ReportNativeStackUsage ();
runtime->lastCalled = r ? NULL : i_function;
runtime->lastCalled = result ? NULL : i_function;
return r;
_catch: return result;
}

Write Preview
Loading…
Cancel
Save