X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=52c75422b7b7a6bd6ecc6a044830c69da686dbce;hp=bc6f4656427485f057a9bfe8e4b4676113b3d616;hb=cfbe705d9e35ecdeae7a6e25ef79f8dff08999e3;hpb=37bd7e6ee3efaa3a310c4cd6ead85cbeda90ca94

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index bc6f465..52c7542 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -28,13 +28,15 @@ import java.util.*;
  * @author Doni Pracner, http://perun.dmi.rs/pracner http://quemaster.com
  */
 public class mjc2wsl{
-	public static String versionN = "0.1.5";
+	public static String versionN = "0.1.6";
 
 	private TransMessages messages = new TransMessages();
 
 	private boolean genPauseAfterEachAddress=false, 
 		genPrintForEachAddress = false,
 		genPrintEStackOnChange = false;
+		
+	private boolean genPopPush=false;
 	
 	/** Constant used for marking a regular comment from the original file */
 	public static final char C_REG = ' ';
@@ -193,7 +195,7 @@ public class mjc2wsl{
 			+"C:\" with mjc2wsl v "+versionN+"\";\n");
 	
 		ret.append("BEGIN ");
-		ret.append("VAR < tempa := 0, tempb := 0, tempres :=0,\n\t");
+		ret.append("VAR < \n\t");
 		ret.append("mjvm_locals := ARRAY(1,0), ");
 		ret.append("\n\tmjvm_statics := ARRAY("+numWords+",0), ");
 		ret.append("\n\tmjvm_arrays := < >, ");
@@ -271,26 +273,37 @@ public class mjc2wsl{
 	public static String createComment(String str, char type) {
 		return "C:\"" + type + str.replace("\"", "''") + "\";";
 	}
+	
+	// generalised stack operations
+	
+	private String createToStack(String stack, String var){
+		if (genPopPush)
+				return 	"PUSH("+stack+"," + var + ");";
+		else
+				return stack + " := <" + var + " > ++ " + stack +";";
+	}
 
-	//Expression stack
+	private String createFromStack(String stack, String var){
+		if (genPopPush)
+			return "POP("+ var + ", "+stack+");";
+		else
+			return var + ":= HEAD("+stack+"); "+stack+" := TAIL("+stack+");";
+	}
+//Expression stack
 	
 	private String createToEStack(int i) {
-		String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;";
-		if (genPrintEStackOnChange)
-			res += "PRINT(\"eStack\",mjvm_estack);";
-		return res;
+		return createToEStack(i+"");
 	}
 
 	private String createToEStack(String i) {
-		String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;";
+		String res = createToStack("mjvm_estack", i);
 		if (genPrintEStackOnChange)
 			res += "PRINT(\"eStack\",mjvm_estack);";
 		return res;
 	}
 
 	private String createFromEStack(String st) {
-		String res = st
-				+ " := HEAD(mjvm_estack); mjvm_estack := TAIL(mjvm_estack);";
+		String res = createFromStack("mjvm_estack",st);
 		if (genPrintEStackOnChange)
 			res += "PRINT(\"eStack\",mjvm_estack);";
 		return res;
@@ -314,15 +327,15 @@ public class mjc2wsl{
 	//Method stack
 
 	private String createToMStack(int i) {
-		return "mjvm_mstack := <" + i + " > ++ mjvm_mstack;";
+		return createToMStack(i+"");
 	}
 
 	private String createToMStack(String i) {
-		return "mjvm_mstack := <" + i + " > ++ mjvm_mstack;";
+		return createToStack("mjvm_mstack", i);
 	}
 
 	private String createFromMStack(String st) {
-		return st + " := HEAD(mjvm_mstack); mjvm_mstack := TAIL(mjvm_mstack);";
+		return createFromStack("mjvm_mstack", st);
 	}
 
 	private String getRelationFor(int opcode) throws Exception {
@@ -373,7 +386,10 @@ public class mjc2wsl{
 			case load_1:
 			case load_2:
 			case load_3: {
-				prl(createToEStack(createLocal(op - load_0)));
+				prl(createStartVar("tempa"));
+				prl("tempa :="+createLocal(op - load_0)+";");
+				prl(createToEStack("tempa"));
+				prl(createEndVar());
 				break;
 			}
 			case store: {
@@ -384,7 +400,10 @@ public class mjc2wsl{
 			case store_1:
 			case store_2:
 			case store_3: {
-				prl(createFromEStack(createLocal(op - store_0)));
+				prl(createStartVar("tempa"));
+				prl(createFromEStack("tempa"));
+				prl(createLocal(op - store_0)+" := tempa;");
+				prl(createEndVar());
 				break;
 			}
 
@@ -429,21 +448,27 @@ public class mjc2wsl{
 			}
 
 			case add: {
+				prl(createStartVar("tempa", "tempb", "tempres"));
 				prl(createTopTwoEStack());
 				prl("tempres := tempb + tempa;");
 				prl(createToEStack("tempres"));
+				prl(createEndVar());
 				break;
 			}
 			case sub: {
+				prl(createStartVar("tempa", "tempb", "tempres"));
 				prl(createTopTwoEStack());
 				prl("tempres := tempb - tempa;");
 				prl(createToEStack("tempres"));
+				prl(createEndVar());
 				break;
 			}
 			case mul: {
+				prl(createStartVar("tempa", "tempb", "tempres"));
 				prl(createTopTwoEStack());
 				prl("tempres := tempb * tempa;");
 				prl(createToEStack("tempres"));
+				prl(createEndVar());
 				break;
 			}
 			case div: {
@@ -466,8 +491,10 @@ public class mjc2wsl{
 			}
 
 			case neg: {
+				prl(createStartVar("tempa"));
 				prl(createTopEStack());
 				prl(createToEStack("-tempa"));
+				prl(createEndVar());				
 				break;
 			}
 
@@ -565,10 +592,13 @@ public class mjc2wsl{
 			case jle:
 			case jgt:
 			case jge: {
+				prl(createStartVar("tempa", "tempb"));
 				prl(createTopTwoEStack());
 				prl("IF tempb " + getRelationFor(op) + " tempa THEN CALL a"
 						+ (counter + get2()) + " ELSE CALL a" + (counter + 1)
 						+ " FI;");
+				prl(createEndVar());
+				
 				break;
 			}
 
@@ -605,8 +635,10 @@ public class mjc2wsl{
 				prl(createComment("char is read like a number", C_SPEC));
 			}
 			case read: {
+				prl(createStartVar("tempa"));
 				prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));");
 				prl(createToEStack("tempa"));
+				prl(createEndVar());
 				break;
 			}
 
@@ -619,8 +651,11 @@ public class mjc2wsl{
 			}
 			case print: {
 				// TODO printing numbers needs different lengths of spacing
+				prl(createStartVar("tempa", "tempb"));
+
 				prl(createTopTwoEStack());
 				prl("Print_MJ(tempb,tempa);");
+				prl(createEndVar());
 				break;
 			}
 
@@ -668,6 +703,8 @@ public class mjc2wsl{
 		System.out.println();
 		printHelpOutput();
 		System.out.println();
+		printHelpDirectives();
+		System.out.println();
 		printHelpGenerating();
 		System.out.println();
 		printHelpHelp();
@@ -691,6 +728,11 @@ public class mjc2wsl{
 		System.out.println("  --genAll   short for applying all code generation");
 	}
 
+	public void printHelpDirectives(){
+		System.out.println("Alternatives for code generation:");
+		System.out.println("  --genPopPush generate POP/PUSH instead of TAIL/HEAD");
+	}
+
 	public void printHelpHelp() {
 		System.out.println("Help and info options");
 		System.out.println("  -h basic help");
@@ -759,6 +801,8 @@ public class mjc2wsl{
 					genPrintEStackOnChange = true;
 					genPrintForEachAddress = true;
 					genPauseAfterEachAddress = true;
+				} else if (args[i].compareToIgnoreCase("--genPopPush") == 0) {
+					genPopPush = true;
 				}
 				i++;
 			}