Max/nunuhara_xsystem4
1
0
Fork 0
mirror of https://github.com/nunuhara/xsystem4.git synced 2026-10-02 20:08:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

debugger_dap: Respect frameId in evaluate requests

Browse Source 
The DAP 'evaluate' request handler now correctly uses the 'frameId'
argument to set the evaluation context.

This also fixes incorrect evaluation of expressions containing non-ASCII
characters.
This commit is contained in:
kichikuou
2025-09-11 12:29:32 +09:00
parent 2c771acfe6
commit af70ee09de
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/debugger_dap.c
+14 -2
View File
@@ -624,10 +624,22 @@ static void cmd_evaluate(cJSON *args, cJSON *resp)
return;
}
// TODO: frameId
unsigned old_frame = dbg_current_frame;
cJSON *j_id = cJSON_GetObjectItemCaseSensitive(args, "frameId");
if (j_id && cJSON_IsNumber(j_id)) {
int frame_id = j_id->valueint;
if (frame_id >= 0 && frame_id < call_stack_ptr) {
dbg_current_frame = call_stack_ptr - 1 - frame_id;
}
}
struct ain_type type;
union vm_value val = dbg_eval_string(j_expr->valuestring, &type);
char *sjis_expr = utf2sjis(j_expr->valuestring, 0);
union vm_value val = dbg_eval_string(sjis_expr, &type);
free(sjis_expr);
dbg_current_frame = old_frame;
struct string *s_val = dbg_value_to_string(&type, val, 0);
char *s_type = ain_strtype_d(ain, &type);