nitrix/klang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed main function asm code

Browse Source 
Fixed: IntegerValues not passed via rax
Fixed: Some values passed via stack, not via rax
This commit is contained in:
Marvin Kaiser
2019-11-26 09:14:44 +01:00
parent 2c2696207f
commit b7e6567d69
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/de/hsrm/compiler/Klang/visitors/GenASM.java
View File

@@ -74,13 +74,13 @@ public class GenASM implements Visitor<Void> {
@Override @Override
public Void visit(IntegerExpression e) { public Void visit(IntegerExpression e) {
this.ex.write(" pushq $" + e.value + "\n"); this.ex.write(" movq $" + e.value + ", %rax\n");
return null; return null;
} }
@Override @Override
public Void visit(Variable e) { public Void visit(Variable e) {
this.ex.write(" pushq " +this.env.get(e.name) +"(%rbp)\n"); this.ex.write(" movq " +this.env.get(e.name) +"(%rbp), %rax\n");
return null; return null;
} }
@@ -158,6 +158,7 @@ public class GenASM implements Visitor<Void> {
@Override @Override
public Void visit(ReturnStatement e) { public Void visit(ReturnStatement e) {
e.expression.welcome(this); e.expression.welcome(this);
this.ex.write(" popq %rbp\n");
this.ex.write(" ret\n"); this.ex.write(" ret\n");
return null; return null;
} }
@@ -182,6 +183,11 @@ public class GenASM implements Visitor<Void> {
Set<String> vars = new TreeSet<String>(); Set<String> vars = new TreeSet<String>();
GetVars getvars = new GetVars(vars); GetVars getvars = new GetVars(vars);
getvars.visit(e); getvars.visit(e);
// System.out.println("Function: " + e.name);
// System.out.println("vars size: " + vars.size());
// for (var s : vars) {
// System.out.println(s);
// }
// Erzeuge ein environment // Erzeuge ein environment
this.env = new HashMap<String, Integer>(); this.env = new HashMap<String, Integer>();
@@ -193,9 +199,9 @@ public class GenASM implements Visitor<Void> {
this.env.put(e.parameters[i], -((m - j) * 8)); this.env.put(e.parameters[i], -((m - j) * 8));
} }
// pushe die aufrufparameter wieder auf den stack // pushe die aufrufparameter aus den Registern wieder auf den Stack
for (int i = 0; i < Math.min(this.rs.length, e.parameters.length); i++) { for (int i = 0; i < Math.min(this.rs.length, e.parameters.length); i++) {
this.ex.write(" pushq " + this.rs[i] + "\n"); this.ex.write(" popq " + this.rs[i] + "\n");
this.env.put(e.parameters[i], (i + 2) * 8); this.env.put(e.parameters[i], (i + 2) * 8);
} }
@@ -208,9 +214,9 @@ public class GenASM implements Visitor<Void> {
e.block.welcome(this); e.block.welcome(this);
this.ex.write(" popq %rax\n"); // this.ex.write(" popq %rax\n");
this.ex.write(" popq %rbp\n"); // this.ex.write(" popq %rbp\n");
this.ex.write(" ret\n"); // this.ex.write(" ret\n");
return null; return null;
} }
@@ -219,7 +225,7 @@ public class GenASM implements Visitor<Void> {
// Die ersten sechs params in die register schieben // Die ersten sechs params in die register schieben
for (int i = 0; i < Math.min(this.rs.length, e.arguments.length); i++) { for (int i = 0; i < Math.min(this.rs.length, e.arguments.length); i++) {
e.arguments[i].welcome(this); e.arguments[i].welcome(this);
this.ex.write(" popq " + this.rs[i] + "\n"); this.ex.write(" movq %rax, " + this.rs[i] + "\n");
} }
// Den Rest auf den stack pushen // Den Rest auf den stack pushen
@@ -233,20 +239,21 @@ public class GenASM implements Visitor<Void> {
@Override @Override
public Void visit(Program e) { public Void visit(Program e) {
this.ex.write(".text\n");
for (var func : e.funcs) { for (var func : e.funcs) {
func.welcome(this); func.welcome(this);
this.ex.write("\n"); this.ex.write("\n");
} }
this.ex.write(".globl main\n"); this.ex.write(".globl main\n");
this.ex.write(".type main, @function\n"); this.ex.write(".type main, @function\n");
this.ex.write("main:\n"); this.ex.write("main:\n");
this.ex.write(" pushq %rbp\n"); this.ex.write(" pushq %rbp\n");
this.ex.write(" movq %rsp, %rbp\n"); this.ex.write(" movq %rsp, %rbp\n");
e.expression.welcome(this); e.expression.welcome(this);
this.ex.write(" popq %rax\n"); // this.ex.write(" popq %rax\n");
this.ex.write(" popq %rbp\n"); this.ex.write(" popq %rbp\n");
this.ex.write(" ret\n"); this.ex.write(" ret\n");
this.ex.write("\n");
this.ex.write("\n"); this.ex.write("\n");
return null; return null;
} }