partial transition to new flexible watch table structure; more work on 'set' types; checkpoint before replacement of old view-rule-hacks with proper-eval-system support for sets/collections/etc.

Author: ryanfleury

src/eval_visualization/eval_visualization_builtin_view_rules.c

@@ -104,6 +104,7 @@ struct EV_DefaultExpandAccel
 {
   E_MemberArray members;
   E_EnumValArray enum_vals;
+  void *lookup_accel;
   U64 array_count;
   B32 array_need_extra_deref;
   B32 is_ptr2ptr;
@@ -174,6 +175,15 @@ EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_DEF(default)
     accel->is_ptr2ptr = 1;
   }
 
+  ////////////////////////////
+  //- rjf: sets -> expansions generate rows for all possible lookups
+  //
+  else if(type_kind == E_TypeKind_Set)
+  {
+    E_Type *type = e_type_from_key(scratch.arena, type_key);
+    //E_LookupRule *rule = e_lookup_rule_from_string(type->name);
+  }
+  
   ////////////////////////////
   //- rjf: package result
   //

src/eval_visualization/eval_visualization_core.c

@@ -115,6 +115,7 @@ ev_type_key_and_mode_is_expandable(E_TypeKey type_key, E_Mode mode)
        kind == E_TypeKind_Union ||
        kind == E_TypeKind_Class ||
        kind == E_TypeKind_Array ||
+       kind == E_TypeKind_Set ||
        (kind == E_TypeKind_Enum && mode == E_Mode_Null))
     {
       result = 1;

src/raddbg/generated/raddbg.meta.c

@@ -73,14 +73,15 @@ RD_VocabularyInfo rd_vocabulary_info_table[41] =
 {str8_lit_comp("label"), str8_lit_comp("labels"), str8_lit_comp("Label"), str8_lit_comp("Labels"), RD_IconKind_Null},
 };
 
-RD_CfgNameSchemaPair rd_cfg_name_schema_pair_table[6] =
+RD_CfgNameSchemaPair rd_cfg_name_schema_pair_table[7] =
 {
 {str8_lit_comp("settings"), str8_lit_comp("x:\n{\n  @default(1) 'hover_animations':     bool,\n  @default(1) 'press_animations':     bool,\n  @default(0) 'focus_animations':     bool,\n  @default(1) 'tooltip_animations':   bool,\n  @default(1) 'menu_animations':      bool,\n  @default(1) 'scrolling_animations': bool,\n  @default(1) 'background_blur':      bool,\n  @default(1) 'thread_lines':         bool,\n  @default(1) 'breakpoint_lines':     bool,\n  @default(1) 'thread_glow':          bool,\n  @default(1) 'breakpoint_glow':      bool,\n  @default(0) 'opaque_backgrounds':   bool,\n  @default(1) 'smooth_main_text':     bool,\n  @default(0) 'smooth_code_text':     bool,\n  @default(1) 'hint_main_text':       bool,\n  @default(1) 'hint_code_text':       bool,\n  @default(2) 'tab_width':      @range[1, 32] u64,\n  @can_be_per_window 'main_font_size': @range[6, 72] u64,\n  @can_be_per_window 'code_font_size': @range[1, 32] u64,\n}\n"), str8_lit_comp("")},
 {str8_lit_comp("target"), str8_lit_comp("x:\n{\n  'label':              code_string,\n  'executable':         path,\n  'arguments':          string,\n  'working_directory':  path,\n  'entry_point':        code_string,\n  'stdout_path':        path,\n  'stderr_path':        path,\n  'stdin_path':         path,\n  'debug_subprocesses': bool,\n}\n"), str8_lit_comp("launch_and_run,launch_and_init,select_cfg,remove_cfg")},
 {str8_lit_comp("breakpoint"), str8_lit_comp("x:\n{\n  'label':         code_string,\n  'condition':     code_string,\n  'location':      location,\n  'hit_count':     u64,\n  'disabled':      bool,\n}\n"), str8_lit_comp("enable_cfg,remove_cfg")},
 {str8_lit_comp("watch_pin"), str8_lit_comp("x:\n{\n  'expression': code_string,\n  'view_rule':  code_string,\n  'location':   location,\n}\n"), str8_lit_comp("remove_cfg")},
 {str8_lit_comp("file_path_map"), str8_lit_comp("x:{'source':path, 'dest':path}"), str8_lit_comp("remove_cfg")},
 {str8_lit_comp("auto_view_rule"), str8_lit_comp("x:{'source':code_string, 'dest':code_string}"), str8_lit_comp("remove_cfg")},
+{str8_lit_comp("watch"), str8_lit_comp("x:\n{\n  'expression': code_string,\n  'view_rule':  code_string,\n}\n"), str8_lit_comp("remove_cfg")},
 };
 
 String8 d_entity_kind_display_string_table[27] =
@@ -710,9 +711,8 @@ str8_lit_comp("5"),
 str8_lit_comp("c"),
 };
 
-String8 rd_collection_name_table[13] =
+String8 rd_collection_name_table[12] =
 {
-str8_lit_comp("watches"),
 str8_lit_comp("machines"),
 str8_lit_comp("processes"),
 str8_lit_comp("threads"),
@@ -727,9 +727,8 @@ str8_lit_comp("types"),
 str8_lit_comp("procedures"),
 };
 
-RD_EntityKind rd_collection_entity_kind_table[13] =
+RD_EntityKind rd_collection_entity_kind_table[12] =
 {
-RD_EntityKind_Watch,
 RD_EntityKind_Nil,
 RD_EntityKind_Nil,
 RD_EntityKind_Nil,
@@ -744,9 +743,8 @@ RD_EntityKind_Nil,
 RD_EntityKind_Nil,
 };
 
-CTRL_EntityKind rd_collection_ctrl_entity_kind_table[13] =
+CTRL_EntityKind rd_collection_ctrl_entity_kind_table[12] =
 {
-CTRL_EntityKind_Null,
 CTRL_EntityKind_Machine,
 CTRL_EntityKind_Process,
 CTRL_EntityKind_Thread,
@@ -761,9 +759,8 @@ CTRL_EntityKind_Null,
 CTRL_EntityKind_Null,
 };
 
-EV_ViewRuleExprExpandInfoHookFunctionType * rd_collection_expr_expand_info_hook_function_table[13] =
+EV_ViewRuleExprExpandInfoHookFunctionType * rd_collection_expr_expand_info_hook_function_table[12] =
 {
-EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_NAME(watches),
 EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_NAME(machines),
 EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_NAME(processes),
 EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_NAME(threads),
@@ -778,9 +775,8 @@ EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_NAME(types),
 EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_NAME(procedures),
 };
 
-EV_ViewRuleExprExpandRangeInfoHookFunctionType * rd_collection_expr_expand_range_info_hook_function_table[13] =
+EV_ViewRuleExprExpandRangeInfoHookFunctionType * rd_collection_expr_expand_range_info_hook_function_table[12] =
 {
-EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_NAME(watches),
 EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_NAME(machines),
 EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_NAME(processes),
 EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_NAME(threads),
@@ -795,9 +791,8 @@ EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_NAME(types),
 EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_NAME(procedures),
 };
 
-EV_ViewRuleExprExpandIDFromNumHookFunctionType * rd_collection_expr_expand_id_from_num_hook_function_table[13] =
+EV_ViewRuleExprExpandIDFromNumHookFunctionType * rd_collection_expr_expand_id_from_num_hook_function_table[12] =
 {
-EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_NAME(watches),
 EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_NAME(machines),
 EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_NAME(processes),
 EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_NAME(threads),
@@ -812,9 +807,8 @@ EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_NAME(types),
 EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_NAME(procedures),
 };
 
-EV_ViewRuleExprExpandIDFromNumHookFunctionType * rd_collection_expr_expand_num_from_id_hook_function_table[13] =
+EV_ViewRuleExprExpandIDFromNumHookFunctionType * rd_collection_expr_expand_num_from_id_hook_function_table[12] =
 {
-EV_VIEW_RULE_EXPR_EXPAND_NUM_FROM_ID_FUNCTION_NAME(watches),
 EV_VIEW_RULE_EXPR_EXPAND_NUM_FROM_ID_FUNCTION_NAME(machines),
 EV_VIEW_RULE_EXPR_EXPAND_NUM_FROM_ID_FUNCTION_NAME(processes),
 EV_VIEW_RULE_EXPR_EXPAND_NUM_FROM_ID_FUNCTION_NAME(threads),

src/raddbg/generated/raddbg.meta.h

@@ -651,7 +651,6 @@ RD_ViewRuleUIFunctionType *ui;
 .params_tree = rd_regs()->params_tree,\
 .os_event = rd_regs()->os_event,\
 
-EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_DEF(watches);
 EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_DEF(machines);
 EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_DEF(processes);
 EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_DEF(threads);
@@ -664,7 +663,6 @@ EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_DEF(globals);
 EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_DEF(thread_locals);
 EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_DEF(types);
 EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_DEF(procedures);
-EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_DEF(watches);
 EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_DEF(machines);
 EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_DEF(processes);
 EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_DEF(threads);
@@ -677,7 +675,6 @@ EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_DEF(globals);
 EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_DEF(thread_locals);
 EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_DEF(types);
 EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_DEF(procedures);
-EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_DEF(watches);
 EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_DEF(machines);
 EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_DEF(processes);
 EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_DEF(threads);
@@ -688,7 +685,6 @@ EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_DEF(globals);
 EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_DEF(thread_locals);
 EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_DEF(types);
 EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_DEF(procedures);
-EV_VIEW_RULE_EXPR_EXPAND_NUM_FROM_ID_FUNCTION_DEF(watches);
 EV_VIEW_RULE_EXPR_EXPAND_NUM_FROM_ID_FUNCTION_DEF(machines);
 EV_VIEW_RULE_EXPR_EXPAND_NUM_FROM_ID_FUNCTION_DEF(processes);
 EV_VIEW_RULE_EXPR_EXPAND_NUM_FROM_ID_FUNCTION_DEF(threads);
@@ -738,7 +734,7 @@ extern String8 rd_cfg_src_string_table[4];
 extern RD_CmdKind rd_cfg_src_load_cmd_kind_table[4];
 extern RD_CmdKind rd_cfg_src_write_cmd_kind_table[4];
 extern RD_VocabularyInfo rd_vocabulary_info_table[41];
-extern RD_CfgNameSchemaPair rd_cfg_name_schema_pair_table[6];
+extern RD_CfgNameSchemaPair rd_cfg_name_schema_pair_table[7];
 extern String8 d_entity_kind_display_string_table[27];
 extern String8 d_entity_kind_name_lower_table[27];
 extern String8 d_entity_kind_name_lower_plural_table[27];
@@ -749,13 +745,13 @@ extern RD_StringBindingPair rd_default_binding_table[110];
 extern String8 rd_binding_version_remap_old_name_table[8];
 extern String8 rd_binding_version_remap_new_name_table[8];
 extern String8 rd_icon_kind_text_table[69];
-extern String8 rd_collection_name_table[13];
-extern RD_EntityKind rd_collection_entity_kind_table[13];
-extern CTRL_EntityKind rd_collection_ctrl_entity_kind_table[13];
-extern EV_ViewRuleExprExpandInfoHookFunctionType * rd_collection_expr_expand_info_hook_function_table[13];
-extern EV_ViewRuleExprExpandRangeInfoHookFunctionType * rd_collection_expr_expand_range_info_hook_function_table[13];
-extern EV_ViewRuleExprExpandIDFromNumHookFunctionType * rd_collection_expr_expand_id_from_num_hook_function_table[13];
-extern EV_ViewRuleExprExpandIDFromNumHookFunctionType * rd_collection_expr_expand_num_from_id_hook_function_table[13];
+extern String8 rd_collection_name_table[12];
+extern RD_EntityKind rd_collection_entity_kind_table[12];
+extern CTRL_EntityKind rd_collection_ctrl_entity_kind_table[12];
+extern EV_ViewRuleExprExpandInfoHookFunctionType * rd_collection_expr_expand_info_hook_function_table[12];
+extern EV_ViewRuleExprExpandRangeInfoHookFunctionType * rd_collection_expr_expand_range_info_hook_function_table[12];
+extern EV_ViewRuleExprExpandIDFromNumHookFunctionType * rd_collection_expr_expand_id_from_num_hook_function_table[12];
+extern EV_ViewRuleExprExpandIDFromNumHookFunctionType * rd_collection_expr_expand_num_from_id_hook_function_table[12];
 extern RD_ViewRuleInfo rd_view_rule_kind_info_table[28];
 extern RD_IconKind rd_entity_kind_icon_kind_table[27];
 extern String8 rd_theme_preset_display_string_table[9];

src/raddbg/raddbg.mdesk

@@ -201,6 +201,19 @@ RD_VocabularyMap:
     ```x:{'source':code_string, 'dest':code_string}```,
     `remove_cfg`,
   }
+  
+  //- rjf: watches
+  {
+    watch,
+    ```x:
+    {
+      'expression': code_string,
+      'view_rule':  code_string,
+    }
+    ```,
+    `remove_cfg`,
+  }
+  
 }
 
 @struct RD_CfgNameSchemaPair:
@@ -993,7 +1006,7 @@ RD_IconTable:
 RD_CollectionTable:
 {
   //- rjf: frontend entity groups
-  {watches                        Watch            Null              x}
+  //{watches                        Watch            Null              x}
   //{targets                        Target           Null              x}
   //{breakpoints                    Breakpoint       Null              x}
   //{watch_pins                     WatchPin         Null              x}

src/raddbg/raddbg_core.c

@@ -9161,6 +9161,65 @@ EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_DEF(procedures)      {return rd_ev_
 EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_DEF(procedures)     {return rd_ev_view_rule_expr_id_from_num__debug_info_tables(num, user_data, RDI_SectionKind_Procedures); }
 EV_VIEW_RULE_EXPR_EXPAND_NUM_FROM_ID_FUNCTION_DEF(procedures)     {return rd_ev_view_rule_expr_num_from_id__debug_info_tables(id,  user_data, RDI_SectionKind_Procedures); }
 
+E_LOOKUP_INFO_FUNCTION_DEF(top_level_cfg)
+{
+  E_LookupInfo result = {0};
+  Temp scratch = scratch_begin(&arena, 1);
+  {
+    E_IRTreeAndType lhs_irtree = e_irtree_and_type_from_expr(scratch.arena, lhs);
+    E_TypeKey lhs_type_key = lhs_irtree.type_key;
+    E_Type *lhs_type = e_type_from_key(scratch.arena, lhs_type_key);
+    RD_CfgList cfgs_list = rd_cfg_top_level_list_from_string(scratch.arena, lhs_type->name);
+    RD_CfgArray *cfgs = push_array(arena, RD_CfgArray, 1);
+    cfgs[0] = rd_cfg_array_from_list(arena, &cfgs_list);
+    result.user_data = cfgs;
+    result.idxed_expr_count = cfgs_list.count;
+  }
+  scratch_end(scratch);
+  return result;
+}
+
+E_LOOKUP_FUNCTION_DEF(top_level_cfg)
+{
+  E_Lookup result = {{&e_irnode_nil}};
+  if(kind == E_ExprKind_ArrayIndex)
+  {
+    Temp scratch = scratch_begin(&arena, 1);
+    RD_CfgArray *cfgs = (RD_CfgArray *)user_data;
+    E_IRTreeAndType rhs_irtree = e_irtree_and_type_from_expr(scratch.arena, rhs);
+    E_OpList rhs_oplist = e_oplist_from_irtree(scratch.arena, rhs_irtree.root);
+    String8 rhs_bytecode = e_bytecode_from_oplist(scratch.arena, &rhs_oplist);
+    E_Interpretation rhs_interp = e_interpret(rhs_bytecode);
+    E_Value rhs_value = rhs_interp.value;
+    if(0 <= rhs_value.u64 && rhs_value.u64 < cfgs->count)
+    {
+      RD_Cfg *cfg = cfgs->v[rhs_value.u64];
+      E_Space cfg_space = rd_eval_space_from_cfg(cfg);
+      String8 cfg_name = cfg->string;
+      E_TypeKey cfg_type_key = {0};
+      {
+        U64 hash = d_hash_from_string(cfg_name);
+        U64 slot_idx = hash%rd_state->cfg_string2typekey_map->slots_count;
+        for(RD_String2TypeKeyNode *n = rd_state->cfg_string2typekey_map->slots[slot_idx].first;
+            n != 0;
+            n = n->next)
+        {
+          if(str8_match(n->string, cfg_name, 0))
+          {
+            cfg_type_key = n->key;
+            break;
+          }
+        }
+      }
+      result.irtree_and_type.root      = e_irtree_set_space(arena, cfg_space, e_irtree_const_u(arena, 0));
+      result.irtree_and_type.type_key  = cfg_type_key;
+      result.irtree_and_type.mode      = E_Mode_Offset;
+    }
+    scratch_end(scratch);
+  }
+  return result;
+}
+
 internal EV_ExpandInfo
 rd_ev_view_rule_expr_expand_info__meta_entities(Arena *arena, EV_View *view, String8 filter, E_Expr *expr, MD_Node *params, RD_EntityKind kind)
 {
@@ -13104,6 +13163,7 @@ rd_frame(void)
       //- rjf: choose set of evallable config names
       String8 evallable_cfg_names[] =
       {
+        str8_lit("watch"),
         str8_lit("breakpoint"),
         str8_lit("watch_pin"),
         str8_lit("target"),
@@ -13208,10 +13268,10 @@ rd_frame(void)
       for EachElement(idx, evallable_cfg_names)
       {
         String8 name = evallable_cfg_names[idx];
-        RD_CfgList cfgs = rd_cfg_top_level_list_from_string(scratch.arena, name);
-        for(RD_CfgNode *n = cfgs.first; n != 0; n = n->next)
+        RD_CfgArray cfgs = rd_state->eval_collection_cfgs[idx];
+        for EachIndex(cfg_idx, cfgs.count)
         {
-          RD_Cfg *cfg = n->v;
+          RD_Cfg *cfg = cfgs.v[cfg_idx];
           String8 label = rd_cfg_child_from_string(cfg, str8_lit("label"))->first->string;
           String8 exe   = rd_cfg_child_from_string(cfg, str8_lit("executable"))->first->string;
           E_Space space = rd_eval_space_from_cfg(cfg);
@@ -13293,7 +13353,7 @@ rd_frame(void)
         expr->mode     = E_Mode_Offset;
         expr->type_key = collection_type_key;
         e_string2expr_map_insert(scratch.arena, ctx->macro_map, collection_name, expr);
-        // TODO(rjf): e_lookup_rule_map_insert_new(scratch.arena, ctx->lookup_rule_map, collection_name, );
+        e_lookup_rule_map_insert_new(scratch.arena, ctx->lookup_rule_map, collection_name, E_LOOKUP_INFO_FUNCTION_NAME(top_level_cfg), E_LOOKUP_FUNCTION_NAME(top_level_cfg));
       }
 
       //- rjf: add macro for output log

src/raddbg/raddbg_core.h

@@ -1333,6 +1333,9 @@ internal void rd_window_frame(void);
 ////////////////////////////////
 //~ rjf: Eval Visualization
 
+E_LOOKUP_INFO_FUNCTION_DEF(top_level_cfg);
+E_LOOKUP_FUNCTION_DEF(top_level_cfg);
+
 internal EV_ExpandInfo      rd_ev_view_rule_expr_expand_info__meta_entities(Arena *arena, EV_View *view, String8 filter, E_Expr *expr, MD_Node *params, RD_EntityKind kind);
 internal EV_ExpandRangeInfo rd_ev_view_rule_expr_expand_range_info__meta_entities(Arena *arena, EV_View *view, String8 filter, E_Expr *expr, MD_Node *params, Rng1U64 idx_range, void *user_data, RD_EntityKind kind, B32 add_new_at_top);
 internal U64                rd_ev_view_rule_expr_id_from_num__meta_entities(U64 num, void *user_data, RD_EntityKind kind, B32 add_new_at_top);

src/raddbg/raddbg_main.c

@@ -596,6 +596,14 @@ entry_point(CmdLine *cmd_line)
         rd_init(cmd_line);
       }
 
+      //- TODO(rjf): @cfg set up debugging config state
+      {
+        RD_Cfg *user = rd_cfg_child_from_string(rd_state->root_cfg, str8_lit("user"));
+        RD_Cfg *watch = rd_cfg_new(user, str8_lit("watch"));
+        RD_Cfg *expr = rd_cfg_new(watch, str8_lit("expression"));
+        rd_cfg_new(expr, str8_lit("basics"));
+      }
+      
       //- rjf: setup initial target from command line args
       {
         String8List args = cmd_line->inputs;