ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-06-20 19:04:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

work on multi-topology watch tables; fancy evaluation for cfgs, regardless of where they are spawned

Browse Source
This commit is contained in:
Ryan Fleury
2025-02-11 13:30:07 -08:00
parent 1162841b6e
commit ee984877b0
4 changed files with 94 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eval/eval_interpret.c
+5 -1
View File
@@ -58,7 +58,11 @@ e_interpret(String8 bytecode)
U64 stack_cap = 128; // TODO(rjf): scan bytecode; determine maximum stack depth
E_Value *stack = push_array_no_zero(scratch.arena, E_Value, stack_cap);
U64 stack_count = 0;
E_Space selected_space = e_interpret_ctx->primary_space;
E_Space selected_space = {0};
if(bytecode.size != 0)
{
selected_space = e_interpret_ctx->primary_space;
}
//- rjf: iterate bytecode & perform ops
U8 *ptr = bytecode.str;
src/raddbg/raddbg_core.c
+18 -8
View File
@@ -1414,6 +1414,14 @@ rd_setting_from_name(String8 name)
{
// rjf: find most-granular config scope to begin looking for the setting
RD_Cfg *start_cfg = rd_cfg_from_id(rd_regs()->view);
for(RD_Cfg *p = start_cfg->parent; p != &rd_nil_cfg; p = p->parent)
{
if(str8_match(p->string, str8_lit("transient"), 0))
{
start_cfg = &rd_nil_cfg;
break;
}
}
if(start_cfg == &rd_nil_cfg) { start_cfg = rd_cfg_from_id(rd_regs()->panel); }
if(start_cfg == &rd_nil_cfg) { start_cfg = rd_cfg_from_id(rd_regs()->window); }
@@ -6197,7 +6205,9 @@ rd_window_frame(void)
RD_Cfg *root = rd_immediate_cfg_from_keyf("hover_eval_%p", ws);
RD_Cfg *view = rd_cfg_child_from_string_or_alloc(root, str8_lit("watch"));
RD_Cfg *expr = rd_cfg_child_from_string_or_alloc(view, str8_lit("expression"));
RD_RegsScope(.panel = 0, .view = view->id)
RD_Cfg *explicit_root = rd_cfg_child_from_string_or_alloc(view, str8_lit("explicit_root"));
rd_cfg_new(explicit_root, str8_lit("1"));
RD_RegsScope(.view = view->id)
{
rd_cfg_new_replace(expr, ws->hover_eval_string);
EV_BlockTree predicted_block_tree = ev_block_tree_from_string(scratch.arena, rd_view_eval_view(), str8_zero(), ws->hover_eval_string);
@@ -8084,7 +8094,7 @@ rd_window_frame(void)
{
// rjf: main rectangle
{
R_Rect2DInst *inst = dr_rect(pad_2f32(box->rect, 1), box->palette->colors[UI_ColorCode_Background], 0, 0, 1.f);
R_Rect2DInst *inst = dr_rect(pad_2f32(box->rect, 1.f), box->palette->colors[UI_ColorCode_Background], 0, 0, 1.f);
MemoryCopyArray(inst->corner_radii, box->corner_radii);
}
@@ -8321,22 +8331,22 @@ rd_window_frame(void)
{
Rng2F32 r = b->rect;
F32 half_thickness = 1.f;
F32 softness = 0.5f;
F32 softness = 0.f;
if(b->flags & UI_BoxFlag_DrawSideTop)
{
dr_rect(r2f32p(r.x0, r.y0-half_thickness, r.x1, r.y0+half_thickness), b->palette->colors[UI_ColorCode_Border], 0, 0, softness);
dr_rect(r2f32p(r.x0, r.y0, r.x1, r.y0+2*half_thickness), b->palette->colors[UI_ColorCode_Border], 0, 0, softness);
}
if(b->flags & UI_BoxFlag_DrawSideBottom)
{
dr_rect(r2f32p(r.x0, r.y1-half_thickness, r.x1, r.y1+half_thickness), b->palette->colors[UI_ColorCode_Border], 0, 0, softness);
dr_rect(r2f32p(r.x0, r.y1-2*half_thickness, r.x1, r.y1), b->palette->colors[UI_ColorCode_Border], 0, 0, softness);
}
if(b->flags & UI_BoxFlag_DrawSideLeft)
{
dr_rect(r2f32p(r.x0-half_thickness, r.y0, r.x0+half_thickness, r.y1), b->palette->colors[UI_ColorCode_Border], 0, 0, softness);
dr_rect(r2f32p(r.x0, r.y0, r.x0+2*half_thickness, r.y1), b->palette->colors[UI_ColorCode_Border], 0, 0, softness);
}
if(b->flags & UI_BoxFlag_DrawSideRight)
{
dr_rect(r2f32p(r.x1-half_thickness, r.y0, r.x1+half_thickness, r.y1), b->palette->colors[UI_ColorCode_Border], 0, 0, softness);
dr_rect(r2f32p(r.x1-2*half_thickness, r.y0, r.x1, r.y1), b->palette->colors[UI_ColorCode_Border], 0, 0, softness);
}
}
@@ -9146,7 +9156,7 @@ E_LOOKUP_ACCESS_FUNCTION_DEF(target)
{
E_Eval eval = e_eval_from_expr(scratch.arena, lhs);
RD_Cfg *cfg = rd_cfg_from_eval_space(eval.space);
result.irtree_and_type.root = e_irtree_const_u(arena, cfg->id);
result.irtree_and_type.root = e_irtree_set_space(arena, eval.space, e_irtree_const_u(arena, cfg->id));
result.irtree_and_type.type_key = e_type_key_cons(.kind = E_TypeKind_Set, .name = str8_lit("environment"));
result.irtree_and_type.mode = E_Mode_Offset;
}
src/raddbg/raddbg_views.c
+70 -21
View File
@@ -964,8 +964,8 @@ rd_watch_row_info_from_row(Arena *arena, EV_Row *row)
// cfgs, and the evaluations are of the targets themselves.
//
B32 row_eval_matches_group = 0;
RD_Cfg *evalled_cfg = rd_cfg_from_eval_space(info.eval.space);
{
RD_Cfg *evalled_cfg = rd_cfg_from_eval_space(info.eval.space);
row_eval_matches_group = (evalled_cfg == info.group_cfg_child);
}
@@ -980,12 +980,18 @@ rd_watch_row_info_from_row(Arena *arena, EV_Row *row)
{
if(0){}
// rjf: singular button for top-level cfgs
// rjf: singular button for top-level cfg group elements
else if(info.eval.space.kind == RD_EvalSpaceKind_MetaCfg && row_eval_matches_group && info.group_cfg_parent == &rd_nil_cfg)
{
rd_watch_cell_list_push_new(arena, &info.cells, RD_WatchCellKind_Button, .pct = 1.f, .fancy_strings = rd_title_fstrs_from_cfg(arena, info.group_cfg_child, ui_top_palette()->text_weak, ui_top_font_size()));
}
// rjf: singular button for top-level cfg roots
else if(row->block->parent == &ev_nil_block && evalled_cfg != &rd_nil_cfg)
{
rd_watch_cell_list_push_new(arena, &info.cells, RD_WatchCellKind_Button, .pct = 1.f, .fancy_strings = rd_title_fstrs_from_cfg(arena, evalled_cfg, ui_top_palette()->text_weak, ui_top_font_size()));
}
// rjf: singular button for entities
else if(info.eval.space.kind == RD_EvalSpaceKind_MetaCtrlEntity && info.group_entity != &ctrl_entity_nil)
{
@@ -1004,6 +1010,19 @@ rd_watch_row_info_from_row(Arena *arena, EV_Row *row)
rd_watch_cell_list_push_new(arena, &info.cells, RD_WatchCellKind_ViewUI, .pct = 1.f);
}
// rjf: for 'add-new' rows in meta-cfg evaluation spaces, only do expr
else if(info.eval.space.kind == E_SpaceKind_Null && info.group_cfg_parent != &rd_nil_cfg)
{
rd_watch_cell_list_push_new(arena, &info.cells, RD_WatchCellKind_Expr, .pct = 1.f);
}
// rjf: for meta-cfg evaluation spaces, only do expr/value
else if(info.eval.space.kind == RD_EvalSpaceKind_MetaCfg)
{
rd_watch_cell_list_push_new(arena, &info.cells, RD_WatchCellKind_Expr, .pct = 0.25f);
rd_watch_cell_list_push_new(arena, &info.cells, RD_WatchCellKind_Eval, .pct = 0.75f);
}
// rjf: default cells
else
{
@@ -1566,15 +1585,7 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
// the "collection of all watches", to build a watch window. but this behavior is not
// as desirable if we are just using some other expression as the root.
//
B32 implicit_root = 0;
{
E_Eval eval = e_eval_from_string(scratch.arena, expr);
E_TypeKind kind = e_type_kind_from_key(eval.type_key);
if(kind == E_TypeKind_Set)
{
implicit_root = 1;
}
}
B32 implicit_root = !rd_view_cfg_value_from_string(str8_lit("explicit_root")).u64;
//////////////////////////////
//- rjf: determine autocompletion string
@@ -2479,6 +2490,7 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
ProfScope("build table")
{
U64 global_row_idx = rows.count_before_semantic;
RD_WatchRowInfo last_row_info = {0};
for(EV_WindowedRowNode *row_node = rows.first; row_node != 0; row_node = row_node->next, global_row_idx += 1)
{
////////////////////////
@@ -2499,6 +2511,37 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
}
ProfEnd();
////////////////////////
//- rjf: determine if this row fits the last row's topology
//
B32 row_matches_last_row_topology = 1;
if(row_node != rows.first)
{
for(RD_WatchCell *last_cell = last_row_info.cells.first, *this_cell = row_info.cells.first;;
last_cell = last_cell->next, this_cell = this_cell->next)
{
if(last_cell == 0 && this_cell == 0)
{
break;
}
if((last_cell == 0 && this_cell != 0) || (last_cell != 0 && this_cell == 0))
{
row_matches_last_row_topology = 0;
break;
}
if(rd_id_from_watch_cell(last_cell) != rd_id_from_watch_cell(this_cell))
{
row_matches_last_row_topology = 0;
break;
}
}
}
////////////////////////
//- rjf: store last row's info, for next iteration
//
last_row_info = row_info;
////////////////////////
//- rjf: determine if row's data is fresh and/or bad
//
@@ -2516,7 +2559,7 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
U64 size = e_type_byte_size_from_key(row_info.eval.type_key);
size = Min(size, 64);
Rng1U64 vaddr_rng = r1u64(row_info.eval.value.u64, row_info.eval.value.u64+size);
CTRL_ProcessMemorySlice slice = ctrl_query_cached_data_from_process_vaddr_range(scratch.arena, space_entity->handle, vaddr_rng, 0);
CTRL_ProcessMemorySlice slice = ctrl_query_cached_data_from_process_vaddr_range(scratch.arena, space_entity->handle, vaddr_rng, d_state->frame_eval_memread_endt_us);
for(U64 idx = 0; idx < (slice.data.size+63)/64; idx += 1)
{
if(slice.byte_changed_flags[idx] != 0)
@@ -2549,6 +2592,10 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
palette = ui_build_palette(ui_top_palette(), .background = rd_rgba_from_theme_color(RD_ThemeColor_BaseBackgroundAlt));
row_flags |= UI_BoxFlag_DrawBackground;
}
if(!row_matches_last_row_topology)
{
row_flags |= UI_BoxFlag_DrawSideTop;
}
#if 0 // TODO(rjf): @cfg
switch(row_kind)
{
@@ -2570,7 +2617,7 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
ui_set_next_pref_width(ui_pct(1, 0));
ui_set_next_pref_height(ui_px(row_height_px*row->visual_size, 1.f));
ui_set_next_focus_hot(row_selected ? UI_FocusKind_On : UI_FocusKind_Off);
UI_Box *row_box = ui_build_box_from_stringf(row_flags|(!row_node->next)*UI_BoxFlag_DrawSideBottom|UI_BoxFlag_Clickable, "row_%I64x", row_hash);
UI_Box *row_box = ui_build_box_from_stringf(row_flags|((!row_node->next)*UI_BoxFlag_DrawSideBottom)|UI_BoxFlag_Clickable, "row_%I64x", row_hash);
//////////////////////
//- rjf: build row contents
@@ -2631,6 +2678,8 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
RD_WatchViewTextEditState *cell_edit_state = rd_watch_view_text_edit_state_from_pt(ewv, cell_pt);
B32 cell_selected = (row_selected && selection_tbl.min.x <= cell_x && cell_x <= selection_tbl.max.x);
RD_WatchRowCellInfo cell_info = rd_info_from_watch_row_cell(scratch.arena, row, string_flags, &row_info, cell, ui_top_font(), ui_top_font_size(), row_string_max_size_px);
F32 cell_width_px = cell->px + cell->pct * (dim_2f32(rect).x - floor_f32(ui_top_font_size()*1.5f));
F32 next_cell_x_px = cell_x_px + cell_width_px;
//- rjf: determine cell's palette
ProfBegin("determine cell's palette");
@@ -2652,15 +2701,15 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
//- rjf: build cell
UI_Box *cell_box = &ui_nil_box;
UI_Palette(palette)
UI_Palette(palette) UI_PrefWidth(ui_px(cell_width_px, 1.f))
{
ui_set_next_fixed_height(row->visual_size * row_height_px);
ui_set_next_fixed_height(floor_f32(row->visual_size * row_height_px));
cell_box = ui_build_box_from_stringf(UI_BoxFlag_DrawSideLeft, "cell_%I64x_%I64x", row_hash, cell_id);
}
//- rjf: build cell
//- rjf: build cell contents
UI_Signal sig = {0};
ProfScope("build cell")
ProfScope("build cell contents")
UI_Parent(cell_box)
UI_FocusHot(cell_selected ? UI_FocusKind_On : UI_FocusKind_Off)
UI_FocusActive((cell_selected && ewv->text_editing) ? UI_FocusKind_On : UI_FocusKind_Off)
@@ -2683,7 +2732,7 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
// rjf: cell has hook? -> build ui by calling hook
else if(cell_info.view_ui_rule != &rd_nil_view_ui_rule)
{
Rng2F32 cell_rect = r2f32p(cell_x_px, 0, cell_x_px + cell->pct*(dim_2f32(rect).x - floor_f32(ui_top_font_size()*1.5f)), row_height_px*(row_node->visual_size_skipped + row->visual_size + row_node->visual_size_chopped));
Rng2F32 cell_rect = r2f32p(cell_x_px, 0, next_cell_x_px, row_height_px*(row_node->visual_size_skipped + row->visual_size + row_node->visual_size_chopped));
ui_set_next_fixed_y(-1.f * (row_node->visual_size_skipped) * row_height_px);
ui_set_next_fixed_height((row_node->visual_size_skipped + row->visual_size + row_node->visual_size_chopped) * row_height_px);
UI_Box *box = ui_build_box_from_stringf(UI_BoxFlag_Clip|UI_BoxFlag_Clickable|UI_BoxFlag_FloatingY, "###val_%I64x", row_hash);
@@ -2694,8 +2743,9 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
RD_Cfg *expr = rd_cfg_child_from_string_or_alloc(view, str8_lit("expression"));
rd_cfg_new(expr, e_string_from_expr(scratch.arena, cell_info.eval.expr));
rd_cfg_new(view, str8_lit("selected"));
RD_RegsScope(.panel = 0, .view = view->id)
RD_RegsScope(.view = view->id)
UI_PermissionFlags(UI_PermissionFlag_Clicks|UI_PermissionFlag_ScrollX)
UI_Flags(0)
{
// rjf: loading animation container
UI_Box *loading_overlay_container = &ui_nil_box;
@@ -2726,7 +2776,6 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
{
line_edit_params.flags = (RD_LineEditFlag_CodeContents|
RD_LineEditFlag_NoBackground*!(cell_info.is_button)|
RD_LineEditFlag_Border*!!(cell_info.is_button)|
RD_LineEditFlag_Button*!!(cell_info.is_button)|
RD_LineEditFlag_KeyboardClickable|
RD_LineEditFlag_Expander*!!(cell_x == 0 && row_is_expandable && cell == row_info.cells.first)|
@@ -2840,7 +2889,7 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
}
//- rjf: bump x pixel coordinate
cell_x_px += cell->pct*dim_2f32(rect).x;
cell_x_px = next_cell_x_px;
//- rjf: [DEV] hovering -> watch key tooltips
if(DEV_eval_watch_key_tooltips && ui_hovering(sig)) UI_Tooltip RD_Font(RD_FontSlot_Code)
src/raddbg/raddbg_views.h
+1
View File
@@ -59,6 +59,7 @@ struct RD_WatchCell
String8 string;
DR_FancyStringList fancy_strings;
F32 pct;
F32 px;
};
typedef struct RD_WatchCellList RD_WatchCellList;