Skip to content

remove redudant asm #2

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

remove redudant asm #2

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
2 changes: 1 addition & 1 deletion silc/include/silc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ extern int yydebug;
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
union YYSTYPE
{
#line 149 "./src/silc.y"
#line 143 "./src/silc.y"

tnode *no;
char *name;
Expand Down
35 changes: 16 additions & 19 deletions silc/src/evaluators.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ reg_index getAddress(tnode* root, Frame* frame, FILE* out) {
if (sym) { // local variable
binding = sym->binding;
reg_index mem = getReg(frame);
reg_index tmp = getReg(frame);
fprintf(out, "MOV R%d, BP\nADD R%d, %d\n", mem, mem, binding);
int idx = 0;
char* tok;
Expand All @@ -32,8 +31,8 @@ reg_index getAddress(tnode* root, Frame* frame, FILE* out) {
field = getField(tok, lst);
if (field)
lst = field->type ? field->type->fields : field->class->fields;
fprintf(out, "MOV R%d, [R%d]\nMOV R%d, R%d\nADD R%d, %d\n", tmp, mem,
mem, tmp, mem, idx);
fprintf(out, "MOV R%d, [R%d]\nADD R%d, %d\n", mem, mem,
mem, idx);
}
} else {
LinkedList* lst = sym->type ? sym->type->fields : sym->class->fields;
Expand All @@ -42,18 +41,16 @@ reg_index getAddress(tnode* root, Frame* frame, FILE* out) {
field = getField(tok, lst);
if (field)
lst = field->type ? field->type->fields : field->class->fields;
fprintf(out, "MOV R%d, [R%d]\nMOV R%d, R%d\nADD R%d, %d\n", tmp, mem,
mem, tmp, mem, idx);
fprintf(out, "MOV R%d, [R%d]\nADD R%d, %d\n", mem, mem,
mem, idx);
}
}
freeReg(frame);
return mem;
} else {
sym = searchSymbol(name, GSymList);
if (sym) { // global variable
binding = sym->binding;
reg_index mem = getReg(frame);
reg_index tmp = getReg(frame);
int idx = 0;
char* tok;
fprintf(out, "MOV R%d, %d\n", mem, binding);
Expand All @@ -68,11 +65,10 @@ reg_index getAddress(tnode* root, Frame* frame, FILE* out) {
if (field)
lst = lst =
field->type ? field->type->fields : field->class->fields;
fprintf(out, "MOV R%d, [R%d]\nMOV R%d, R%d\nADD R%d, %d\n", tmp, mem,
mem, tmp, mem, idx);
fprintf(out, "MOV R%d, [R%d]\nADD R%d, %d\n", mem, mem,
mem, idx);
}
}
freeReg(frame);
return mem;
} else {
printf("%s:", root->varname);
Expand Down Expand Up @@ -236,7 +232,8 @@ void eval_assgn(tnode* root, Frame* frame, FILE* out) {
right = eval_new(root->right, frame, out);
int idx = searchClass(root->right->varname, ClassList)->idx;
reg_index vtp = getReg(frame);
fprintf(out, "MOV R%d, R%d\nADD R%d, 1\nMOV [R%d], %d\n", vtp, binding, vtp,
//Also add the virtual table pointer
fprintf(out, "MOV R%d, R%d\nADD R%d, 1\nMOV [R%d], %d\n", vtp, binding, vtp,
vtp, idx * 8 + 4096);
freeReg(frame);
} else if (root->right->varclass) {
Expand All @@ -247,6 +244,7 @@ void eval_assgn(tnode* root, Frame* frame, FILE* out) {
if (root->right->varclass) {
reg_index vtp = getReg(frame);
reg_index rightvte = getReg(frame);
//replace the virutal table pointer
fprintf(out, "MOV R%d, R%d\nADD R%d, 1\nMOV R%d, [R%d]\n", vtp, right, vtp,
rightvte, vtp);
fprintf(out, "MOV R%d, R%d\nADD R%d, 1\nMOV [R%d], R%d\n", vtp, binding,
Expand All @@ -256,6 +254,7 @@ void eval_assgn(tnode* root, Frame* frame, FILE* out) {
fprintf(out, "MOV [R%d], R%d\n", binding, vtp);
freeReg(frame);
freeReg(frame);
freeReg(frame);
return;
}
fprintf(out, "MOV [R%d], R%d\n", binding, right);
Expand Down Expand Up @@ -341,16 +340,14 @@ reg_index call_method(tnode* root, Frame* frame, FILE* out) {
if (field)
lst = field->class->fields;
}
char* callname = (char*)malloc(
sizeof(field ? field->class->name : sym->class->name) + 2 + sizeof(s));
ClassDef* class =
searchClass(field ? field->class->name : sym->class->name, ClassList);
int reg = pushRegToStack(frame, out);
pushArgToStack(root->left, frame, out);
reg_index self = getAddress(root, frame, out);
fprintf(out, "PUSH R%d\n", self); // Push self pointer as an argument
fprintf(out, "MOV R%d, %d\nPUSH R%d\n", self, class->idx * 8 + 4096,
self); // Push self pointer as an argument
self); // Push virtual table pointer as an argument
freeReg(frame);
reg_index tmp = getReg(frame);
fprintf(out, "PUSH R%d\n", tmp);
Expand All @@ -366,10 +363,10 @@ reg_index call_method(tnode* root, Frame* frame, FILE* out) {
reg_index vte = getReg(frame);
fprintf(out, "ADD R%d, 1\nMOV R%d, [R%d]\n", addr, vte, addr);
fprintf(out, "ADD R%d, %d\n", vte, searchMethod(prev, class->methods)->idx);
freeReg(frame);
freeReg(frame);
fprintf(out, "MOV R%d, [R%d]\n", addr, vte);
fprintf(out, "CALL R%d\n", addr);
freeReg(frame);
freeReg(frame);
tmp = getReg(frame);
fprintf(out, "POP R%d\n", tmp);
popArgFromStack(root->left, frame, out);
Expand Down Expand Up @@ -454,12 +451,12 @@ void pushArgToStack(tnode* root, Frame* frame, FILE* out) {
return;
}
if (root->type == FUNC) {
fprintf(out, "PUSH R%d \\arg\n", call_func(root, frame, out));
fprintf(out, "PUSH R%d\n", call_func(root, frame, out));
freeReg(frame);
return;
}
reg_index value = eval_expr(root, frame, out);
fprintf(out, "PUSH R%d \\arg\n", value);
fprintf(out, "PUSH R%d\n", value);
freeReg(frame);
return;
}
Expand Down Expand Up @@ -488,7 +485,7 @@ void popArgFromStack(tnode* root, Frame* frame, FILE* out) {
return;
}
reg_index value = getReg(frame);
fprintf(out, "POP R%d \\argu\n", value);
fprintf(out, "POP R%d\n", value);
freeReg(frame);
return;
}
Expand Down
6 changes: 0 additions & 6 deletions silc/src/silc.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
LinkedList *res = NULL;
if(root->type != CONN) {
res = (LinkedList*)malloc(sizeof(LinkedList));
// printf("%s %s\n", root->vartype->name, root->varname);
LSymbol* tmp = malloc(sizeof(LSymbol));
*tmp = (LSymbol){.name = root->varname, .type = root->vartype};
res->data = (void*)tmp;
Expand All @@ -134,11 +133,6 @@
LinkedList *right = addParam(root->right);
LinkedList *left = addParam(root->left);
return connectList(right, left, sizeof(LSymbol));
// if(right) {
// right->next = left;
// return right;
// }
// return left;
}

}
Expand Down
Loading