This commit is contained in:
Volodymyr Shymanskyy
2020-03-09 22:22:12 +02:00
parent 9d389ff863
commit 418d287e91
5 changed files with 27 additions and 28 deletions
+1 -1
View File
@@ -10,7 +10,7 @@
#include "m3_core.h"
d_m3BeginExternC
d_m3BeginExternC
M3Result m3_LinkLibC (IM3Module io_module);
M3Result m3_LinkSpecTest (IM3Module io_module);
+5 -9
View File
@@ -302,13 +302,9 @@ m3ApiRawFunction(m3_wasi_unstable_poll_oneoff)
m3ApiRawFunction(m3_wasi_unstable_proc_exit)
{
m3ApiReturnType (uint32_t)
m3ApiGetArg (uint32_t, code)
// TODO: in repl mode, trap and bail out
if (code) {
fprintf(stderr, M3_ARCH "-wasi: exit(%d)\n", code);
}
runtime->exit_code = code;
m3ApiTrap(m3Err_trapExit);
}
@@ -338,24 +334,24 @@ _ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "environ_get",
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "fd_prestat_dir_name", "i(i*i)", &m3_wasi_unstable_fd_prestat_dir_name)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "fd_prestat_get", "i(i*)", &m3_wasi_unstable_fd_prestat_get)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "path_open", "i(ii*iiiii*)", &m3_wasi_unstable_path_open)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "path_open", "i(ii*iiIIi*)", &m3_wasi_unstable_path_open)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "path_filestat_get", "i(ii*i*)", &m3_wasi_unstable_path_filestat_get)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "fd_fdstat_get", "i(i*)", &m3_wasi_unstable_fd_fdstat_get)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "fd_fdstat_set_flags", "i(ii)", &m3_wasi_unstable_fd_fdstat_set_flags)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "fd_write", "i(iii*)", &m3_wasi_unstable_fd_write)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "fd_read", "i(iii*)", &m3_wasi_unstable_fd_read)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "fd_seek", "i(iii*)", &m3_wasi_unstable_fd_seek)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "fd_seek", "i(iIi*)", &m3_wasi_unstable_fd_seek)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "fd_datasync", "i(i)", &m3_wasi_unstable_fd_datasync)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "fd_close", "i(i)", &m3_wasi_unstable_fd_close)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "random_get", "i(*i)", &m3_wasi_unstable_random_get)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "clock_res_get", "i(i*)", &m3_wasi_unstable_clock_res_get)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "clock_time_get", "i(ii*)", &m3_wasi_unstable_clock_time_get)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "clock_time_get", "i(iI*)", &m3_wasi_unstable_clock_time_get)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "poll_oneoff", "i(**i*)", &m3_wasi_unstable_poll_oneoff)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "proc_exit", "i(i)", &m3_wasi_unstable_proc_exit)));
_ (SuppressLookupFailure (m3_LinkRawFunction (module, wasi, "proc_exit", "v(i)", &m3_wasi_unstable_proc_exit)));
_catch:
return result;
+3
View File
@@ -10,8 +10,11 @@
#include "m3_env.h"
d_m3BeginExternC
u8 ConvertTypeCharToTypeId (char i_code);
M3Result SignatureToFuncType (IM3FuncType * o_functionType, ccstr_t i_signature);
d_m3EndExternC
#endif /* m3_bind_h */
+1 -1
View File
@@ -10,7 +10,7 @@
#include "m3_compile.h"
d_m3BeginExternC
d_m3BeginExternC
M3Result BridgeToNewPageIfNecessary (IM3Compilation o);
M3Result EnsureCodePageNumLines (IM3Compilation o, u32 i_numLines);
+17 -17
View File
@@ -335,30 +335,30 @@ void dump_type_stack (IM3Compilation o)
{
printf (" %s", c_waCompactTypes [o->typeStack [i]]);
u16 slot = o->wasmStack [i];
u16 slot = o->wasmStack [i];
if (IsRegisterLocation (slot))
{
bool isFp = IsFpRegisterLocation (slot);
printf ("%s", isFp ? "f0" : "r0");
if (IsRegisterLocation (slot))
{
bool isFp = IsFpRegisterLocation (slot);
printf ("%s", isFp ? "f0" : "r0");
regAllocated [isFp]--;
}
else
{
regAllocated [isFp]--;
}
else
{
if (slot < o->firstDynamicSlotIndex)
{
if (slot >= o->firstConstSlotIndex)
printf ("c");
{
if (slot >= o->firstConstSlotIndex)
printf ("c");
else if (slot >= o->function->numArgSlots)
printf ("L");
else
printf ("a");
}
printf ("%d", (i32) slot); // slot
else
printf ("a");
}
printf ("%d", (i32) slot); // slot
}
printf (" ");
}