Skip to content

(#454) Implement local variable reading #473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rexim merged 1 commit into from
Jun 25, 2021
Merged

(#454) Implement local variable reading #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 23 additions & 28 deletions bang/src/bang_compiler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,28 +135,35 @@ void compile_typed_write(Basm *basm, Bang_Type type)
basm_push_inst(basm, bang_type_def(type).write, word_u64(0));
}

Bang_Type compile_var_read_into_basm(Bang *bang, Basm *basm, Bang_Var_Read var_read)
void compile_get_var_addr(Bang *bang, Basm *basm, Compiled_Var *var)
{
Compiled_Var *var = bang_get_compiled_var_by_name(bang, var_read.name);
if (var == NULL) {
fprintf(stderr, Bang_Loc_Fmt": ERROR: could not read non-existing variable `"SV_Fmt"`\n",
Bang_Loc_Arg(var_read.loc),
SV_Arg(var_read.name));
exit(1);
}

switch (var->storage) {
case BANG_VAR_STATIC_STORAGE: {
basm_push_inst(basm, INST_PUSH, word_u64(var->addr));
compile_typed_read(basm, var->type);
}
break;

case BANG_VAR_STACK_STORAGE: {
assert(false && "TODO(#454): reading stack variables is not implemented");
compile_read_frame_addr(bang, basm);
basm_push_inst(basm, INST_PUSH, word_u64(var->addr));
basm_push_inst(basm, INST_MINUSI, word_u64(0));
}
break;
}
}

Bang_Type compile_var_read_into_basm(Bang *bang, Basm *basm, Bang_Var_Read var_read)
{
Compiled_Var *var = bang_get_compiled_var_by_name(bang, var_read.name);
if (var == NULL) {
fprintf(stderr, Bang_Loc_Fmt": ERROR: could not read non-existing variable `"SV_Fmt"`\n",
Bang_Loc_Arg(var_read.loc),
SV_Arg(var_read.name));
exit(1);
}

compile_get_var_addr(bang, basm, var);
compile_typed_read(basm, var->type);

return var->type;
}
Expand Down Expand Up @@ -460,13 +467,13 @@ Compiled_Var *bang_get_compiled_var_by_name(Bang *bang, String_View name)
return NULL;
}

static void compile_read_frame_addr(Bang *bang, Basm *basm)
void compile_read_frame_addr(Bang *bang, Basm *basm)
{
basm_push_inst(basm, INST_PUSH, word_u64(bang->stack_frame_var_addr));
basm_push_inst(basm, INST_READ64U, word_u64(0));
}

static void compile_write_frame_addr(Bang *bang, Basm *basm)
void compile_write_frame_addr(Bang *bang, Basm *basm)
{
basm_push_inst(basm, INST_PUSH, word_u64(bang->stack_frame_var_addr));
basm_push_inst(basm, INST_SWAP, word_u64(1));
Expand All @@ -483,19 +490,7 @@ void compile_bang_var_assign_into_basm(Bang *bang, Basm *basm, Bang_Var_Assign v
exit(1);
}

switch (var->storage) {
case BANG_VAR_STATIC_STORAGE: {
basm_push_inst(basm, INST_PUSH, word_u64(var->addr));
}
break;

case BANG_VAR_STACK_STORAGE: {
compile_read_frame_addr(bang, basm);
basm_push_inst(basm, INST_PUSH, word_u64(var->addr));
basm_push_inst(basm, INST_MINUSI, word_u64(0));
}
break;
}
compile_get_var_addr(bang, basm, var);

Compiled_Expr expr = compile_bang_expr_into_basm(bang, basm, var_assign.value);
if (expr.type != var->type) {
Expand Down Expand Up @@ -775,7 +770,7 @@ void compile_stack_var_def_into_basm(Bang *bang, Bang_Var_Def var_def)
bang_scope_push_var(bang->scope, new_var);
}

static void compile_push_new_frame(Bang *bang, Basm *basm)
void compile_push_new_frame(Bang *bang, Basm *basm)
{
// 1. read frame addr
compile_read_frame_addr(bang, basm);
Expand All @@ -797,7 +792,7 @@ static void compile_push_new_frame(Bang *bang, Basm *basm)
compile_write_frame_addr(bang, basm);
}

static void compile_pop_frame(Bang *bang, Basm *basm)
void compile_pop_frame(Bang *bang, Basm *basm)
{
// 1. read frame addr
compile_read_frame_addr(bang, basm);
Expand Down
5 changes: 5 additions & 0 deletions bang/src/bang_compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ void compile_static_var_def_into_basm(Bang *bang, Basm *basm, Bang_Var_Def var_d
void compile_stack_var_def_into_basm(Bang *bang, Bang_Var_Def var_def);
Bang_Type compile_var_read_into_basm(Bang *bang, Basm *basm, Bang_Var_Read var_read);
Bang_Type compile_binary_op_into_basm(Bang *bang, Basm *basm, Bang_Binary_Op binary_op);
void compile_get_var_addr(Bang *bang, Basm *basm, Compiled_Var *var);
void compile_read_frame_addr(Bang *bang, Basm *basm);
void compile_write_frame_addr(Bang *bang, Basm *basm);
void compile_push_new_frame(Bang *bang, Basm *basm);
void compile_pop_frame(Bang *bang, Basm *basm);

void bang_push_new_scope(Bang *bang, Basm *basm);
void bang_pop_scope(Bang *bang, Basm *basm);
Expand Down