Fixes to bytecode compiler

dibyendumajumdar · dibyendumajumdar · commit 6f41848bf3b8 · 2024-09-14T16:30:20.000+01:00
Revised IR output - local var names shown, register names shortened and prefixed with %
Fix to unary op
Test cases updated with expected results
diff --git a/registervm/src/main/java/com/compilerprogramming/ezlang/bytecode/BasicBlock.java b/registervm/src/main/java/com/compilerprogramming/ezlang/bytecode/BasicBlock.java
@@ -32,12 +32,13 @@ public static StringBuilder toStr(StringBuilder sb, BasicBlock bb, BitSet visite
         visited.set(bb.bid);
         sb.append("L").append(bb.bid).append(":\n");
         for (Instruction n: bb.instructions) {
-            sb.append("\t");
+            sb.append("    ");
             n.toStr(sb).append("\n");
         }
         for (BasicBlock succ: bb.successors) {
             toStr(sb, succ, visited);
         }
         return sb;
     }
+
 }
diff --git a/registervm/src/main/java/com/compilerprogramming/ezlang/bytecode/FunctionBuilder.java b/registervm/src/main/java/com/compilerprogramming/ezlang/bytecode/FunctionBuilder.java
@@ -37,6 +37,14 @@ public FunctionBuilder(Symbol.FunctionTypeSymbol functionSymbol) {
         this.currentBreakTarget = null;
         this.currentContinueTarget = null;
         compileStatement(funcDecl.block);
+        exitBlockIfNeeded();
+    }
+
+    private void exitBlockIfNeeded() {
+        if (currentBlock != null &&
+                currentBlock != exit) {
+            startBlock(exit);
+        }
     }
 
     private void setVirtualRegisters(Scope scope) {
@@ -127,7 +135,7 @@ private void compileAssign(AST.AssignStmt assignStmt) {
             codeIndexedStore();
         else if (assignStmt.lhs instanceof AST.NameExpr symbolExpr) {
             Symbol.VarSymbol varSymbol = (Symbol.VarSymbol) symbolExpr.symbol;
-            code(new Instruction.Move(pop(), new Operand.LocalRegisterOperand(varSymbol.reg)));
+            code(new Instruction.Move(pop(), new Operand.LocalRegisterOperand(varSymbol.reg, varSymbol.name)));
         }
         else
             throw new CompilerException("Invalid assignment expression: " + assignStmt.lhs);
@@ -182,7 +190,8 @@ private boolean isBlockTerminated(BasicBlock block) {
     }
 
     private void jumpTo(BasicBlock block) {
-        currentBlock.add(new Instruction.Jump(currentBlock, block));
+        assert !isBlockTerminated(currentBlock);
+        currentBlock.add(new Instruction.Jump(block));
         currentBlock.addSuccessor(block);
     }
 
@@ -221,7 +230,7 @@ private void compileLet(AST.VarStmt letStmt) {
             boolean indexed = compileExpr(letStmt.expr);
             if (indexed)
                 codeIndexedLoad();
-            code(new Instruction.Move(pop(), new Operand.LocalRegisterOperand(letStmt.symbol.reg)));
+            code(new Instruction.Move(pop(), new Operand.LocalRegisterOperand(letStmt.symbol.reg, letStmt.symbol.name)));
         }
     }
 
@@ -373,7 +382,7 @@ private boolean compileSymbolExpr(AST.NameExpr symbolExpr) {
             pushOperand(new Operand.LocalFunctionOperand(functionType));
         else {
             Symbol.VarSymbol varSymbol = (Symbol.VarSymbol) symbolExpr.symbol;
-            pushLocal(varSymbol.reg);
+            pushLocal(varSymbol.reg, varSymbol.name);
         }
         return false;
     }
@@ -429,13 +438,9 @@ private boolean compileUnaryExpr(AST.UnaryExpr unaryExpr) {
                 default: throw new CompilerException("Invalid unary op");
             }
         }
-        else if (top instanceof Operand.LocalRegisterOperand) {
-            code(new Instruction.UnaryInstruction(opCode, top));
-        }
         else {
             var temp = createTemp();
-            code(new Instruction.Move(top, temp));
-            code(new Instruction.UnaryInstruction(opCode, temp));
+            code(new Instruction.UnaryInstruction(opCode, temp, top));
         }
         return false;
     }
@@ -455,8 +460,8 @@ private Operand.TempRegisterOperand createTemp() {
         return tempRegister;
     }
 
-    private void pushLocal(int regnum) {
-        virtualStack.add(new Operand.LocalRegisterOperand(regnum));
+    private void pushLocal(int regnum, String varName) {
+        virtualStack.add(new Operand.LocalRegisterOperand(regnum, varName));
     }
 
     private void pushOperand(Operand operand) {
diff --git a/registervm/src/main/java/com/compilerprogramming/ezlang/bytecode/Instruction.java b/registervm/src/main/java/com/compilerprogramming/ezlang/bytecode/Instruction.java
@@ -25,14 +25,16 @@ public StringBuilder toStr(StringBuilder sb) {
 
     public static class UnaryInstruction extends Instruction {
         public final String unop;
+        public final Operand result;
         public final Operand operand;
-        public UnaryInstruction(String unop, Operand operand) {
+        public UnaryInstruction(String unop, Operand result, Operand operand) {
             this.unop = unop;
+            this.result = result;
             this.operand = operand;
         }
         @Override
         public StringBuilder toStr(StringBuilder sb) {
-            return sb.append(operand).append(" = ").append(unop).append(operand);
+            return sb.append(result).append(" = ").append(unop).append(operand);
         }
     }
 
@@ -62,7 +64,7 @@ public AStoreAppend(Operand array, Operand value) {
         }
         @Override
         public StringBuilder toStr(StringBuilder sb) {
-            return sb.append("ArrayAdd(").append(array).append(", ").append(value).append(")");
+            return sb.append(array).append(".append(").append(value).append(")");
         }
     }
 
@@ -96,18 +98,20 @@ public Call(Operand callee, Operand... args) {
         }
         @Override
         public StringBuilder toStr(StringBuilder sb) {
-            sb.append(callee).append("(");
+            sb.append("call ").append(callee);
+            if (args.length > 0)
+                sb.append(" params ");
             for (int i = 0; i < args.length; i++) {
                 if (i > 0) sb.append(", ");
                 sb.append(args[i]);
             }
-            return sb.append(")");
+            return sb;
         }
     }
 
     public static class Jump extends Instruction {
         public final BasicBlock jumpTo;
-        public Jump(BasicBlock currentBlock, BasicBlock jumpTo) {
+        public Jump(BasicBlock jumpTo) {
             this.jumpTo = jumpTo;
         }
         @Override
diff --git a/registervm/src/main/java/com/compilerprogramming/ezlang/bytecode/Operand.java b/registervm/src/main/java/com/compilerprogramming/ezlang/bytecode/Operand.java
@@ -17,12 +17,14 @@ public String toString() {
 
     public static class LocalRegisterOperand extends Operand {
         public final int regnum;
-        public LocalRegisterOperand(int regnum) {
+        public final String varName;
+        public LocalRegisterOperand(int regnum, String varName) {
             this.regnum = regnum;
+            this.varName = varName;
         }
         @Override
         public String toString() {
-            return "Local{" + regnum + '}';
+            return varName;
         }
     }
 
@@ -45,7 +47,7 @@ public String toString() {
     public static class ReturnRegisterOperand extends Operand {
         public ReturnRegisterOperand() {}
         @Override
-        public String toString() { return "RET"; }
+        public String toString() { return "%ret"; }
     }
 
     /**
@@ -60,7 +62,7 @@ public TempRegisterOperand(int regnum) {
         }
         @Override
         public String toString() {
-            return "T" + regnum;
+            return "%t" + regnum;
         }
     }
 
@@ -89,7 +91,7 @@ public LoadFieldOperand(Operand structOperand, String fieldName, int field) {
 
         @Override
         public String toString() {
-            return structOperand + "." + fieldName + "(" + fieldIndex + ")";
+            return structOperand + "." + fieldName;
         }
     }
 
diff --git a/registervm/src/test/java/com/compilerprogramming/ezlang/bytecode/TestCompiler.java b/registervm/src/test/java/com/compilerprogramming/ezlang/bytecode/TestCompiler.java

Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,13 @@ public static StringBuilder toStr(StringBuilder sb, BasicBlock bb, BitSet visite`
`32`	`32`	`visited.set(bb.bid);`
`33`	`33`	`sb.append("L").append(bb.bid).append(":\n");`
`34`	`34`	`for (Instruction n: bb.instructions) {`
`35`		`- sb.append("\t");`
	`35`	`+ sb.append(" ");`
`36`	`36`	`n.toStr(sb).append("\n");`
`37`	`37`	`}`
`38`	`38`	`for (BasicBlock succ: bb.successors) {`
`39`	`39`	`toStr(sb, succ, visited);`
`40`	`40`	`}`
`41`	`41`	`return sb;`
`42`	`42`	`}`
	`43`	`+`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,14 @@ public FunctionBuilder(Symbol.FunctionTypeSymbol functionSymbol) {`
`37`	`37`	`this.currentBreakTarget = null;`
`38`	`38`	`this.currentContinueTarget = null;`
`39`	`39`	`compileStatement(funcDecl.block);`
	`40`	`+ exitBlockIfNeeded();`
	`41`	`+ }`
	`42`	`+`
	`43`	`+ private void exitBlockIfNeeded() {`
	`44`	`+ if (currentBlock != null &&`
	`45`	`+ currentBlock != exit) {`
	`46`	`+ startBlock(exit);`
	`47`	`+ }`
`40`	`48`	`}`
`41`	`49`
`42`	`50`	`private void setVirtualRegisters(Scope scope) {`
`@@ -127,7 +135,7 @@ private void compileAssign(AST.AssignStmt assignStmt) {`
`127`	`135`	`codeIndexedStore();`
`128`	`136`	`else if (assignStmt.lhs instanceof AST.NameExpr symbolExpr) {`
`129`	`137`	`Symbol.VarSymbol varSymbol = (Symbol.VarSymbol) symbolExpr.symbol;`
`130`		`- code(new Instruction.Move(pop(), new Operand.LocalRegisterOperand(varSymbol.reg)));`
	`138`	`+ code(new Instruction.Move(pop(), new Operand.LocalRegisterOperand(varSymbol.reg, varSymbol.name)));`
`131`	`139`	`}`
`132`	`140`	`else`
`133`	`141`	`throw new CompilerException("Invalid assignment expression: " + assignStmt.lhs);`
`@@ -182,7 +190,8 @@ private boolean isBlockTerminated(BasicBlock block) {`
`182`	`190`	`}`
`183`	`191`
`184`	`192`	`private void jumpTo(BasicBlock block) {`
`185`		`- currentBlock.add(new Instruction.Jump(currentBlock, block));`
	`193`	`+ assert !isBlockTerminated(currentBlock);`
	`194`	`+ currentBlock.add(new Instruction.Jump(block));`
`186`	`195`	`currentBlock.addSuccessor(block);`
`187`	`196`	`}`
`188`	`197`
`@@ -221,7 +230,7 @@ private void compileLet(AST.VarStmt letStmt) {`
`221`	`230`	`boolean indexed = compileExpr(letStmt.expr);`
`222`	`231`	`if (indexed)`
`223`	`232`	`codeIndexedLoad();`
`224`		`- code(new Instruction.Move(pop(), new Operand.LocalRegisterOperand(letStmt.symbol.reg)));`
	`233`	`+ code(new Instruction.Move(pop(), new Operand.LocalRegisterOperand(letStmt.symbol.reg, letStmt.symbol.name)));`
`225`	`234`	`}`
`226`	`235`	`}`
`227`	`236`
`@@ -373,7 +382,7 @@ private boolean compileSymbolExpr(AST.NameExpr symbolExpr) {`
`373`	`382`	`pushOperand(new Operand.LocalFunctionOperand(functionType));`
`374`	`383`	`else {`
`375`	`384`	`Symbol.VarSymbol varSymbol = (Symbol.VarSymbol) symbolExpr.symbol;`
`376`		`- pushLocal(varSymbol.reg);`
	`385`	`+ pushLocal(varSymbol.reg, varSymbol.name);`
`377`	`386`	`}`
`378`	`387`	`return false;`
`379`	`388`	`}`
`@@ -429,13 +438,9 @@ private boolean compileUnaryExpr(AST.UnaryExpr unaryExpr) {`
`429`	`438`	`default: throw new CompilerException("Invalid unary op");`
`430`	`439`	`}`
`431`	`440`	`}`
`432`		`- else if (top instanceof Operand.LocalRegisterOperand) {`
`433`		`- code(new Instruction.UnaryInstruction(opCode, top));`
`434`		`- }`
`435`	`441`	`else {`
`436`	`442`	`var temp = createTemp();`
`437`		`- code(new Instruction.Move(top, temp));`
`438`		`- code(new Instruction.UnaryInstruction(opCode, temp));`
	`443`	`+ code(new Instruction.UnaryInstruction(opCode, temp, top));`
`439`	`444`	`}`
`440`	`445`	`return false;`
`441`	`446`	`}`
`@@ -455,8 +460,8 @@ private Operand.TempRegisterOperand createTemp() {`
`455`	`460`	`return tempRegister;`
`456`	`461`	`}`
`457`	`462`
`458`		`- private void pushLocal(int regnum) {`
`459`		`- virtualStack.add(new Operand.LocalRegisterOperand(regnum));`
	`463`	`+ private void pushLocal(int regnum, String varName) {`
	`464`	`+ virtualStack.add(new Operand.LocalRegisterOperand(regnum, varName));`
`460`	`465`	`}`
`461`	`466`
`462`	`467`	`private void pushOperand(Operand operand) {`
Original file line number	Diff line number	Diff line change
`@@ -25,14 +25,16 @@ public StringBuilder toStr(StringBuilder sb) {`
`25`	`25`
`26`	`26`	`public static class UnaryInstruction extends Instruction {`
`27`	`27`	`public final String unop;`
	`28`	`+ public final Operand result;`
`28`	`29`	`public final Operand operand;`
`29`		`- public UnaryInstruction(String unop, Operand operand) {`
	`30`	`+ public UnaryInstruction(String unop, Operand result, Operand operand) {`
`30`	`31`	`this.unop = unop;`
	`32`	`+ this.result = result;`
`31`	`33`	`this.operand = operand;`
`32`	`34`	`}`
`33`	`35`	`@Override`
`34`	`36`	`public StringBuilder toStr(StringBuilder sb) {`
`35`		`- return sb.append(operand).append(" = ").append(unop).append(operand);`
	`37`	`+ return sb.append(result).append(" = ").append(unop).append(operand);`
`36`	`38`	`}`
`37`	`39`	`}`
`38`	`40`
`@@ -62,7 +64,7 @@ public AStoreAppend(Operand array, Operand value) {`
`62`	`64`	`}`
`63`	`65`	`@Override`
`64`	`66`	`public StringBuilder toStr(StringBuilder sb) {`
`65`		`- return sb.append("ArrayAdd(").append(array).append(", ").append(value).append(")");`
	`67`	`+ return sb.append(array).append(".append(").append(value).append(")");`
`66`	`68`	`}`
`67`	`69`	`}`
`68`	`70`
`@@ -96,18 +98,20 @@ public Call(Operand callee, Operand... args) {`
`96`	`98`	`}`
`97`	`99`	`@Override`
`98`	`100`	`public StringBuilder toStr(StringBuilder sb) {`
`99`		`- sb.append(callee).append("(");`
	`101`	`+ sb.append("call ").append(callee);`
	`102`	`+ if (args.length > 0)`
	`103`	`+ sb.append(" params ");`
`100`	`104`	`for (int i = 0; i < args.length; i++) {`
`101`	`105`	`if (i > 0) sb.append(", ");`
`102`	`106`	`sb.append(args[i]);`
`103`	`107`	`}`
`104`		`- return sb.append(")");`
	`108`	`+ return sb;`
`105`	`109`	`}`
`106`	`110`	`}`
`107`	`111`
`108`	`112`	`public static class Jump extends Instruction {`
`109`	`113`	`public final BasicBlock jumpTo;`
`110`		`- public Jump(BasicBlock currentBlock, BasicBlock jumpTo) {`
	`114`	`+ public Jump(BasicBlock jumpTo) {`
`111`	`115`	`this.jumpTo = jumpTo;`
`112`	`116`	`}`
`113`	`117`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,14 @@ public String toString() {`
`17`	`17`
`18`	`18`	`public static class LocalRegisterOperand extends Operand {`
`19`	`19`	`public final int regnum;`
`20`		`- public LocalRegisterOperand(int regnum) {`
	`20`	`+ public final String varName;`
	`21`	`+ public LocalRegisterOperand(int regnum, String varName) {`
`21`	`22`	`this.regnum = regnum;`
	`23`	`+ this.varName = varName;`
`22`	`24`	`}`
`23`	`25`	`@Override`
`24`	`26`	`public String toString() {`
`25`		`- return "Local{" + regnum + '}';`
	`27`	`+ return varName;`
`26`	`28`	`}`
`27`	`29`	`}`
`28`	`30`
`@@ -45,7 +47,7 @@ public String toString() {`
`45`	`47`	`public static class ReturnRegisterOperand extends Operand {`
`46`	`48`	`public ReturnRegisterOperand() {}`
`47`	`49`	`@Override`
`48`		`- public String toString() { return "RET"; }`
	`50`	`+ public String toString() { return "%ret"; }`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`/**`
`@@ -60,7 +62,7 @@ public TempRegisterOperand(int regnum) {`
`60`	`62`	`}`
`61`	`63`	`@Override`
`62`	`64`	`public String toString() {`
`63`		`- return "T" + regnum;`
	`65`	`+ return "%t" + regnum;`
`64`	`66`	`}`
`65`	`67`	`}`
`66`	`68`
`@@ -89,7 +91,7 @@ public LoadFieldOperand(Operand structOperand, String fieldName, int field) {`
`89`	`91`
`90`	`92`	`@Override`
`91`	`93`	`public String toString() {`
`92`		`- return structOperand + "." + fieldName + "(" + fieldIndex + ")";`
	`94`	`+ return structOperand + "." + fieldName;`
`93`	`95`	`}`
`94`	`96`	`}`
`95`	`97`