mirror of
https://github.com/Ed94/raddebugger.git
synced 2026-08-01 11:48:10 +00:00
move member lookup paths to using eval type member cache
This commit is contained in:
+20
-26
@@ -230,37 +230,31 @@ e_member_eval_from_eval_member_name(E_Eval eval, String8 member_name)
|
||||
{
|
||||
E_Eval result = {0};
|
||||
{
|
||||
Temp scratch = scratch_begin(0, 0);
|
||||
E_MemberArray members = e_type_data_members_from_key(scratch.arena, eval.type_key);
|
||||
for(U64 member_idx = 0; member_idx < members.count; member_idx += 1)
|
||||
E_Member member = e_type_member_from_key_name__cached(eval.type_key, member_name);
|
||||
if(member.kind != E_MemberKind_Null)
|
||||
{
|
||||
E_Member *member = &members.v[member_idx];
|
||||
if(str8_match(member->name, member_name, 0))
|
||||
result.mode = eval.mode;
|
||||
result.space = eval.space;
|
||||
result.type_key = member.type_key;
|
||||
result.code = eval.code;
|
||||
result.msgs = eval.msgs;
|
||||
switch(eval.mode)
|
||||
{
|
||||
result.mode = eval.mode;
|
||||
result.space = eval.space;
|
||||
result.type_key = member->type_key;
|
||||
result.code = eval.code;
|
||||
result.msgs = eval.msgs;
|
||||
switch(eval.mode)
|
||||
default:{}break;
|
||||
case E_Mode_Value:
|
||||
if(member.off < sizeof(eval.value))
|
||||
{
|
||||
default:{}break;
|
||||
case E_Mode_Value:
|
||||
if(member->off < sizeof(eval.value))
|
||||
{
|
||||
U64 member_size = e_type_byte_size_from_key(member->type_key);
|
||||
MemoryCopy((U8 *)(&result.value.u512[0]),
|
||||
(U8 *)(&eval.value.u512[0]) + member->off,
|
||||
Min(member_size, sizeof(eval.value) - member->off));
|
||||
}break;
|
||||
case E_Mode_Offset:
|
||||
{
|
||||
result.value.u64 = eval.value.u64 + member->off;
|
||||
}break;
|
||||
}
|
||||
U64 member_size = e_type_byte_size_from_key(member.type_key);
|
||||
MemoryCopy((U8 *)(&result.value.u512[0]),
|
||||
(U8 *)(&eval.value.u512[0]) + member.off,
|
||||
Min(member_size, sizeof(eval.value) - member.off));
|
||||
}break;
|
||||
case E_Mode_Offset:
|
||||
{
|
||||
result.value.u64 = eval.value.u64 + member.off;
|
||||
}break;
|
||||
}
|
||||
}
|
||||
scratch_end(scratch);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
+5
-19
@@ -523,28 +523,14 @@ e_irtree_and_type_from_expr(Arena *arena, E_Expr *expr)
|
||||
B32 r_is_constant_value = 0;
|
||||
{
|
||||
Temp scratch = scratch_begin(&arena, 1);
|
||||
E_MemberArray check_type_members = e_type_data_members_from_key(scratch.arena, check_type_key);
|
||||
E_Member *match = 0;
|
||||
for(U64 member_idx = 0; member_idx < check_type_members.count; member_idx += 1)
|
||||
{
|
||||
E_Member *member = &check_type_members.v[member_idx];
|
||||
if(str8_match(member->name, exprr->string, 0))
|
||||
{
|
||||
match = member;
|
||||
break;
|
||||
}
|
||||
else if(str8_match(member->name, exprr->string, StringMatchFlag_CaseInsensitive))
|
||||
{
|
||||
match = member;
|
||||
}
|
||||
}
|
||||
if(match != 0)
|
||||
E_Member match = e_type_member_from_key_name__cached(check_type_key, exprr->string);
|
||||
if(match.kind != E_MemberKind_Null)
|
||||
{
|
||||
r_found = 1;
|
||||
r_type = match->type_key;
|
||||
r_value = match->off;
|
||||
r_type = match.type_key;
|
||||
r_value = match.off;
|
||||
}
|
||||
if(match == 0)
|
||||
if(match.kind == E_MemberKind_Null)
|
||||
{
|
||||
E_Type *type = e_type_from_key(scratch.arena, check_type_key);
|
||||
if(type->enum_vals != 0)
|
||||
|
||||
@@ -1874,7 +1874,7 @@ e_type_member_from_key_name__cached(E_TypeKey key, String8 name)
|
||||
{
|
||||
E_Member result = {0};
|
||||
E_MemberCacheNode *node = e_member_cache_node_from_type_key(key);
|
||||
if(node != 0)
|
||||
if(node != 0 && node->member_hash_slots_count != 0)
|
||||
{
|
||||
U64 hash = e_hash_from_string(5381, name);
|
||||
U64 slot_idx = hash%node->member_hash_slots_count;
|
||||
|
||||
Reference in New Issue
Block a user