fixed issue with method invocation. the J1_basicTest (static method invocation) now works

CodeGenUtils.py

@@ -3,8 +3,8 @@
 # String, String, String/None, String/None
 def p(instruction, arg1, arg2="", comment=""):
     result = "      " + instruction + " " + str(arg1)
-    if arg2:
-        result += ", " + arg2
+    if arg2 or arg2 == 0:
+        result += ", " + str(arg2)
     if comment:
         result += "      ;" + comment
     return result + "\n"
@@ -65,14 +65,8 @@ def genProcedure(content, comment):
 # Adds method invoke prologue and eilogie around the content
 def genMethodInvoke(method):
     pro = ";Calling a method " + method + "\n" \
-    + p(instruction="push", arg1="eax", comment="saving caller-save register eax") \
-    + p(instruction="push", arg1="ecx", comment="saving caller-save register ecx") \
-    + p(instruction="push", arg1="edx", comment="saving caller-save register edx")
-
-    epi = p(instruction="pop", arg1="edx", comment="restoring caller-save register edx") \
-        + p(instruction="pop", arg1="ecx", comment="restoring caller-save register ecx") \
-        + p(instruction="pop", arg1="eax", comment="restoring caller-save register eax") \
-        + "; End of method invocation\n"
+
+    epi = "; End of method invocation\n"
 
     return (pro, epi)
 

Tests/A5/J1_basicTest.java

@@ -3,12 +3,12 @@ public class J1_basicTest {
     public J1_basicTest() {}
 
     public static int test() {
+        return J1_basicTest.test2();
+    }
+
+    public static int test2(){
 	if (true)
 	    return 123;
 	return 7;
     }
-
-    public static void test2(){
-        J1_basicTest.test();
-    }
 }