Skip to content

Fix op #62

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
shenao78 merged 2 commits into from
Sep 27, 2021
Merged

Fix op #62

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75d1760
fix var index op
boomyl Sep 27, 2021
27772a5
fix assign op
boomyl Sep 27, 2021
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: 39 additions & 12 deletions compiler/codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ generate_pop_to_identifier(SVM_Executable *cf, Declaration *decl,
return;
}

int depth = ob->pc - decl->pc - 1;
int depth = ob->pc - decl->variable_index - 1;
switch (depth) {
case 0:
generate_code(ob, OP_DUP);
Expand All @@ -348,6 +348,7 @@ generate_pop_to_identifier(SVM_Executable *cf, Declaration *decl,
break;
default:
generate_int_expression(NULL, depth, ob);
ob->pc--;
generate_code(ob, OP_PICK);
break;
}
Expand All @@ -367,8 +368,27 @@ generate_assign_statement(SVM_Executable *exe, Block *block,
AssignStatement *assign_stmt,
OpcodeBuf *ob)
{
Declaration *decl = assign_stmt->left->u.identifier->u.declaration;

int depth = ob->pc - decl->pc - 1;
switch (depth) {
case 0:
break;
case 1:
generate_code(ob, OP_SWAP);
break;
default:
generate_int_expression(exe, depth, ob);
ob->pc--;
generate_code(ob, OP_ROLL);
break;
}

generate_code(ob, OP_DROP);

decl->pc = ob->pc;

generate_expression(exe, block, assign_stmt->operand, ob);
generate_pop_to_lvalue(exe, block, assign_stmt->left, ob);

}

Expand Down Expand Up @@ -406,6 +426,7 @@ generate_if_statement(SVM_Executable *exe, Block *block,
generate_code(ob, OP_NOP);
generate_code(ob, OP_JUMPIF);
generate_label_code(ob, if_false_label);
ob->pc -= 6;

generate_statement_list(exe, if_s->then_block,
if_s->then_block->statement_list, ob);
Expand All @@ -414,6 +435,7 @@ generate_if_statement(SVM_Executable *exe, Block *block,
generate_code(ob, OP_JUMP);
generate_label_code(ob, end_label);
set_label(ob, if_false_label);
ob->pc -= 2;

for (elseif = if_s->elseif_list; elseif; elseif = elseif->next) {
generate_expression(exe, block, elseif->condition, ob);
Expand All @@ -422,12 +444,13 @@ generate_if_statement(SVM_Executable *exe, Block *block,
generate_code(ob, OP_NOT);
generate_code(ob, OP_JUMPIF);
generate_label_code(ob, if_false_label);

ob->pc -= 3;
generate_statement_list(exe, elseif->block,
elseif->block->statement_list, ob);

generate_label_code(ob, end_label);
generate_code(ob, OP_JUMP);
ob->pc -= 2;
set_label(ob, if_false_label);
}
if (if_s->else_block) {
Expand All @@ -452,7 +475,7 @@ generate_initializer(SVM_Executable *exe, Block *current_block,
OpcodeBuf *ob)
{
generate_expression(exe, current_block, decl_stmt->initializer, ob);
generate_pop_to_identifier(exe, decl_stmt, ob);
decl_stmt->pc = ob->pc;
}

static void
Expand Down Expand Up @@ -508,23 +531,23 @@ generate_double_expression(SVM_Executable *cf, Expression *expr,

static void
generate_identifier(SVM_Executable *cf, IdentifierExpression *identifier_expr,
OpcodeBuf *ob)
OpcodeBuf *ob, int64_t identifier_pc)
{
Declaration *decl = identifier_expr->u.declaration;
if (!decl->is_local) {
OpcodeBuf *ob_alt = cf->ob_alt;
for(int i = 0; i <= ob_alt->pc - decl->variable_index; i++) {
for(int i = 0; i <= ob_alt->pc - identifier_pc; i++) {
generate_code(ob, OP_FROMALTSTACK);
}
generate_code(ob, OP_DUP);
for(int i = 0; i <= ob_alt->pc - decl->variable_index; i++) {
for(int i = 0; i <= ob_alt->pc - identifier_pc; i++) {
generate_code(ob, OP_SWAP);
generate_code(ob, OP_TOALTSTACK);
}
return;
}

int depth = ob->pc - decl->pc - 1;
int depth = ob->pc - identifier_pc - 1;
switch (depth) {
case 0:
generate_code(ob, OP_DUP);
Expand All @@ -534,11 +557,12 @@ generate_identifier(SVM_Executable *cf, IdentifierExpression *identifier_expr,
break;
default:
generate_int_expression(NULL, depth, ob);
ob->pc--;
generate_code(ob, OP_PICK);
break;
}

decl->pc = ob->size;
decl->pc = ob->pc;
}

static void
Expand All @@ -547,18 +571,21 @@ generate_identifier_expression(SVM_Executable *exe, Block *block,
{
switch (expr->kind) {
case DECLARATION_DEFINITION:
generate_identifier(exe, expr->u.identifier, ob);
generate_identifier(exe, expr->u.identifier, ob,
expr->u.identifier->u.declaration->variable_index);
break;
case FUNC_DEFINITION:
generate_code(ob, OP_INVOKE);
break;
case CONST_DEFINITION:
generate_identifier(exe, expr->u.identifier, ob);
generate_identifier(exe, expr->u.identifier, ob,
expr->u.identifier->u.declaration->variable_index);
break;
case STRUCT_DEFINITION:
break;
case IDENTIFIER_EXPRESSION:
generate_identifier(exe, expr->u.identifier, ob);
generate_identifier(exe, expr->u.identifier, ob,
expr->u.identifier->u.declaration->pc);
break;
default:
printf("bad default. kind..%d", expr->kind);
Expand Down