fix fn call test

Westsi · Jul 3, 2024 · 0030f60 · 0030f60
1 parent c1ed631
commit 0030f60
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/codegen/aarch64_clang/gen.go b/codegen/aarch64_clang/gen.go
@@ -320,6 +320,7 @@ func (g *AARCH64Generator) GenerateInfix(node *ast.InfixExpression) StorageLoc {
 func (g *AARCH64Generator) GetInfixOperands(node *ast.InfixExpression) (string, string, StorageLoc) {
 	tracer.Trace("GetInfixOperands")
 	defer tracer.Untrace("GetInfixOperands")
+	var leftcall, rightcall bool
 	var leftS, rightS string
 	var destLoc StorageLoc
 	switch left := node.Left.(type) {
@@ -330,19 +331,8 @@ func (g *AARCH64Generator) GetInfixOperands(node *ast.InfixExpression) (string,
 	case *ast.CallExpression:
 		g.GenerateCall(left)
 		leftS = StorageLocs[X0]
+		leftcall = true
 	case *ast.IntegerLiteral:
-		// leftS = "$" + fmt.Sprintf("%d", left.Value)
-		// var sloc StorageLoc
-		// for _, v := range Sls {
-		// 	_, ok := g.VirtualRegisters[v]
-		// 	if !ok {
-		// 		g.VirtualRegisters[v] = "TEMP"
-		// 		sloc = v
-		// 		break
-		// 	}
-		// }
-		// leftS = StorageLocs[sloc]
-		// g.out.WriteString("mov " + leftS + ", " + fmt.Sprintf("%d", left.Value) + "\n")
 		leftS = StorageLocs[g.GenerateIntegerLiteral(left)]
 	}
 
@@ -357,6 +347,17 @@ func (g *AARCH64Generator) GetInfixOperands(node *ast.InfixExpression) (string,
 	case *ast.CallExpression:
 		g.GenerateCall(right)
 		rightS = StorageLocs[X0]
+		rightcall = true
+	}
+
+	if leftcall && rightS == "x0" {
+		rightS = "x1"
+		g.VirtualRegisters[X1] = "TEMP"
+	}
+
+	if rightcall && leftS == "x0" {
+		leftS = "x1"
+		g.VirtualRegisters[X1] = "TEMP"
 	}
 
 	for _, v := range Sls {

diff --git a/codegen/x86_64_as/gen.go b/codegen/x86_64_as/gen.go
@@ -357,6 +357,7 @@ func (g *X64Generator) GenerateInfix(node *ast.InfixExpression) StorageLoc {
 func (g *X64Generator) GetInfixOperands(node *ast.InfixExpression) (string, string, StorageLoc) {
 	tracer.Trace("GetInfixOperands")
 	defer tracer.Untrace("GetInfixOperands")
+	var leftcall, rightcall bool
 	var leftS, rightS string
 	var leftLoc StorageLoc // TODO: fix bug with something like int y = x*8 where x would be
 	switch left := node.Left.(type) {
@@ -371,6 +372,7 @@ func (g *X64Generator) GetInfixOperands(node *ast.InfixExpression) (string, stri
 		leftS = StorageLocs[leftLoc]
 	case *ast.CallExpression:
 		g.GenerateCall(left)
+		leftcall = true
 		leftS = StorageLocs[RAX]
 	}
 
@@ -384,6 +386,17 @@ func (g *X64Generator) GetInfixOperands(node *ast.InfixExpression) (string, stri
 	case *ast.CallExpression:
 		g.GenerateCall(right)
 		rightS = StorageLocs[RAX]
+		rightcall = true
+	}
+
+	if leftcall && rightS == "%rax" {
+		rightS = "%rcx"
+		g.VirtualRegisters[RCX] = "TEMP"
+	}
+
+	if rightcall && leftS == "%rax" {
+		leftS = "%rcx"
+		g.VirtualRegisters[RCX] = "TEMP"
 	}
 	return leftS, rightS, leftLoc
 }