1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[wasm] Fix unreachable error during printing setjmp trace message

Browse Source
This commit is contained in:
Yuta Saito 2023-05-14 03:59:39 +00:00
parent b632566f7e
commit edca57e6e3
Notes: git 2023-05-14 05:17:57 +00:00 
Merged: https://github.com/ruby/ruby/pull/7808
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
wasm/setjmp.c
View File

@ -29,10 +29,25 @@
#include "wasm/setjmp.h" #include "wasm/setjmp.h"
#ifdef RB_WASM_ENABLE_DEBUG_LOG #ifdef RB_WASM_ENABLE_DEBUG_LOG
# include <stdio.h> # include <wasi/api.h>
# define RB_WASM_DEBUG_LOG(...) fprintf(stderr, __VA_ARGS__) # include <unistd.h>
// NOTE: We can't use printf() and most of library function that are
// Asyncified due to the use of them in the application itself.
// Use of printf() causes "unreachable" error because Asyncified
// function misunderstands Asyncify's internal state during
// start_unwind()...stop_unwind() and start_rewind()...stop_rewind().
# define RB_WASM_DEBUG_LOG_INTERNAL(msg) do { \
const uint8_t *msg_start = (uint8_t *)msg; \
const uint8_t *msg_end = msg_start; \
for (; *msg_end != '\0'; msg_end++) {} \
__wasi_ciovec_t iov = {.buf = msg_start, .buf_len = msg_end - msg_start}; \
size_t nwritten; \
__wasi_fd_write(STDERR_FILENO, &iov, 1, &nwritten); \
} while (0)
# define RB_WASM_DEBUG_LOG(msg) \
RB_WASM_DEBUG_LOG_INTERNAL(__FILE__ ":" STRINGIZE(__LINE__) ": " msg "\n")
#else #else
# define RB_WASM_DEBUG_LOG(...) # define RB_WASM_DEBUG_LOG(msg)
#endif #endif
enum rb_wasm_jmp_buf_state { enum rb_wasm_jmp_buf_state {
@ -63,10 +78,10 @@ __attribute__((noinline))
int int
_rb_wasm_setjmp_internal(rb_wasm_jmp_buf *env) _rb_wasm_setjmp_internal(rb_wasm_jmp_buf *env)
{ {
RB_WASM_DEBUG_LOG("[%s] env = %p, env->state = %d, _rb_wasm_active_jmpbuf = %p\n", __func__, env, env->state, _rb_wasm_active_jmpbuf); RB_WASM_DEBUG_LOG("enter _rb_wasm_setjmp_internal");
switch (env->state) { switch (env->state) {
case JMP_BUF_STATE_INITIALIZED: { case JMP_BUF_STATE_INITIALIZED: {
RB_WASM_DEBUG_LOG("[%s] JMP_BUF_STATE_INITIALIZED\n", __func__); RB_WASM_DEBUG_LOG(" JMP_BUF_STATE_INITIALIZED");
env->state = JMP_BUF_STATE_CAPTURING; env->state = JMP_BUF_STATE_CAPTURING;
env->payload = 0; env->payload = 0;
_rb_wasm_active_jmpbuf = env; _rb_wasm_active_jmpbuf = env;
@ -76,14 +91,14 @@ _rb_wasm_setjmp_internal(rb_wasm_jmp_buf *env)
} }
case JMP_BUF_STATE_CAPTURING: { case JMP_BUF_STATE_CAPTURING: {
asyncify_stop_rewind(); asyncify_stop_rewind();
RB_WASM_DEBUG_LOG("[%s] JMP_BUF_STATE_CAPTURING\n", __func__); RB_WASM_DEBUG_LOG(" JMP_BUF_STATE_CAPTURING");
env->state = JMP_BUF_STATE_CAPTURED; env->state = JMP_BUF_STATE_CAPTURED;
_rb_wasm_active_jmpbuf = NULL; _rb_wasm_active_jmpbuf = NULL;
return 0; return 0;
} }
case JMP_BUF_STATE_RETURNING: { case JMP_BUF_STATE_RETURNING: {
asyncify_stop_rewind(); asyncify_stop_rewind();
RB_WASM_DEBUG_LOG("[%s] JMP_BUF_STATE_RETURNING\n", __func__); RB_WASM_DEBUG_LOG(" JMP_BUF_STATE_RETURNING");
env->state = JMP_BUF_STATE_CAPTURED; env->state = JMP_BUF_STATE_CAPTURED;
_rb_wasm_active_jmpbuf = NULL; _rb_wasm_active_jmpbuf = NULL;
return env->payload; return env->payload;
@ -97,7 +112,7 @@ _rb_wasm_setjmp_internal(rb_wasm_jmp_buf *env)
void void
_rb_wasm_longjmp(rb_wasm_jmp_buf* env, int value) _rb_wasm_longjmp(rb_wasm_jmp_buf* env, int value)
{ {
RB_WASM_DEBUG_LOG("[%s] env = %p, env->state = %d, value = %d\n", __func__, env, env->state, value); RB_WASM_DEBUG_LOG("enter _rb_wasm_longjmp");
assert(env->state == JMP_BUF_STATE_CAPTURED); assert(env->state == JMP_BUF_STATE_CAPTURED);
assert(value != 0); assert(value != 0);
env->state = JMP_BUF_STATE_RETURNING; env->state = JMP_BUF_STATE_RETURNING;
@ -179,20 +194,20 @@ rb_wasm_try_catch_loop_run(struct rb_wasm_try_catch *try_catch, rb_wasm_jmp_buf
void * void *
rb_wasm_handle_jmp_unwind(void) rb_wasm_handle_jmp_unwind(void)
{ {
RB_WASM_DEBUG_LOG("[%s] _rb_wasm_active_jmpbuf = %p\n", __func__, _rb_wasm_active_jmpbuf); RB_WASM_DEBUG_LOG("enter rb_wasm_handle_jmp_unwind");
if (!_rb_wasm_active_jmpbuf) { if (!_rb_wasm_active_jmpbuf) {
return NULL; return NULL;
} }
switch (_rb_wasm_active_jmpbuf->state) { switch (_rb_wasm_active_jmpbuf->state) {
case JMP_BUF_STATE_CAPTURING: { case JMP_BUF_STATE_CAPTURING: {
RB_WASM_DEBUG_LOG("[%s] JMP_BUF_STATE_CAPTURING\n", __func__); RB_WASM_DEBUG_LOG(" JMP_BUF_STATE_CAPTURING");
// save the captured Asyncify stack top // save the captured Asyncify stack top
_rb_wasm_active_jmpbuf->dst_buf_top = _rb_wasm_active_jmpbuf->setjmp_buf.top; _rb_wasm_active_jmpbuf->dst_buf_top = _rb_wasm_active_jmpbuf->setjmp_buf.top;
break; break;
} }
case JMP_BUF_STATE_RETURNING: { case JMP_BUF_STATE_RETURNING: {
RB_WASM_DEBUG_LOG("[%s] JMP_BUF_STATE_RETURNING\n", __func__); RB_WASM_DEBUG_LOG(" JMP_BUF_STATE_RETURNING");
// restore the saved Asyncify stack top // restore the saved Asyncify stack top
_rb_wasm_active_jmpbuf->setjmp_buf.top = _rb_wasm_active_jmpbuf->dst_buf_top; _rb_wasm_active_jmpbuf->setjmp_buf.top = _rb_wasm_active_jmpbuf->dst_buf_top;
break; break;