Merge branch 'master' into op_logical

Makefile

 CLEAN=mvn clean package
 TEST=java -cp "chocopy-ref.jar:target/assignment.jar" chocopy.ChocoPy --pass=..s --run --dir src/test/data/pa3/sample/ --test
-FILE=op_cmp_int
-CHECKPOINTS=src/test/data/pa3/sample/literal_bool.py src/test/data/pa3/sample/literal_int.py src/test/data/pa3/sample/literal_str.py src/test/data/pa3/sample/id_global.py src/test/data/pa3/sample/id_local.py src/test/data/pa3/sample/var_assign.py src/test/data/pa3/sample/call.py src/test/data/pa3/sample/call_with_args.py src/test/data/pa3/sample/nested.py src/test/data/pa3/sample/nested2.py src/test/data/pa3/sample/op_add.py src/test/data/pa3/sample/op_cmp_bool.py src/test/data/pa3/sample/op_cmp_int.py src/test/data/pa3/sample/op_div_mod.py	 src/test/data/pa3/sample/op_logical.py src/test/data/pa3/sample/op_mul.py src/test/data/pa3/sample/op_negate.py src/test/data/pa3/sample/op_sub.py src/test/data/pa3/sample/stmt_if.py src/test/data/pa3/sample/stmt_while.py src/test/data/pa3/sample/stmt_return_early.py src/test/data/pa3/benchmarks/exp.py src/test/data/pa3/benchmarks/prime.py
 
+TESTB=java -cp "chocopy-ref.jar:target/assignment.jar" chocopy.ChocoPy --pass=..s --run --dir src/test/data/pa3/benchmarks/ --test
+FILE=op_logical
 clean:
 	$(CLEAN)
 test:
@@ -17,3 +17,9 @@ assembly:
 	java -cp "chocopy-ref.jar:target/assignment.jar" chocopy.ChocoPy --pass=..s src/test/data/pa3/sample/$(FILE).py.ast.typed --out src/test/data/pa3/sample/$(FILE).py.s
 reference-assembly:
 	java -cp "chocopy-ref.jar:target/assignment.jar" chocopy.ChocoPy --pass=..r src/test/data/pa3/sample/$(FILE).py.ast.typed --out src/test/data/pa3/sample/$(FILE).py.s
+
+testb:
+	$(TESTB)
+clean-testb:
+	$(CLEAN) ; $(TESTB)
+

src/main/java/chocopy/pa3/CodeGenImpl.java

@@ -316,6 +316,7 @@ public class CodeGenImpl extends CodeGenBase {
 
         @Override
         public Void analyze(AssignStmt node) {
+            backend.emitADDI(SP, SP, -4, "Increment stack ptr by 1 for Condition");
             node.value.dispatch(this);
             RiscVBackend.Register tmpReg = /*regMgr.borrowOneTmp()*/ T6;
             RiscVBackend.Register tmpReg2 = /*regMgr.borrowOneTmp()*/ T5;
@@ -371,7 +372,7 @@ public class CodeGenImpl extends CodeGenBase {
 
         @Override
         public Void analyze(IfStmt node) {
-            backend.emitADDI(SP, SP, -4, "Increment by 1 for condition");
+            backend.emitADDI(SP, SP, -4, "Increment stack ptr by 1 for Condition");
             node.condition.dispatch(this);
             RiscVBackend.Register tmpReg = /*regMgr.borrowTmp()*/ T6;
             betterBackend.emitPop(tmpReg, "IfStmt: Get condition");