X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=6cd59e08a6d90082ee5b013cdd2519579713afe2;hp=113bfef0c197ae7d515ee65c9ada0209f9d20486;hb=0c263247bdd9af3332ba985639070e4dc2ff9f6f;hpb=5e03219e880a35b20ba9c2276f24c1f174264b6c;ds=inline

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 113bfef..6cd59e0 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -28,7 +28,7 @@ import java.util.*;
  * @author Doni Pracner, http://perun.dmi.rs/pracner http://quemaster.com
  */
 public class mjc2wsl{
-	public static String versionN = "0.1.6";
+	public static String versionN = "0.1.7";
 
 	private TransMessages messages = new TransMessages();
 
@@ -192,15 +192,14 @@ public class mjc2wsl{
 	public String createStandardStart(int numWords){
 		StringBuilder ret = new StringBuilder(
 			"C:\" This file automatically converted from microjava bytecode\";\n"
-			+"C:\" with mjc2wsl v "+versionN+"\";\n\n");
-
-		ret.append(createAsciiString());
+			+"C:\" with mjc2wsl v "+versionN+"\";\n");
 
 		ret.append("\nBEGIN");
 		ret.append("\nVAR <\n\t");
 		ret.append("mjvm_locals := ARRAY(1,0),");
 		ret.append("\n\tmjvm_statics := ARRAY("+numWords+",0),");
 		ret.append("\n\tmjvm_arrays := < >,");
+		ret.append("\n\tmjvm_flag_jump := 0,");
 		ret.append("\n\tmjvm_objects := < >,");
 		ret.append("\n\tmjvm_estack := < >, mjvm_mstack := < > > :");
 
@@ -220,7 +219,7 @@ public class mjc2wsl{
 		ret.append("\nWHERE\n");
 		
 		ret.append("\nFUNCT CHR(num) ==:\n");
-		ret.append("\tSUBSTR(ascii,num,1)\n");
+		ret.append("\t@List_To_String(< num >)\n");
 		ret.append("END\n");
 
 		ret.append("\nPROC Print_MJ(val, format VAR)==\n");
@@ -231,13 +230,9 @@ public class mjc2wsl{
 
 		ret.append("\nPROC Print_MJ_CHAR(val, format VAR)==\n");
 		ret.append(createComment("print spacing", C_SPEC));
-		ret.append("\n\tIF val=10 OR val=13 THEN\n");
-		ret.append("\t\tPRINT(\"\");\n");
-		ret.append("\tELSE\n");
-		ret.append("\t\tIF format>1 THEN\n\t\t\tFOR i:=2 TO ");
+		ret.append("\n\tIF format>1 THEN\n\t\tFOR i:=2 TO ");
 		ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n");
-		ret.append("\t\tFI;\n\t\tPRINFLUSH(CHR(val))\n");
-		ret.append("\tFI\n");
+		ret.append("\tFI;\n\tPRINFLUSH(CHR(val))\n");
 		ret.append("END\n");
 
 		ret.append("\nEND");
@@ -522,19 +517,23 @@ public class mjc2wsl{
 			}
 
 			case shl: {
+				prl(createStartVar("tempa", "tempb"));
 				prl(createTopTwoEStack());
 				prl("VAR <tempres :=tempb, i:=1 >:");
 				prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres * 2 OD;");
 				prl(createToEStack("tempres"));
 				prl("ENDVAR;");
+				prl(createEndVar());
 				break;
 			}
 			case shr: {
+				prl(createStartVar("tempa", "tempb"));
 				prl(createTopTwoEStack());
 				prl("VAR <tempres :=tempb, i:=1 >:");
 				prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres DIV 2 OD;");
 				prl(createToEStack("tempres"));
 				prl("ENDVAR;");
+				prl(createEndVar());
 				break;
 			}
 
@@ -555,47 +554,56 @@ public class mjc2wsl{
 			case newarray: {
 				get();// 0 - bytes, 1 - words; ignore for now
 				// TODO take into consideration 0/1
+				prl(createStartVar("tempa"));
 				prl(createTopEStack());
 				prl("mjvm_arrays := mjvm_arrays ++ < ARRAY(tempa,0) >;");
 				prl(createToEStack("LENGTH(mjvm_arrays)"));
+				prl(createEndVar());
 				break;
 			}
 
 			case aload:
 			case baload: {
+				prl(createStartVar("tempa", "tempb"));
 				prl(createTopTwoEStack());
 				prl(createToEStack(createArray("tempb") + "[tempa+1]"));
+				prl(createEndVar());
 				break;
 			}
 			case astore:
 			case bastore: {
+				prl(createStartVar("tempa", "tempb", "tempres"));
 				prl(createFromEStack("tempres"));
 				prl(createTopTwoEStack());
-				// we need to use a temparray as a pointer, WSL
-				// otherwise tries to access it as a list of lists and fails
-				prl("VAR < tempArray := " + createArray("tempb") + " > :");
-				prl("tempArray[tempa+1]:=tempres ENDVAR;");
+				prl("mjvm_arrays[tempb][tempa+1]:=tempres;");
+				prl(createEndVar());
 				break;
 			}
 			case arraylength: {
+				prl(createStartVar("tempa", "tempb"));
 				prl(createTopEStack());
 				prl("tempb := LENGTH("+ createArray("tempa") + ");");
 				prl(createToEStack("tempb"));
+				prl(createEndVar());
 				break;
 			}
 
 			case dup: {
+				prl(createStartVar("tempa", "tempb"));
 				prl(createTopEStack());
 				prl(createToEStack("tempa"));
 				prl(createToEStack("tempa"));
+				prl(createEndVar());
 				break;
 			}
 			case dup2: {
+				prl(createStartVar("tempa", "tempb"));
 				prl(createTopTwoEStack());
 				prl(createToEStack("tempb"));
 				prl(createToEStack("tempa"));
 				prl(createToEStack("tempb"));
 				prl(createToEStack("tempa"));
+				prl(createEndVar());
 				break;
 			}
 
@@ -617,10 +625,15 @@ public class mjc2wsl{
 			case jge: {
 				prl(createStartVar("tempa", "tempb"));
 				prl(createTopTwoEStack());
-				prl("IF tempb " + getRelationFor(op) + " tempa THEN CALL a"
-						+ (counter + get2()) + " ELSE CALL a" + (counter + 1)
+				prl("IF tempb " + getRelationFor(op) 
+						+ " tempa THEN mjvm_flag_jump := 1"
+						+ " ELSE mjvm_flag_jump := 0" 
 						+ " FI;");
 				prl(createEndVar());
+				prl("IF mjvm_flag_jump = 1 THEN CALL a"
+						+ (counter + get2()) 
+						+ " ELSE CALL a" + (counter + 1)
+						+ " FI;");
 				
 				break;
 			}