gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-07-16 17:28:31 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Refine the format of call stack dump (#2996)

Browse Source 
For interpreter, jit and aot, the format is like:
```
#00: 0x1330 - __main_argc_argv
#01: 0x4195 - __main_void
#02: 0x11dc - _start
```
For fast-jit and multi-tier jit, the format is like:
```
#00 __main_argc_argv
#01 __main_void
#02 _start
```
Since fast-jit hasn't supported commit ip to stack frame now.
This commit is contained in:
Wenyong Huang 2024-01-11 14:27:28 +08:00 committed by GitHub
parent ad57ffbec8
commit e7bbf88a1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/iwasm/aot/aot_runtime.c
View File

@ -3824,13 +3824,13 @@ aot_dump_call_stack(WASMExecEnv *exec_env, bool print, char *buf, uint32 len)
/* function name not exported, print number instead */
if (frame.func_name_wp == NULL) {
line_length = snprintf(line_buf, sizeof(line_buf),
"#%02" PRIu32 " $f%" PRIu32 " (0x%04x)\n", n,
frame.func_index, frame.func_offset);
"#%02" PRIu32 ": 0x%04x - $f%" PRIu32 "\n",
n, frame.func_offset, frame.func_index);
}
else {
line_length = snprintf(line_buf, sizeof(line_buf),
"#%02" PRIu32 " %s (0x%04x)\n", n,
frame.func_name_wp, frame.func_offset);
"#%02" PRIu32 ": 0x%04x - %s\n", n,
frame.func_offset, frame.func_name_wp);
}
if (line_length >= sizeof(line_buf)) {

18
core/iwasm/interpreter/wasm_runtime.c
View File

@ -3601,7 +3601,11 @@ wasm_interp_create_call_stack(struct WASMExecEnv *exec_env)
frame.func_offset = 0;
}
else {
#if WASM_ENABLE_FAST_INTERP == 0
frame.func_offset = (uint32)(cur_frame->ip - module->load_addr);
#else
frame.func_offset = (uint32)(cur_frame->ip - func_code_base);
#endif
}
/* look for the function name */
@ -3733,12 +3737,11 @@ wasm_interp_dump_call_stack(struct WASMExecEnv *exec_env, bool print, char *buf,
return 0;
}
/* function name not exported, print number instead */
#if WASM_ENABLE_FAST_JIT != 0
/* Fast JIT doesn't support committing ip (instruction pointer) yet */
if (module_inst->e->running_mode == Mode_Fast_JIT
|| module_inst->e->running_mode == Mode_Multi_Tier_JIT) {
/* Fast JIT doesn't support committing ip (instruction
pointer) yet */
/* function name not exported, print number instead */
if (frame.func_name_wp == NULL) {
line_length = snprintf(line_buf, sizeof(line_buf),
"#%02" PRIu32 " $f%" PRIu32 "\n", n,
@ -3753,16 +3756,17 @@ wasm_interp_dump_call_stack(struct WASMExecEnv *exec_env, bool print, char *buf,
else
#endif
{
/* function name not exported, print number instead */
if (frame.func_name_wp == NULL) {
line_length =
snprintf(line_buf, sizeof(line_buf),
"#%02" PRIu32 " $f%" PRIu32 " (0x%04x)\n", n,
frame.func_index, frame.func_offset);
"#%02" PRIu32 ": 0x%04x - $f%" PRIu32 "\n", n,
frame.func_offset, frame.func_index);
}
else {
line_length = snprintf(line_buf, sizeof(line_buf),
"#%02" PRIu32 " %s (0x%04x)\n", n,
frame.func_name_wp, frame.func_offset);
"#%02" PRIu32 ": 0x%04x - %s\n", n,
frame.func_offset, frame.func_name_wp);
}
}