Some more fine touches

Author: RedDocMD

src/main/kotlin/deep/decaf/low/amd64/IRToLow.kt

@@ -123,38 +123,53 @@ fun irExprToLow(expr: IRExpr, info: AsmProgramInfo): List<Instruction> {
                 tmp
             }
             is IRCallOutExpr -> {
+                var pushCount = 0
                 for ((i, arg) in expr.argList.withIndex()) {
-                    val register = when (i) {
-                        0 -> Register("rdi")
-                        1 -> Register("rsi")
-                        2 -> Register("rdx")
-                        3 -> Register("rcx")
-                        4 -> Register("r8")
-                        5 -> Register("r9")
-                        else -> throw IllegalArgumentException("too many arguments to callout expression")
-                    }
-                    when (arg) {
-                        is StringCallOutArg -> {
-                            val loc = info.addGlobalString(arg.arg)
-                            instructions.add(
-                                MoveInstruction(
-                                    MemLoc(Register.basePointer(), StringOffset(loc)),
-                                    register
+                    if (i < 6) {
+                        val register = when (i) {
+                            0 -> Register("rdi")
+                            1 -> Register("rsi")
+                            2 -> Register("rdx")
+                            3 -> Register("rcx")
+                            4 -> Register("r8")
+                            5 -> Register("r9")
+                            else -> throw IllegalArgumentException("code screwed up")
+                        }
+                        when (arg) {
+                            is StringCallOutArg -> {
+                                val loc = info.addGlobalString(arg.arg)
+                                instructions.add(
+                                    LeaqInstruction(
+                                        MemLoc(Register.basePointer(), StringOffset(loc)),
+                                        register
+                                    )
                                 )
-                            )
+                            }
+                            is ExprCallOutArg -> {
+                                val loc = traverse(arg.arg)
+                                instructions.add(MoveInstruction(loc, register))
+                            }
                         }
-                        is ExprCallOutArg -> {
-                            val loc = traverse(arg.arg)
-                            instructions.add(MoveInstruction(loc, register))
+                    } else {
+                        pushCount++
+                        when (arg) {
+                            is StringCallOutArg -> {
+                                val loc = info.addGlobalString(arg.arg)
+                                instructions.add(PushInstruction(MemLoc(Register.basePointer(), StringOffset(loc))))
+                            }
+                            is ExprCallOutArg -> {
+                                val loc = traverse(arg.arg)
+                                instructions.add(PushInstruction(loc))
+                            }
                         }
                     }
                 }
-                val mustPush = info.stackSize % 2 == 1
-                if (mustPush) {
+                if (info.stackSize % 2 == 1) {
                     instructions.add(PushInstruction(Register.r10()))
+                    pushCount++
                 }
                 instructions.add(CallInstruction(expr.name))
-                if (mustPush) {
+                for (i in 1..pushCount) {
                     instructions.add(PopInstruction(Register.r10()))
                 }
                 val tmp = info.addVariable(getUUID())

src/main/kotlin/deep/decaf/low/amd64/Low.kt

@@ -182,6 +182,12 @@ data class MoveInstruction(val src: Location, val dest: Location) : Instruction(
     }
 }
 
+data class LeaqInstruction(val src: Location, val dest: Location) : Instruction() {
+    override fun toString(): String {
+        return "leaq $src, $dest"
+    }
+}
+
 data class CMoveInstruction(val type: AsmCMoveOp, val src: Register, val dest: Register) : Instruction() {
     override fun toString(): String {
         return "$type $src $dest"
@@ -266,19 +272,19 @@ data class Program(
     override fun toString(): String {
         val stringBuilder = StringBuilder()
         stringBuilder.append(".section .rodata").append("\n")
-        for (text in globalText.keys)  {
-            stringBuilder.append("${globalText[text]}:").append("\n")
-            stringBuilder.append("\t").append(".string \"$text\"").append("\n")
+        for (text in globalText.keys) {
+            stringBuilder.append("$text:").append("\n")
+            stringBuilder.append("\t").append(".string ${globalText[text]}").append("\n")
         }
 
         stringBuilder.append(".section .text").append("\n")
         stringBuilder.append("\t").append(".global main").append("\n")
-        for (method in methods)  {
+        for (method in methods) {
             if (method.name == "main") {
                 stringBuilder.append(method.toString())
             }
         }
-        for (method in methods)  {
+        for (method in methods) {
             if (method.name != "main") {
                 stringBuilder.append(method.toString())
             }

src/main/kotlin/deep/decaf/tester/LowMethodTester.kt

@@ -7,7 +7,7 @@ import org.antlr.v4.runtime.*
 import java.io.*
 
 fun main() {
-    val folder = File("/home/deep/work/compiler/low1")
+    val folder = File("/home/deep/work/compiler/p3files/codegen")
     val files = folder.listFiles()!!.filter { !it.isDirectory }.sorted()
     for (file in files) {
         val scanner = DecafLexer(CharStreams.fromFileName(file.absolutePath))
@@ -16,6 +16,7 @@ fun main() {
         val errors = checkSemantics(irTree)
         if (errors.isNotEmpty())
             throw RuntimeException("Invalid program")
+        println(file.absolutePath)
         val program = irProgramToLow(irTree)
         println(program)
     }