fix array-index ir tree generation - was incorrectly applying array value rules to address value evaluations; plug in ir-generation hooks for slices, arrays, etc.; eliminate old view rule code

src/eval_visualization/eval_visualization_builtin_view_rules.c

@@ -1,106 +0,0 @@
-// Copyright (c) 2024 Epic Games Tools
-// Licensed under the MIT license (https://opensource.org/license/mit/)
-
-////////////////////////////////
-//~ rjf: View Rule Tree Info Extraction Helpers
-
-internal U64
-ev_base_offset_from_eval(E_Eval eval)
-{
-  if(e_type_kind_is_pointer_or_ref(e_type_kind_from_key(eval.type_key)))
-  {
-    eval = e_value_eval_from_eval(eval);
-  }
-  return eval.value.u64;
-}
-
-internal E_Value
-ev_value_from_params(MD_Node *params)
-{
-  Temp scratch = scratch_begin(0, 0);
-  String8 expr = md_string_from_children(scratch.arena, params);
-  E_Eval eval = e_eval_from_string(scratch.arena, expr);
-  E_Eval value_eval = e_value_eval_from_eval(eval);
-  scratch_end(scratch);
-  return value_eval.value;
-}
-
-internal E_TypeKey
-ev_type_key_from_params(MD_Node *params)
-{
-  Temp scratch = scratch_begin(0, 0);
-  String8 expr = md_string_from_children(scratch.arena, params);
-  E_TokenArray tokens = e_token_array_from_text(scratch.arena, expr);
-  E_Parse parse = e_parse_type_from_text_tokens(scratch.arena, expr, &tokens);
-  E_TypeKey type_key = e_type_from_expr(parse.last_expr);
-  scratch_end(scratch);
-  return type_key;
-}
-
-internal E_Value
-ev_value_from_params_key(MD_Node *params, String8 key)
-{
-  Temp scratch = scratch_begin(0, 0);
-  MD_Node *key_node = md_child_from_string(params, key, 0);
-  String8 expr = md_string_from_children(scratch.arena, key_node);
-  E_Eval eval = e_eval_from_string(scratch.arena, expr);
-  E_Eval value_eval = e_value_eval_from_eval(eval);
-  scratch_end(scratch);
-  return value_eval.value;
-}
-
-internal Rng1U64
-ev_range_from_eval_params(E_Eval eval, MD_Node *params)
-{
-  Temp scratch = scratch_begin(0, 0);
-  U64 size = ev_value_from_params_key(params, str8_lit("size")).u64;
-  E_TypeKey type_key = e_type_unwrap(eval.type_key);
-  E_TypeKind type_kind = e_type_kind_from_key(type_key);
-  E_TypeKey direct_type_key = e_type_unwrap(e_type_direct_from_key(eval.type_key));
-  E_TypeKind direct_type_kind = e_type_kind_from_key(direct_type_key);
-  if(size == 0 && e_type_kind_is_pointer_or_ref(type_kind) && (direct_type_kind == E_TypeKind_Struct ||
-                                                               direct_type_kind == E_TypeKind_Union ||
-                                                               direct_type_kind == E_TypeKind_Class ||
-                                                               direct_type_kind == E_TypeKind_Array))
-  {
-    size = e_type_byte_size_from_key(e_type_direct_from_key(e_type_unwrap(eval.type_key)));
-  }
-  if(size == 0 && eval.mode == E_Mode_Offset && (type_kind == E_TypeKind_Struct ||
-                                                 type_kind == E_TypeKind_Union ||
-                                                 type_kind == E_TypeKind_Class ||
-                                                 type_kind == E_TypeKind_Array))
-  {
-    size = e_type_byte_size_from_key(e_type_unwrap(eval.type_key));
-  }
-  if(size == 0)
-  {
-    size = 16384;
-  }
-  Rng1U64 result = {0};
-  result.min = ev_base_offset_from_eval(eval);
-  result.max = result.min + size;
-  scratch_end(scratch);
-  return result;
-}
-
-internal Arch
-ev_arch_from_eval_params(E_Eval eval, MD_Node *params)
-{
-  Arch arch = Arch_Null;
-  MD_Node *arch_node = md_child_from_string(params, str8_lit("arch"), 0);
-  String8 arch_kind_string = arch_node->first->string;
-  if(str8_match(arch_kind_string, str8_lit("x64"), StringMatchFlag_CaseInsensitive))
-  {
-    arch = Arch_x64;
-  }
-  return arch;
-}
-
-////////////////////////////////
-//~ rjf: "list"
-
-EV_EXPAND_RULE_INFO_FUNCTION_DEF(list)
-{
-  EV_ExpandInfo info = {0};
-  return info;
-}

src/eval_visualization/eval_visualization_builtin_view_rules.h

@@ -1,17 +0,0 @@
-// Copyright (c) 2024 Epic Games Tools
-// Licensed under the MIT license (https://opensource.org/license/mit/)
-
-#ifndef EVAL_VISUALIZATION_BUILTIN_VIEW_RULES_H
-#define EVAL_VISUALIZATION_BUILTIN_VIEW_RULES_H
-
-////////////////////////////////
-//~ rjf: View Rule Tree Info Extraction Helpers
-
-internal U64 ev_base_offset_from_eval(E_Eval eval);
-internal E_Value ev_value_from_params(MD_Node *params);
-internal E_TypeKey ev_type_key_from_params(MD_Node *params);
-internal E_Value ev_value_from_params_key(MD_Node *params, String8 key);
-internal Rng1U64 ev_range_from_eval_params(E_Eval eval, MD_Node *params);
-internal Arch ev_arch_from_eval_params(E_Eval eval, MD_Node *params);
-
-#endif // EVAL_VISUALIZATION_BUILTIN_VIEW_RULES_H

src/eval_visualization/eval_visualization_core.c

@@ -451,9 +451,8 @@ ev_keyed_expr_push_tags(Arena *arena, EV_View *view, EV_Block *block, EV_Key key
   {
     // rjf: push inherited tags first (we want these to be found first, since tags are applied
     // in order, and explicit ones should always be strongest)
-    for(EV_Block *b = block; b != &ev_nil_block; b = b->parent)
     {
-      for(E_Expr *src_tag = b->expr->first_tag; src_tag != &e_expr_nil; src_tag = src_tag->next)
+      for(E_Expr *src_tag = block->expr->first_tag; src_tag != &e_expr_nil; src_tag = src_tag->next)
       {
         e_expr_push_tag(expr, e_expr_copy(arena, src_tag));
       }

src/eval_visualization/eval_visualization_inc.c

@@ -2,4 +2,3 @@
 // Licensed under the MIT license (https://opensource.org/license/mit/)
 
 #include "eval_visualization_core.c"
-#include "eval_visualization_builtin_view_rules.c"

src/eval_visualization/eval_visualization_inc.h

@@ -5,6 +5,5 @@
 #define EVAL_VISUALIZATION_INC_H
 
 #include "eval_visualization_core.h"
-#include "eval_visualization_builtin_view_rules.h"
 
 #endif // EVAL_VISUALIZATION_INC_H