diff --git a/src/dbg_engine/dbg_engine_core.c b/src/dbg_engine/dbg_engine_core.c index b0efbcc1..63eb7a30 100644 --- a/src/dbg_engine/dbg_engine_core.c +++ b/src/dbg_engine/dbg_engine_core.c @@ -567,18 +567,6 @@ d_cmd_params_zero(void) return p; } -internal void -d_cmd_params_mark_slot(D_CmdParams *params, D_CmdParamSlot slot) -{ - params->slot_props[slot/64] |= (1ull<<(slot%64)); -} - -internal B32 -d_cmd_params_has_slot(D_CmdParams *params, D_CmdParamSlot slot) -{ - return !!(params->slot_props[slot/64] & (1ull<<(slot%64))); -} - internal String8 d_cmd_params_apply_spec_query(Arena *arena, D_CmdParams *params, D_CmdSpec *spec, String8 query) { @@ -589,15 +577,12 @@ d_cmd_params_apply_spec_query(Arena *arena, D_CmdParams *params, D_CmdSpec *spec case D_CmdParamSlot_String: { params->string = push_str8_copy(arena, query); - d_cmd_params_mark_slot(params, D_CmdParamSlot_String); }break; case D_CmdParamSlot_FilePath: { String8TxtPtPair pair = str8_txt_pt_pair_from_string(query); params->file_path = push_str8_copy(arena, pair.string); params->text_point = pair.pt; - d_cmd_params_mark_slot(params, D_CmdParamSlot_FilePath); - d_cmd_params_mark_slot(params, D_CmdParamSlot_TextPoint); }break; case D_CmdParamSlot_TextPoint: { @@ -606,7 +591,6 @@ d_cmd_params_apply_spec_query(Arena *arena, D_CmdParams *params, D_CmdSpec *spec { params->text_point.column = 1; params->text_point.line = v; - d_cmd_params_mark_slot(params, D_CmdParamSlot_TextPoint); } else { @@ -637,32 +621,26 @@ d_cmd_params_apply_spec_query(Arena *arena, D_CmdParams *params, D_CmdSpec *spec case D_CmdParamSlot_VirtualAddr: { params->vaddr = u64; - d_cmd_params_mark_slot(params, D_CmdParamSlot_VirtualAddr); }break; case D_CmdParamSlot_VirtualOff: { params->voff = u64; - d_cmd_params_mark_slot(params, D_CmdParamSlot_VirtualOff); }break; case D_CmdParamSlot_Index: { params->index = u64; - d_cmd_params_mark_slot(params, D_CmdParamSlot_Index); }break; case D_CmdParamSlot_UnwindIndex: { params->unwind_index = u64; - d_cmd_params_mark_slot(params, D_CmdParamSlot_UnwindIndex); }break; case D_CmdParamSlot_InlineDepth: { params->inline_depth = u64; - d_cmd_params_mark_slot(params, D_CmdParamSlot_InlineDepth); }break; case D_CmdParamSlot_ID: { params->id = u64; - d_cmd_params_mark_slot(params, D_CmdParamSlot_ID); }break; } } @@ -6280,7 +6258,6 @@ d_init(CmdLine *cmdln, D_StateDeltaHistory *hist) d_state->cfg_path_arenas[src] = arena_alloc(); D_CmdParams params = d_cmd_params_zero(); params.file_path = path_normalized_from_string(scratch.arena, cfg_src_paths[src]); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_FilePath); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(d_cfg_src_load_cmd_kind_table[src])); } @@ -6388,7 +6365,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) log_infof("stop_thread: \"%S\"\n", d_display_string_from_entity(scratch.arena, stop_thread)); D_CmdParams params = d_cmd_params_zero(); params.entity = d_handle_from_entity(stop_thread); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_cmd_list_push(arena, cmds, ¶ms, d_cmd_spec_from_kind(D_CmdKind_SelectThread)); } @@ -6400,7 +6376,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) { D_CmdParams params = d_cmd_params_zero(); params.entity = d_handle_from_entity(selected_thread); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_cmd_list_push(arena, cmds, ¶ms, d_cmd_spec_from_kind(D_CmdKind_FindThread)); } } @@ -6576,7 +6551,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) { D_CmdParams params = d_cmd_params_zero(); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_cmd_list_push(arena, cmds, ¶ms, d_cmd_spec_from_kind(D_CmdKind_SelectThread)); } }break; @@ -6923,7 +6897,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) { D_CmdParams p = params; p.string = str8_lit("No active targets exist; cannot launch."); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_Error)); } }break; @@ -6959,7 +6932,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) { D_CmdParams p = params; p.string = str8_lit("No attached running processes exist; cannot kill."); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_Error)); } }break; @@ -6985,7 +6957,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) { D_CmdParams p = params; p.string = str8_lit("No attached running processes exist; cannot kill."); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_Error)); } }break; @@ -7025,7 +6996,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) { D_CmdParams p = params; p.string = str8_lit("Cannot run with all threads frozen."); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_Error)); } }break; @@ -7042,7 +7012,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) { D_CmdParams p = params; p.string = str8_lit("Must halt before stepping."); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_Error)); } } @@ -7050,7 +7019,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) { D_CmdParams p = params; p.string = str8_lit("Must thaw selected thread before stepping."); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_Error)); } else @@ -7080,7 +7048,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) { D_CmdParams p = params; p.string = str8_lit("Could not find the return address of the current callstack frame successfully."); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_Error)); good = 0; } @@ -7184,7 +7151,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) { D_CmdParams params = d_cmd_params_zero(); params.entity_list = d_handle_list_from_entity_list(scratch.arena, targets); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_EntityList); d_cmd_list_push(arena, cmds, ¶ms, d_cmd_spec_from_kind(D_CmdKind_LaunchAndRun)); } }break; @@ -7211,7 +7177,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) D_EntityList targets = d_push_active_target_list(scratch.arena); D_CmdParams p = params; p.entity_list = d_handle_list_from_entity_list(scratch.arena, targets); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_EntityList); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_LaunchAndInit)); } }break; @@ -7292,8 +7257,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) } } D_CmdParams p = params; - d_cmd_params_mark_slot(&p, D_CmdParamSlot_UnwindIndex); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_InlineDepth); p.unwind_index = next_unwind_idx; p.inline_depth = next_inline_dpt; d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_SelectUnwind)); @@ -7318,7 +7281,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) CTRL_MachineID machine_id = CTRL_MachineID_Local; D_CmdParams params = d_cmd_params_zero(); params.entity = d_handle_from_entity(d_machine_entity_from_machine_id(machine_id)); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_cmd_list_push(arena, cmds, ¶ms, d_cmd_spec_from_kind(D_CmdKind_FreezeMachine)); }break; case D_CmdKind_ThawLocalMachine: @@ -7326,7 +7288,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) CTRL_MachineID machine_id = CTRL_MachineID_Local; D_CmdParams params = d_cmd_params_zero(); params.entity = d_handle_from_entity(d_machine_entity_from_machine_id(machine_id)); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_cmd_list_push(arena, cmds, ¶ms, d_cmd_spec_from_kind(D_CmdKind_ThawMachine)); }break; @@ -7502,7 +7463,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) { D_CmdParams p = params; p.string = push_str8f(scratch.arena, "\"%S\" appears to refer to an existing file which is not a RADDBG config file. This would overwrite the file.", new_path); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_Error)); } }break; @@ -8269,7 +8229,6 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt) } D_CmdParams p = params; p.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Entity); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_EditTarget)); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_SelectTarget)); }break; diff --git a/src/dbg_engine/dbg_engine_core.h b/src/dbg_engine/dbg_engine_core.h index fac026a9..a7be0353 100644 --- a/src/dbg_engine/dbg_engine_core.h +++ b/src/dbg_engine/dbg_engine_core.h @@ -1218,8 +1218,6 @@ internal String8 d_cmd_arg_part_from_string(String8 string); //- rjf: command parameter bundles internal D_CmdParams d_cmd_params_zero(void); -internal void d_cmd_params_mark_slot(D_CmdParams *params, D_CmdParamSlot slot); -internal B32 d_cmd_params_has_slot(D_CmdParams *params, D_CmdParamSlot slot); internal String8 d_cmd_params_apply_spec_query(Arena *arena, D_CmdParams *params, D_CmdSpec *spec, String8 query); //- rjf: command lists diff --git a/src/dbg_gfx/dbg_gfx_core.c b/src/dbg_gfx/dbg_gfx_core.c index 202ff430..4162370e 100644 --- a/src/dbg_gfx/dbg_gfx_core.c +++ b/src/dbg_gfx/dbg_gfx_core.c @@ -511,13 +511,6 @@ internal D_CmdParams df_cmd_params_from_window(DF_Window *window) { D_CmdParams p = d_cmd_params_zero(); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Window); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Panel); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_View); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_PreferDisassembly); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_UnwindIndex); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_InlineDepth); p.window = df_handle_from_window(window); p.panel = df_handle_from_panel(window->focused_panel); p.view = df_handle_from_view(df_selected_tab_from_panel(window->focused_panel)); @@ -532,13 +525,6 @@ internal D_CmdParams df_cmd_params_from_panel(DF_Window *window, DF_Panel *panel) { D_CmdParams p = d_cmd_params_zero(); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Window); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Panel); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_View); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_PreferDisassembly); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_UnwindIndex); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_InlineDepth); p.window = df_handle_from_window(window); p.panel = df_handle_from_panel(panel); p.view = df_handle_from_view(df_selected_tab_from_panel(panel)); @@ -553,13 +539,6 @@ internal D_CmdParams df_cmd_params_from_view(DF_Window *window, DF_Panel *panel, DF_View *view) { D_CmdParams p = d_cmd_params_zero(); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Window); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Panel); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_View); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_PreferDisassembly); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_UnwindIndex); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_InlineDepth); p.window = df_handle_from_window(window); p.panel = df_handle_from_panel(panel); p.view = df_handle_from_view(view); @@ -1322,7 +1301,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams p = params; p.view_spec = view_spec; - d_cmd_params_mark_slot(&p, D_CmdParamSlot_ViewSpec); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_OpenTab)); } }break; @@ -1886,7 +1864,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) D_CmdKind write_cmd = d_cfg_src_write_cmd_kind_table[src]; D_CmdParams p = d_cmd_params_zero(); p.file_path = d_cfg_path_from_src(src); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_FilePath); d_push_cmd__root(&p, d_cmd_spec_from_kind(write_cmd)); } }break; @@ -2273,9 +2250,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) p.window = df_handle_from_window(ws); p.panel = df_handle_from_panel(ws->focused_panel); p.entity = params.entity; - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Window); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Panel); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Entity); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_PendingFile)); } #endif @@ -2746,19 +2720,12 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { params.file_path = line.file_path; params.text_point = line.pt; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_FilePath); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_TextPoint); } params.entity = d_handle_from_entity(thread); params.voff = rip_voff; params.vaddr = rip_vaddr; params.unwind_index = unwind_index; params.inline_depth = inline_depth; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_VirtualOff); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_VirtualAddr); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_UnwindIndex); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_InlineDepth); d_cmd_list_push(arena, cmds, ¶ms, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); } @@ -2771,11 +2738,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) params.vaddr = rip_vaddr; params.unwind_index = unwind_index; params.inline_depth = inline_depth; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_VirtualOff); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_VirtualAddr); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_UnwindIndex); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_InlineDepth); d_cmd_list_push(arena, cmds, ¶ms, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); } @@ -2794,9 +2756,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) params.entity = d_handle_from_entity(selected_thread); params.unwind_index = d_base_interact_regs()->unwind_count; params.inline_depth = d_base_interact_regs()->inline_depth; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_UnwindIndex); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_InlineDepth); d_cmd_list_push(arena, cmds, ¶ms, d_cmd_spec_from_kind(D_CmdKind_FindThread)); }break; @@ -2922,7 +2881,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams p = params; p.string = push_str8f(scratch.arena, "`%S` could not be found.", name); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Error)); } @@ -2936,8 +2894,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { p.file_path = lines.first->v.file_path; p.text_point = lines.first->v.pt; - d_cmd_params_mark_slot(&p, D_CmdParamSlot_FilePath); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_TextPoint); if(voff_dbgi_key.path.size != 0) { D_EntityList modules = d_modules_from_dbgi_key(scratch.arena, &voff_dbgi_key); @@ -2947,8 +2903,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { p.entity = d_handle_from_entity(process); p.vaddr = module->vaddr_rng.min + lines.first->v.voff_range.min; - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_VirtualAddr); } } } @@ -2963,8 +2917,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) D_CmdParams p = params; p.file_path = path; p.text_point = txt_pt(1, 1); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_FilePath); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_TextPoint); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); } } @@ -2996,7 +2948,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams params = df_cmd_params_from_window(ws); params.string = str8_lit("Invalid target."); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_String); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_Error)); } }break; @@ -3011,21 +2962,18 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_SpawnEntityView)); }break; case D_EntityKind_Thread: { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_SelectThread)); }break; case D_EntityKind_Target: { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_SelectTarget)); }break; } @@ -3042,7 +2990,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams params = df_cmd_params_from_panel(ws, panel); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_cmd_list_push(arena, cmds, ¶ms, d_cmd_spec_from_kind(D_CmdKind_EditTarget)); }break; } @@ -3283,7 +3230,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) dst_panel->selected_tab_view = df_handle_from_view(dst_view); D_CmdParams params = df_cmd_params_from_view(ws, dst_panel, dst_view); params.text_point = point; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_TextPoint); d_cmd_list_push(arena, cmds, ¶ms, d_cmd_spec_from_kind(D_CmdKind_GoToLine)); d_cmd_list_push(arena, cmds, ¶ms, d_cmd_spec_from_kind(cursor_snap_kind)); panel_used_for_src_code = dst_panel; @@ -3331,8 +3277,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) D_CmdParams params = df_cmd_params_from_view(ws, dst_panel, dst_view); params.entity = d_handle_from_entity(process); params.vaddr = vaddr; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_VirtualAddr); d_cmd_list_push(arena, cmds, ¶ms, d_cmd_spec_from_kind(D_CmdKind_GoToAddress)); d_cmd_list_push(arena, cmds, ¶ms, d_cmd_spec_from_kind(cursor_snap_kind)); } @@ -4005,8 +3949,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) D_CmdParams params = df_cmd_params_from_window(ws); params.file_path = lines.first->v.file_path; params.text_point = lines.first->v.pt; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_FilePath); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_TextPoint); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); } ui_ctx_menu_close(); @@ -4026,8 +3968,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) } } D_CmdParams params = df_cmd_params_from_window(ws); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_VirtualAddr); params.entity = d_handle_from_entity(thread); params.vaddr = vaddr; d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); @@ -4085,8 +4025,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); params.string = str8(ws->entity_ctx_menu_input_buffer, ws->entity_ctx_menu_input_size); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_String); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_NameEntity)); } } @@ -4110,8 +4048,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(condition); params.string = new_string; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_String); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_NameEntity)); } else if(!d_entity_is_nil(condition)) @@ -4138,8 +4074,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(exe); params.string = new_string; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_String); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_NameEntity)); } else if(!d_entity_is_nil(exe)) @@ -4166,8 +4100,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(args); params.string = new_string; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_String); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_NameEntity)); } else if(!d_entity_is_nil(args)) @@ -4195,7 +4127,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_DuplicateEntity)); ui_ctx_menu_close(); } @@ -4205,7 +4136,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_EditEntity)); ui_ctx_menu_close(); } @@ -4215,7 +4145,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_RemoveEntity)); ui_ctx_menu_close(); } @@ -4228,14 +4157,12 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_EnableEntity)); } if(is_enabled && ui_clicked(df_icon_buttonf(ws, DF_IconKind_CheckFilled, 0, "Disable###enabler"))) { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_DisableEntity)); } } @@ -4249,14 +4176,12 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_ThawEntity)); } if(!is_frozen && ui_clicked(df_icon_buttonf(ws, DF_IconKind_Unlocked, 0, "Freeze###freeze_thaw"))) { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_FreezeEntity)); } } @@ -4292,13 +4217,11 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams p = d_cmd_params_zero(); p.file_path = path_w_slash; - d_cmd_params_mark_slot(&p, D_CmdParamSlot_FilePath); d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_SetCurrentPath)); } { D_CmdParams p = df_cmd_params_from_window(ws); p.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_Open); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_CmdSpec); d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); } ui_ctx_menu_close(); @@ -4310,8 +4233,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) D_CmdParams params = df_cmd_params_from_window(ws); params.file_path = d_full_path_from_entity(scratch.arena, entity); params.text_point = txt_pt(1, 1); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_FilePath); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_TextPoint); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); ui_ctx_menu_close(); } @@ -4331,7 +4252,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_SelectThread)); ui_ctx_menu_close(); } @@ -4411,7 +4331,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_FindThread)); ui_ctx_menu_close(); } @@ -4454,7 +4373,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_LaunchAndRun)); ui_ctx_menu_close(); } @@ -4462,7 +4380,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_LaunchAndInit)); ui_ctx_menu_close(); } @@ -4637,7 +4554,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) D_CmdParams params = df_cmd_params_from_window(ws); { params.view = df_handle_from_view(view); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_View); } d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_Filter)); ui_ctx_menu_close(); @@ -4647,7 +4563,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) D_CmdParams params = df_cmd_params_from_window(ws); { params.view = df_handle_from_view(view); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_View); } d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_ClearFilter)); ui_ctx_menu_close(); @@ -5277,7 +5192,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(target); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_EditTarget)); ui_ctx_menu_close(); ws->menu_bar_focused = 0; @@ -5781,7 +5695,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams p = df_cmd_params_from_window(ws); p.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_OpenUser); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_CmdSpec); d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); } } @@ -5817,7 +5730,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams p = df_cmd_params_from_window(ws); p.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_OpenProject); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_CmdSpec); d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); } } @@ -6211,7 +6123,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams p = df_cmd_params_from_window(ws); p.string = error; - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Error)); } scratch_end(scratch); @@ -6493,7 +6404,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams params = df_cmd_params_from_window(ws); params.string = str8_lit("Could not commit value successfully."); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_String); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_Error)); } } @@ -6526,7 +6436,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) { D_CmdParams params = df_cmd_params_from_window(ws); params.string = expr; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_String); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_ToggleWatchExpression)); } } @@ -7628,10 +7537,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) params.dest_panel = df_handle_from_panel(panel); params.view = df_handle_from_view(view); params.prev_view = df_handle_from_view(active_drop_site->prev_view); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Panel); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_DestPanel); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_View); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_PrevView); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_MoveTab)); } } @@ -7691,10 +7596,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) params.panel = df_handle_from_panel(src_panel); params.dest_panel = df_handle_from_panel(panel); params.view = df_handle_from_view(view); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_PrevView); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Panel); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_DestPanel); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_View); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_MoveTab)); df_panel_notify_mutation(ws, panel); } @@ -7706,9 +7607,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds) params.panel = df_handle_from_panel(panel); params.text_point = payload.text_point; params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Panel); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_TextPoint); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_SpawnEntityView)); } } @@ -10137,7 +10035,6 @@ df_cmd_list_menu_buttons(DF_Window *ws, U64 count, D_CmdKind *cmds, U32 *fastpat { D_CmdParams params = df_cmd_params_from_window(ws); params.cmd_spec = spec; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_CmdSpec); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); ui_ctx_menu_close(); ws->menu_bar_focused = 0; @@ -10537,7 +10434,6 @@ df_entity_desc_button(DF_Window *ws, D_Entity *entity, FuzzyMatchRangeList *name { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_EntityRefFastPath)); } @@ -10597,8 +10493,6 @@ df_src_loc_button(DF_Window *ws, String8 file_path, TxtPt point) D_CmdParams params = df_cmd_params_from_window(ws); params.file_path = file_path; params.text_point = point; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_FilePath); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_TextPoint); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); } @@ -11116,7 +11010,6 @@ df_code_slice(DF_Window *ws, DF_CodeSliceParams *params, TxtPt *cursor, TxtPt *m { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(thread); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_SelectThread)); ui_kill_action(); } @@ -11197,7 +11090,6 @@ df_code_slice(DF_Window *ws, DF_CodeSliceParams *params, TxtPt *cursor, TxtPt *m { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(bp); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_RemoveBreakpoint)); } @@ -11257,7 +11149,6 @@ df_code_slice(DF_Window *ws, DF_CodeSliceParams *params, TxtPt *cursor, TxtPt *m { D_CmdParams params = df_cmd_params_from_window(ws); params.entity = d_handle_from_entity(pin); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_RemoveEntity)); } @@ -13321,7 +13212,6 @@ df_gfx_begin_frame(Arena *arena, D_CmdList *cmds) { D_CmdParams p = df_cmd_params_from_window(w); p.string = push_str8_copy(arena, params.string); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Error)); } } @@ -13365,7 +13255,6 @@ df_gfx_begin_frame(Arena *arena, D_CmdList *cmds) running_processes.count == 1 ? "" : "es"); D_CmdParams p = df_cmd_params_from_window(ws); p.force_confirm = 1; - d_cmd_params_mark_slot(&p, D_CmdParamSlot_ForceConfirm); d_cmd_list_push(df_gfx_state->confirm_arena, &df_gfx_state->confirm_cmds, &p, d_cmd_spec_from_kind(D_CmdKind_CloseWindow)); } @@ -13458,9 +13347,6 @@ df_gfx_begin_frame(Arena *arena, D_CmdList *cmds) p.window = df_handle_from_window(window); p.panel = df_handle_from_panel(window->focused_panel); p.view = df_handle_from_view(df_selected_tab_from_panel(window->focused_panel)); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Window); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Panel); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_View); d_cmd_list_push(arena, cmds, &p, cmd->spec); } } @@ -14148,14 +14034,12 @@ df_gfx_begin_frame(Arena *arena, D_CmdList *cmds) { D_CmdParams p = params; p.string = df_push_search_string(scratch.arena); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_FindTextForward)); }break; case D_CmdKind_FindPrev: { D_CmdParams p = params; p.string = df_push_search_string(scratch.arena); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); d_cmd_list_push(arena, cmds, &p, d_cmd_spec_from_kind(D_CmdKind_FindTextBackward)); }break; } diff --git a/src/dbg_gfx/dbg_gfx_views.c b/src/dbg_gfx/dbg_gfx_views.c index 418f8fea..8dec37ce 100644 --- a/src/dbg_gfx/dbg_gfx_views.c +++ b/src/dbg_gfx/dbg_gfx_views.c @@ -439,7 +439,6 @@ df_code_view_build(Arena *arena, DF_Window *ws, DF_Panel *panel, DF_View *view, { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.string = push_str8f(scratch.arena, "Could not find \"%S\"", cv->find_text_fwd); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_String); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_Error)); } scratch_end(scratch); @@ -503,7 +502,6 @@ df_code_view_build(Arena *arena, DF_Window *ws, DF_Panel *panel, DF_View *view, { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.string = push_str8f(scratch.arena, "Could not find \"%S\"", cv->find_text_bwd); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_String); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_Error)); } scratch_end(scratch); @@ -580,7 +578,6 @@ df_code_view_build(Arena *arena, DF_Window *ws, DF_Panel *panel, DF_View *view, ui_kill_action(); D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.string = txt_string_from_info_data_txt_rng(text_info, text_data, sig.mouse_expr_rng); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_String); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_GoToName)); } @@ -590,7 +587,6 @@ df_code_view_build(Arena *arena, DF_Window *ws, DF_Panel *panel, DF_View *view, cv->watch_expr_at_mouse = 0; D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.string = txt_string_from_info_data_txt_rng(text_info, text_data, sig.mouse_expr_rng); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_String); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_ToggleWatchExpression)); } @@ -1657,9 +1653,6 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS p.string = e_string_from_expr(scratch.arena, row->expr); p.view_spec = df_view_spec_from_string(row->expand_ui_rule_spec->info.string); p.params_tree = row->expand_ui_rule_params; - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_ViewSpec); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_ParamsTree); d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_OpenTab)); } } @@ -1821,7 +1814,6 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.string = str8_lit("Could not commit value successfully."); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_String); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_Error)); } }break; @@ -3001,7 +2993,6 @@ DF_VIEW_UI_FUNCTION_DEF(getting_started) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_AddTarget); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_CmdSpec); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); } }break; @@ -3024,7 +3015,6 @@ DF_VIEW_UI_FUNCTION_DEF(getting_started) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.entity = d_handle_from_entity(target); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_LaunchAndRun)); } ui_spacer(ui_em(1.5f, 1)); @@ -3032,7 +3022,6 @@ DF_VIEW_UI_FUNCTION_DEF(getting_started) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.entity = d_handle_from_entity(target); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_LaunchAndInit)); } } @@ -3242,7 +3231,6 @@ DF_VIEW_UI_FUNCTION_DEF(commands) { DF_CmdListerItem *item = &cmd_array.v[0]; params.cmd_spec = item->cmd_spec; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_CmdSpec); } d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); } @@ -3358,7 +3346,6 @@ DF_VIEW_UI_FUNCTION_DEF(commands) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.cmd_spec = item->cmd_spec; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_CmdSpec); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); } } @@ -3560,7 +3547,6 @@ DF_VIEW_UI_FUNCTION_DEF(file_system) { D_CmdParams p = d_cmd_params_zero(); p.file_path = path_query.path; - d_cmd_params_mark_slot(&p, D_CmdParamSlot_FilePath); d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_SetCurrentPath)); } @@ -3651,7 +3637,6 @@ DF_VIEW_UI_FUNCTION_DEF(file_system) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.file_path = query_normalized_with_opt_slash; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_FilePath); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); } @@ -3670,7 +3655,6 @@ DF_VIEW_UI_FUNCTION_DEF(file_system) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.file_path = query_normalized_with_opt_slash; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_FilePath); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); } } @@ -3680,7 +3664,6 @@ DF_VIEW_UI_FUNCTION_DEF(file_system) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.file_path = path_query.path; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_FilePath); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); } @@ -3698,7 +3681,6 @@ DF_VIEW_UI_FUNCTION_DEF(file_system) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.file_path = push_str8f(scratch.arena, "%S%S", path_query.path, filename); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_FilePath); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); } } @@ -3708,7 +3690,6 @@ DF_VIEW_UI_FUNCTION_DEF(file_system) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.file_path = query; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_FilePath); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); } } @@ -3910,7 +3891,6 @@ DF_VIEW_UI_FUNCTION_DEF(file_system) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.file_path = new_path; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_FilePath); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); } } @@ -4134,7 +4114,6 @@ DF_VIEW_UI_FUNCTION_DEF(system_processes) DF_ProcessInfo *info = &process_info_array.v[0]; D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.id = info->info.pid; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_ID); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); } @@ -4225,7 +4204,6 @@ DF_VIEW_UI_FUNCTION_DEF(system_processes) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.id = info->info.pid; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_ID); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); } } @@ -4377,8 +4355,6 @@ DF_VIEW_UI_FUNCTION_DEF(entity_lister) D_Entity *ent = ent_arr.v[0].entity; D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.entity = d_handle_from_entity(ent); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_EntityList); d_handle_list_push(scratch.arena, ¶ms.entity_list, params.entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); } @@ -4461,8 +4437,6 @@ DF_VIEW_UI_FUNCTION_DEF(entity_lister) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.entity = d_handle_from_entity(ent); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_EntityList); d_handle_list_push(scratch.arena, ¶ms.entity_list, params.entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); } @@ -4544,7 +4518,6 @@ DF_VIEW_UI_FUNCTION_DEF(symbol_lister) { D_CmdParams p = df_cmd_params_from_view(ws, panel, view); p.string = name; - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); } break; @@ -4637,7 +4610,6 @@ DF_VIEW_UI_FUNCTION_DEF(symbol_lister) { D_CmdParams p = df_cmd_params_from_view(ws, panel, view); p.string = name; - d_cmd_params_mark_slot(&p, D_CmdParamSlot_String); d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); } if(ui_hovering(sig)) UI_Tooltip @@ -4961,7 +4933,6 @@ DF_VIEW_UI_FUNCTION_DEF(target) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.cmd_spec = d_cmd_spec_from_kind(kv_info[idx].fill_with_file ? D_CmdKind_PickFile : D_CmdKind_PickFolder); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_CmdSpec); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); tv->pick_dst_kind = kv_info[idx].storage_child_kind; } @@ -5087,7 +5058,6 @@ DF_VIEW_UI_FUNCTION_DEF(targets) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_AddTarget); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_CmdSpec); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); } } @@ -5151,7 +5121,6 @@ DF_VIEW_UI_FUNCTION_DEF(targets) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.entity = d_handle_from_entity(target); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_handle_list_push(scratch.arena, ¶ms.entity_list, params.entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(ctrls[ctrl_idx].cmd)); } @@ -5232,8 +5201,6 @@ DF_VIEW_CMD_FUNCTION_DEF(file_path_map) D_CmdParams p = df_cmd_params_from_view(ws, panel, view); p.entity = d_handle_from_entity(storage_entity); p.file_path = pick_string; - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_FilePath); d_push_cmd__root(&p, d_cmd_spec_from_kind(pick_side == Side_Min ? D_CmdKind_SetFileOverrideLinkSrc : D_CmdKind_SetFileOverrideLinkDst)); @@ -5409,7 +5376,6 @@ DF_VIEW_UI_FUNCTION_DEF(file_path_map) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFileOrFolder); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_CmdSpec); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); fpms->pick_file_dst_map = d_handle_from_entity(map); fpms->pick_file_dst_side = Side_Min; @@ -5484,7 +5450,6 @@ DF_VIEW_UI_FUNCTION_DEF(file_path_map) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFileOrFolder); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_CmdSpec); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); fpms->pick_file_dst_map = d_handle_from_entity(map); fpms->pick_file_dst_side = Side_Max; @@ -5501,8 +5466,6 @@ DF_VIEW_UI_FUNCTION_DEF(file_path_map) D_CmdParams p = df_cmd_params_from_view(ws, panel, view); p.entity = commit_map; p.file_path = new_string; - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_FilePath); d_push_cmd__root(&p, d_cmd_spec_from_kind(commit_side == Side_Min ? D_CmdKind_SetFileOverrideLinkSrc : D_CmdKind_SetFileOverrideLinkDst)); @@ -5803,8 +5766,6 @@ DF_VIEW_UI_FUNCTION_DEF(auto_view_rules) D_CmdParams p = df_cmd_params_from_view(ws, panel, view); p.entity = commit_map; p.string = new_string; - d_cmd_params_mark_slot(&p, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(&p, D_CmdParamSlot_FilePath); d_push_cmd__root(&p, d_cmd_spec_from_kind(commit_side == Side_Min ? D_CmdKind_SetAutoViewRuleType : D_CmdKind_SetAutoViewRuleViewRule)); @@ -6030,7 +5991,6 @@ DF_VIEW_UI_FUNCTION_DEF(scheduler) D_CmdKind cmd_kind = frozen ? D_CmdKind_ThawEntity : D_CmdKind_FreezeEntity; D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.entity = d_handle_from_entity(entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(cmd_kind)); } } @@ -6057,8 +6017,6 @@ DF_VIEW_UI_FUNCTION_DEF(scheduler) D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.entity = d_handle_from_entity(entity); d_handle_list_push(scratch.arena, ¶ms.entity_list, d_handle_from_entity(entity)); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_Entity); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_EntityList); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_Detach)); } } @@ -6068,7 +6026,6 @@ DF_VIEW_UI_FUNCTION_DEF(scheduler) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_handle_list_push(scratch.arena, ¶ms.entity_list, d_handle_from_entity(entity)); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_EntityList); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_Restart)); } } @@ -6079,7 +6036,6 @@ DF_VIEW_UI_FUNCTION_DEF(scheduler) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_handle_list_push(scratch.arena, ¶ms.entity_list, d_handle_from_entity(entity)); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_EntityList); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_Kill)); } } @@ -6433,7 +6389,6 @@ DF_VIEW_UI_FUNCTION_DEF(modules) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFile); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_CmdSpec); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); mv->pick_file_dst_entity = d_handle_from_entity(entity); } @@ -6899,7 +6854,6 @@ DF_VIEW_UI_FUNCTION_DEF(text) { D_CmdParams params = df_cmd_params_from_view(ws, panel, view); params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFile); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_CmdSpec); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); } scratch_end(scratch); diff --git a/src/raddbg/raddbg.c b/src/raddbg/raddbg.c index 004e62f9..5ffaa646 100644 --- a/src/raddbg/raddbg.c +++ b/src/raddbg/raddbg.c @@ -221,7 +221,6 @@ update_and_render(OS_Handle repaint_window_handle, void *user_data) if(run_spec != spec) { params.cmd_spec = spec; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_CmdSpec); } U32 hit_char = os_codepoint_from_event_flags_and_key(event->flags, event->key); take = 1; @@ -245,7 +244,6 @@ update_and_render(OS_Handle repaint_window_handle, void *user_data) String8 insertion8 = str8_from_32(scratch.arena, insertion32); D_CmdSpec *spec = d_cmd_spec_from_kind(D_CmdKind_InsertText); params.string = insertion8; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_String); d_push_cmd__root(¶ms, spec); df_gfx_request_frame(); take = 1; diff --git a/src/raddbg/raddbg_main.c b/src/raddbg/raddbg_main.c index 3b7e4c72..0c67228c 100644 --- a/src/raddbg/raddbg_main.c +++ b/src/raddbg/raddbg_main.c @@ -367,7 +367,6 @@ entry_point(CmdLine *cmd_line) { D_CmdParams params = df_cmd_params_from_window(dst_window); params.string = error; - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_String); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_Error)); df_gfx_request_frame(); } @@ -376,7 +375,6 @@ entry_point(CmdLine *cmd_line) { D_CmdParams params = df_cmd_params_from_window(dst_window); params.string = push_str8f(scratch.arena, "\"%S\" is not a command.", cmd_spec_string); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_String); d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_Error)); df_gfx_request_frame(); } @@ -410,7 +408,6 @@ entry_point(CmdLine *cmd_line) { jit_attach = 0; D_CmdParams params = df_cmd_params_from_gfx(); - d_cmd_params_mark_slot(¶ms, D_CmdParamSlot_ID); params.id = jit_pid; d_push_cmd__root(¶ms, d_cmd_spec_from_kind(D_CmdKind_Attach)); }