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

25: Rewrite prepareRegisters, correct operator order for comparisons

Browse Source
This commit is contained in:
Marvin Kaiser
2020-03-05 09:06:22 +01:00
parent 58cdaf04dd
commit cbc8020e81
2 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,24 +119,33 @@ public class GenASM implements Visitor<Void> {
private boolean prepareRegisters(Expression lhs, Expression rhs) { private boolean prepareRegisters(Expression lhs, Expression rhs) {
boolean lhsIsFloat = lhs.type.equals(Type.getFloatType()); boolean lhsIsFloat = lhs.type.equals(Type.getFloatType());
boolean rhsIsFloat = rhs.type.equals(Type.getFloatType()); boolean rhsIsFloat = rhs.type.equals(Type.getFloatType());
if (lhsIsFloat || rhsIsFloat) { if (lhsIsFloat && rhsIsFloat) {
lhs.welcome(this); lhs.welcome(this);
if (!lhsIsFloat) { this.ex.write(" movsd %xmm0, %xmm2\n");
this.intToFloat("%rax", "%xmm1");
} else {
this.ex.write(" movsd %xmm0, %xmm1\n");
}
rhs.welcome(this); rhs.welcome(this);
if (!rhsIsFloat) { this.ex.write(" movsd %xmm0, %xmm1\n");
this.intToFloat("%rax", "%xmm1"); this.ex.write(" movsd %xmm2, %xmm0\n");
}
return true; return true;
} else if (lhsIsFloat && !rhsIsFloat) {
lhs.welcome(this);
rhs.welcome(this);
this.intToFloat("%rax", "%xmm1");
return true;
} else if (!lhsIsFloat && rhsIsFloat) {
lhs.welcome(this);
this.intToFloat("%rax", "%xmm2");
rhs.welcome(this);
this.ex.write(" movsd %xmm0, %xmm1\n");
this.ex.write(" movsd %xmm2, %xmm0\n");
return true;
} else {
lhs.welcome(this);
this.ex.write(" pushq %rax\n");
rhs.welcome(this);
this.ex.write(" movq %rax, %rbx\n");
this.ex.write(" popq %rax\n");
return false;
} }
lhs.welcome(this);
this.ex.write(" pushq %rax\n");
rhs.welcome(this);
this.ex.write(" popq %rbx\n");
return false;
} }
public GenASM(ExWriter ex, String mainName) { public GenASM(ExWriter ex, String mainName) {
this.ex = ex; this.ex = ex;
@@ -184,9 +193,9 @@ public class GenASM implements Visitor<Void> {
boolean isFloatOperation = this.prepareRegisters(e.lhs, e.rhs); boolean isFloatOperation = this.prepareRegisters(e.lhs, e.rhs);
if (isFloatOperation) { if (isFloatOperation) {
this.ex.write(" ucomisd %xmm0, %xmm1\n"); this.ex.write(" ucomisd %xmm1, %xmm0\n");
} else { } else {
this.ex.write(" cmp %rax, %rbx\n"); this.ex.write(" cmp %rbx, %rax\n");
} }
this.ex.write(" je .L" + lblTrue + "\n"); this.ex.write(" je .L" + lblTrue + "\n");
// false // false
@@ -228,9 +237,9 @@ public class GenASM implements Visitor<Void> {
boolean isFloatOperation = this.prepareRegisters(e.lhs, e.rhs); boolean isFloatOperation = this.prepareRegisters(e.lhs, e.rhs);
if (isFloatOperation) { if (isFloatOperation) {
this.ex.write(" ucomisd %xmm0, %xmm1\n"); this.ex.write(" ucomisd %xmm1, %xmm0\n");
} else { } else {
this.ex.write(" cmp %rax, %rbx\n"); this.ex.write(" cmp %rbx, %rax\n");
} }
this.ex.write(" jg .L" + lblTrue + "\n"); this.ex.write(" jg .L" + lblTrue + "\n");
// false // false
@@ -250,9 +259,9 @@ public class GenASM implements Visitor<Void> {
boolean isFloatOperation = this.prepareRegisters(e.lhs, e.rhs); boolean isFloatOperation = this.prepareRegisters(e.lhs, e.rhs);
if (isFloatOperation) { if (isFloatOperation) {
this.ex.write(" ucomisd %xmm0, %xmm1\n"); this.ex.write(" ucomisd %xmm1, %xmm0\n");
} else { } else {
this.ex.write(" cmp %rax, %rbx\n"); this.ex.write(" cmp %rbx, %rax\n");
} }
this.ex.write(" jge .L" + lblTrue + "\n"); this.ex.write(" jge .L" + lblTrue + "\n");
// false // false
@@ -272,9 +281,9 @@ public class GenASM implements Visitor<Void> {
boolean isFloatOperation = this.prepareRegisters(e.lhs, e.rhs); boolean isFloatOperation = this.prepareRegisters(e.lhs, e.rhs);
if (isFloatOperation) { if (isFloatOperation) {
this.ex.write(" ucomisd %xmm0, %xmm1\n"); this.ex.write(" ucomisd %xmm1, %xmm0\n");
} else { } else {
this.ex.write(" cmp %rax, %rbx\n"); this.ex.write(" cmp %rbx, %rax\n");
} }
this.ex.write(" jl .L" + lblTrue + "\n"); this.ex.write(" jl .L" + lblTrue + "\n");
// false // false
@@ -294,9 +303,9 @@ public class GenASM implements Visitor<Void> {
boolean isFloatOperation = this.prepareRegisters(e.lhs, e.rhs); boolean isFloatOperation = this.prepareRegisters(e.lhs, e.rhs);
if (isFloatOperation) { if (isFloatOperation) {
this.ex.write(" ucomisd %xmm0, %xmm1\n"); this.ex.write(" ucomisd %xmm1, %xmm0\n");
} else { } else {
this.ex.write(" cmp %rax, %rbx\n"); this.ex.write(" cmp %rbx, %rax\n");
} }
this.ex.write(" jle .L" + lblTrue + "\n"); this.ex.write(" jle .L" + lblTrue + "\n");
// false // false
@@ -326,8 +335,7 @@ public class GenASM implements Visitor<Void> {
if (isFloatOperation) { if (isFloatOperation) {
this.ex.write(" subsd %xmm1, %xmm0\n"); this.ex.write(" subsd %xmm1, %xmm0\n");
} else { } else {
this.ex.write(" subq %rax, %rbx\n"); this.ex.write(" subq %rbx, %rax\n");
this.ex.write(" movq %rbx, %rax\n");
} }
return null; return null;
} }

1
src/test/math/math.c
View File

@@ -183,6 +183,7 @@ int runMathTests()
math_testOneArg("neg", cNeg, neg, 0); math_testOneArg("neg", cNeg, neg, 0);
math_testOneArg("neg", cNeg, neg, 1); math_testOneArg("neg", cNeg, neg, 1);
math_testOneArg("neg", cNeg, neg, -1); math_testOneArg("neg", cNeg, neg, -1);
math_testOneArg("neg", cNeg, neg, -10);
printf("\nIdentity Tests\n"); printf("\nIdentity Tests\n");
math_testOneArg("id", cId, id, 0); math_testOneArg("id", cId, id, 0);