mirror of
https://github.com/Ed94/raddebugger.git
synced 2026-08-05 13:28:40 +00:00
correctly apply path maps in engine; correctly set disasm mode in source/disasm views
This commit is contained in:
@@ -129,7 +129,7 @@ d_possible_path_overrides_from_maps_path(Arena *arena, D_PathMapArray *path_maps
|
|||||||
}
|
}
|
||||||
StringJoin join = {0};
|
StringJoin join = {0};
|
||||||
join.sep = str8_lit("/");
|
join.sep = str8_lit("/");
|
||||||
String8 candidate_path = str8_list_join(arena, &candidate_parts, 0);
|
String8 candidate_path = str8_list_join(arena, &candidate_parts, &join);
|
||||||
str8_list_push(arena, &result, candidate_path);
|
str8_list_push(arena, &result, candidate_path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6072,6 +6072,7 @@ RD_VIEW_RULE_UI_FUNCTION_DEF(text)
|
|||||||
String8 path = rd_file_path_from_eval_string(rd_frame_arena(), string);
|
String8 path = rd_file_path_from_eval_string(rd_frame_arena(), string);
|
||||||
rd_regs()->file_path = path;
|
rd_regs()->file_path = path;
|
||||||
rd_regs()->vaddr = 0;
|
rd_regs()->vaddr = 0;
|
||||||
|
rd_regs()->prefer_disasm = 0;
|
||||||
rd_regs()->cursor.line = rd_value_from_params_key(params, str8_lit("cursor_line")).s64;
|
rd_regs()->cursor.line = rd_value_from_params_key(params, str8_lit("cursor_line")).s64;
|
||||||
rd_regs()->cursor.column = rd_value_from_params_key(params, str8_lit("cursor_column")).s64;
|
rd_regs()->cursor.column = rd_value_from_params_key(params, str8_lit("cursor_column")).s64;
|
||||||
rd_regs()->mark.line = rd_value_from_params_key(params, str8_lit("mark_line")).s64;
|
rd_regs()->mark.line = rd_value_from_params_key(params, str8_lit("mark_line")).s64;
|
||||||
@@ -6421,6 +6422,7 @@ RD_VIEW_RULE_UI_FUNCTION_DEF(disasm)
|
|||||||
if(!is_loading && has_disasm)
|
if(!is_loading && has_disasm)
|
||||||
{
|
{
|
||||||
U64 off = dasm_line_array_code_off_from_idx(&dasm_info.lines, rd_regs()->cursor.line-1);
|
U64 off = dasm_line_array_code_off_from_idx(&dasm_info.lines, rd_regs()->cursor.line-1);
|
||||||
|
rd_regs()->prefer_disasm = 1;
|
||||||
rd_regs()->vaddr = range.min+off;
|
rd_regs()->vaddr = range.min+off;
|
||||||
rd_regs()->vaddr_range = r1u64(range.min+off, range.min+off);
|
rd_regs()->vaddr_range = r1u64(range.min+off, range.min+off);
|
||||||
rd_regs()->voff_range = ctrl_voff_range_from_vaddr_range(dasm_module, rd_regs()->vaddr_range);
|
rd_regs()->voff_range = ctrl_voff_range_from_vaddr_range(dasm_module, rd_regs()->vaddr_range);
|
||||||
|
|||||||
Reference in New Issue
Block a user