X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=8425314ccddff1e99ee9572929737de989907de8;hp=2f6aa8d944212439f6405405c04435bb7343c502;hb=2dc9cef8f7bcc29a968250b0939cd3405ac50057;hpb=1b7d6ae9ea605e75294f59d4fbe86968d93bacd9

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 2f6aa8d..8425314 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -32,8 +32,9 @@ public class mjc2wsl{
 			out.println("total errors:"+messageCounters[M_ERR]+" warnings:"+messageCounters[M_WAR]);
 	}
 	
-	private boolean addPauseAfterEachAddress=false, 
-		addPrintForEachAddress = false;
+	private boolean genPauseAfterEachAddress=false, 
+		genPrintForEachAddress = false,
+		genPrintEStackOnChange = false;
 	
 	/** Constant used for marking a regular comment from the original file */
 	public static final char C_REG = ' ';
@@ -114,7 +115,7 @@ public class mjc2wsl{
 
 		ret.append("VAR < tempa := 0, tempb := 0, tempres :=0,\n\t");
 		for (int i = 0; i <= 3; i++)
-			ret.append("mjvm_loc" + i + " := 0, ");
+			ret.append(loc(i) + " := 0, ");
 		ret.append("\n	mjvm_estack := < >, mjvm_mstack := < >, "); 
 		ret.append("\n	mjvm_fp := 0, mjvm_sp := 0,");
 		ret.append("\n	t_e_m_p := 0 > :");
@@ -226,15 +227,21 @@ public class mjc2wsl{
 	//Expression stack
 	
 	private String cmdToEStack(int i) {
-		return "mjvm_estack := <" + i + " > ++ mjvm_estack;";
+		String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;";
+		if (genPrintEStackOnChange) res +="PRINT(\"eStack\",mjvm_estack);";
+		return res;
 	}
 
 	private String cmdToEStack(String i) {
-		return "mjvm_estack := <" + i + " > ++ mjvm_estack;";
+		String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;";
+		if (genPrintEStackOnChange) res +="PRINT(\"eStack\",mjvm_estack);";
+		return res;
 	}
 
 	private String cmdFromEStack(String st) {
-		return st + " := HEAD(mjvm_estack); mjvm_estack := TAIL(mjvm_estack);";
+		String res = st + " := HEAD(mjvm_estack); mjvm_estack := TAIL(mjvm_estack);";
+		if (genPrintEStackOnChange) res +="PRINT(\"eStack\",mjvm_estack);";
+		return res;
 	}
 	
 	private String getTopTwo(){
@@ -293,9 +300,9 @@ public class mjc2wsl{
 			if (originalInComments)
 				prl(createComment(describeOpCode(op), C_OC));
 			prl("a" + counter + " == ");
-			if (addPrintForEachAddress) {
+			if (genPrintForEachAddress) {
 					prl("PRINT(\"a"+counter+"\");");
-					if (addPauseAfterEachAddress)
+					if (genPauseAfterEachAddress)
 							prl("debug_disposable_string := @Read_Line(Standard_Input_Port);");
 			}
 			switch (op) {
@@ -419,7 +426,7 @@ public class mjc2wsl{
 				
 				get();
 				for (int i = parameters-1; i >= 0; i--)
-						prl(cmdFromEStack("mjvm_loc" + i));
+						prl(cmdFromEStack(loc(i)));
 				break;
 			}
 			case exit: {
@@ -449,10 +456,7 @@ public class mjc2wsl{
 			}
 
 			case trap: {
-				// TODO finish trap
-				prl(createComment("trap not fully procesed yet"));
-				message("trap not fully procesed yet", M_WAR);
-				get();
+				prl("ERROR(\"Runtime error: trap("+get()+")\");");
 				break;
 			}
 			
@@ -519,16 +523,28 @@ public class mjc2wsl{
 						originalInComments = args[i].charAt(4) == '+';
 					else
 						originalInComments = true;
-				} else if (args[i].startsWith("--screen")) {
+				} else if (args[i].compareTo("--screen") == 0) {
 					out = new PrintWriter(System.out);
 				} else if (args[i].compareTo("-d") == 0) {
 					printLevel = M_DEB;//print debug info
 				} else if (args[i].compareTo("-v") == 0) {
 					printLevel = M_WAR;//print warnings
 				} else if (args[i].compareTo("-q") == 0) {
-					printLevel = M_ERR+1;//no printing
-				}
-				i++;
+					printLevel = M_ERR+1;//no printing				
+				} else if (args[i].compareToIgnoreCase("--genEStackPrint") == 0) {
+					genPrintEStackOnChange = true;
+				} else if (args[i].compareToIgnoreCase("--genAddrPause") == 0) {
+					genPauseAfterEachAddress = true;
+				} else if (args[i].compareToIgnoreCase("--genAddrPrint") == 0) {
+					genPrintForEachAddress = true;
+				} else if (args[i].compareToIgnoreCase("--genAddr") == 0) {
+					genPrintForEachAddress = true;
+					genPauseAfterEachAddress = true;
+				} else if (args[i].compareToIgnoreCase("--genAll") == 0) {
+					genPrintEStackOnChange = true;
+					genPrintForEachAddress = true;
+					genPauseAfterEachAddress = true;
+				}i++;
 			}
 
 			if (i >= args.length) {