ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-07-01 07:31:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

eval value array indexing; type-only evaluation of array indexing and member accesses; various fixes

Browse Source
This commit is contained in:
Ryan Fleury
2024-08-20 16:13:01 -07:00
parent 156a94b286
commit 4611ddb536
11 changed files with 130 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eval/eval_interpret.c
+11
View File
@@ -769,6 +769,17 @@ e_interpret(String8 bytecode)
goto done;
}
}break;
case RDI_EvalOp_ValueRead:
{
U64 bytes_to_read = imm;
U64 offset = svals[0].u64;
if(offset + bytes_to_read <= sizeof(E_Value))
{
E_Value src_val = svals[1];
MemoryCopy(&nval.u512[0], (U8 *)(&src_val.u512[0]) + offset, bytes_to_read);
}
}break;
}
// rjf: push
src/eval/eval_ir.c
+68 -37
View File
@@ -418,7 +418,7 @@ e_irtree_and_type_from_expr(Arena *arena, E_Expr *expr)
e_msg_list_concat_in_place(&result.msgs, &r.msgs);
// rjf: bad conditions? -> error if applicable, exit
if(l.root->op == 0 || r.root->op == 0)
if(r.root->op == 0)
{
break;
}
@@ -444,31 +444,63 @@ e_irtree_and_type_from_expr(Arena *arena, E_Expr *expr)
}
// rjf: generate
E_IRNode *new_tree = &e_irnode_nil;
{
// rjf: ops to compute the index
E_IRNode *index_tree = e_irtree_resolve_to_value(arena, r.space, r.mode, r.root, r_restype);
if(direct_type_size > 1)
switch(l.mode)
{
E_IRNode *const_tree = e_irtree_const_u(arena, direct_type_size);
index_tree = e_irtree_binary_op_u(arena, RDI_EvalOp_Mul, index_tree, const_tree);
// rjf: null (types) -> just resolve to new type
case E_Mode_Null:
{
}break;
// rjf: offsets -> read from base offset
default:
case E_Mode_Offset:
{
// rjf: ops to compute the offset
E_IRNode *offset_tree = e_irtree_resolve_to_value(arena, r.space, r.mode, r.root, r_restype);
if(direct_type_size > 1)
{
E_IRNode *const_tree = e_irtree_const_u(arena, direct_type_size);
offset_tree = e_irtree_binary_op_u(arena, RDI_EvalOp_Mul, offset_tree, const_tree);
}
// rjf: ops to compute the base offset (resolve to value if addr-of-pointer)
E_IRNode *base_tree = l.root;
if(l_restype_kind == E_TypeKind_Ptr && l.mode != E_Mode_Value)
{
base_tree = e_irtree_resolve_to_value(arena, l.space, l.mode, base_tree, l_restype);
}
// rjf: ops to compute the final address
new_tree = e_irtree_binary_op_u(arena, RDI_EvalOp_Add, offset_tree, base_tree);
}break;
// rjf: values -> read from stack value
case E_Mode_Value:
{
// rjf: ops to compute the offset
E_IRNode *offset_tree = e_irtree_resolve_to_value(arena, r.space, r.mode, r.root, r_restype);
if(direct_type_size > 1)
{
E_IRNode *const_tree = e_irtree_const_u(arena, direct_type_size);
offset_tree = e_irtree_binary_op_u(arena, RDI_EvalOp_Mul, offset_tree, const_tree);
}
// rjf: ops to push stack value, push offset, + read from stack value
new_tree = e_push_irnode(arena, RDI_EvalOp_ValueRead);
new_tree->u64 = direct_type_size;
e_irnode_push_child(new_tree, offset_tree);
e_irnode_push_child(new_tree, l.root);
}break;
}
// rjf: ops to compute the base address (resolve to value if addr-of-pointer)
E_IRNode *base_tree = l.root;
if(l_restype_kind == E_TypeKind_Ptr && l.mode != E_Mode_Value)
{
base_tree = e_irtree_resolve_to_value(arena, l.space, l.mode, base_tree, l_restype);
}
// rjf: ops to compute the final address
E_IRNode *new_tree = e_irtree_binary_op_u(arena, RDI_EvalOp_Add, index_tree, base_tree);
// rjf: fill
result.root = new_tree;
result.type_key = direct_type;
result.mode = E_Mode_Offset;
result.space = l.space;
}
// rjf: fill
result.root = new_tree;
result.type_key = direct_type;
result.mode = l.mode;
result.space = l.space;
}break;
//- rjf: member accesses
@@ -522,11 +554,7 @@ e_irtree_and_type_from_expr(Arena *arena, E_Expr *expr)
}
// rjf: bad conditions? -> error if applicable, exit
if(l.root->op == 0)
{
break;
}
else if(e_type_key_match(e_type_key_zero(), check_type_key))
if(e_type_key_match(e_type_key_zero(), check_type_key))
{
break;
}
@@ -553,17 +581,20 @@ e_irtree_and_type_from_expr(Arena *arena, E_Expr *expr)
// rjf: build tree
E_IRNode *new_tree = l.root;
E_Mode mode = l.mode;
if(l_restype_kind == E_TypeKind_Ptr ||
l_restype_kind == E_TypeKind_LRef ||
l_restype_kind == E_TypeKind_RRef)
if(l.root != &e_irnode_nil)
{
new_tree = e_irtree_resolve_to_value(arena, l.space, l.mode, new_tree, l_restype);
mode = E_Mode_Offset;
}
if(r_off != 0)
{
E_IRNode *const_tree = e_irtree_const_u(arena, r_off);
new_tree = e_irtree_binary_op_u(arena, RDI_EvalOp_Add, new_tree, const_tree);
if(l_restype_kind == E_TypeKind_Ptr ||
l_restype_kind == E_TypeKind_LRef ||
l_restype_kind == E_TypeKind_RRef)
{
new_tree = e_irtree_resolve_to_value(arena, l.space, l.mode, new_tree, l_restype);
mode = E_Mode_Offset;
}
if(r_off != 0)
{
E_IRNode *const_tree = e_irtree_const_u(arena, r_off);
new_tree = e_irtree_binary_op_u(arena, RDI_EvalOp_Add, new_tree, const_tree);
}
}
// rjf: fill
src/eval/eval_types.c
+3 -2
View File
@@ -1406,7 +1406,7 @@ e_type_data_members_from_key(Arena *arena, E_TypeKey key)
padding_member->kind = E_MemberKind_Padding;
padding_member->type_key = e_type_key_cons_array(e_type_key_basic(E_TypeKind_U8), n->size);
padding_member->off = n->off;
padding_member->name = str8_lit("padding");
padding_member->name = push_str8f(arena, "[padding %I64u]", padding_idx);
padding_idx += 1;
}
members = new_members;
@@ -1422,7 +1422,8 @@ e_type_member_from_array_name(E_MemberArray *members, String8 name)
E_Member *member = 0;
for(U64 idx = 0; idx < members->count; idx += 1)
{
if(members->v[idx].kind == E_MemberKind_DataField &&
if((members->v[idx].kind == E_MemberKind_DataField ||
members->v[idx].kind == E_MemberKind_Padding) &&
str8_match(members->v[idx].name, name, 0))
{
member = &members->v[idx];