X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=f84fc3a29ae758a6575b950d061f6ed936d42487;hp=574adcc523ccf7177ffba95f4aa17f48b29e64f0;hb=34fbcd7d5825cd670082f11dcec087e5121c8115;hpb=6501c29ac1dc5bee4958b26f347f579b8a22809e

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 574adcc..f84fc3a 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -10,7 +10,7 @@ import java.util.*;
  * @author Doni Pracner, http://perun.dmi.rs/pracner http://quemaster.com
  */
 public class mjc2wsl{
-	public static String versionN = "0.1.2";
+	public static String versionN = "0.1.3";
 
 	public static final int M_ERR = 2, M_WAR = 1, M_DEB = 0;
 	
@@ -112,7 +112,7 @@ public class mjc2wsl{
 		ret.append("VAR < tempa := 0, tempb := 0, tempres :=0,\n");
 		for (int i = 0; i <= 3; i++)
 			ret.append("loc" + i + " := 0, ");
-		ret.append("\n	estack := < >, t_e_m_p := 0 > :");
+		ret.append("\n	estack := < >, mstack := < >, t_e_m_p := 0 > :");
 
 		return ret.toString();
 	}
@@ -186,6 +186,8 @@ public class mjc2wsl{
 		return "C:\"" + type + str.replace("\"", "''") + "\";";
 	}
 
+	//Expression stack
+	
 	private String cmdToEStack(int i) {
 		return "estack := <" + i + " > ++ estack;";
 	}
@@ -206,6 +208,20 @@ public class mjc2wsl{
 		return cmdFromEStack("tempa");
 	}
 	
+	//Method stack
+	
+	private String cmdToMStack(int i) {
+		return "mstack := <" + i + " > ++ mstack;";
+	}
+
+	private String cmdToMStack(String i) {
+		return "mstack := <" + i + " > ++ mstack;";
+	}
+
+	private String cmdFromMStack(String st) {
+		return st + " := HEAD(mstack); mstack := TAIL(mstack);";
+	}
+	
 	private String getRelationFor(int opcode) throws Exception {
 			switch (opcode) {
 					case jeq: return "=";
@@ -254,6 +270,10 @@ public class mjc2wsl{
 				prl(cmdFromEStack(loc(op - store_0)));
 				break;
 			}
+			
+			//TODO getstatic, putstatic
+			//TODO getfield, putfield
+			
 			case const_: {
 				prl(cmdToEStack(get4()));
 				break;
@@ -269,24 +289,6 @@ public class mjc2wsl{
 				break;
 			}
 
-			case jmp: {
-				prl("CALL a" + (counter + get2()) + ";");
-				break;
-			}
-
-			case jeq:
-			case jne:
-			case jlt:
-			case jle:
-			case jgt:
-			case jge: {
-				prl(getTopTwo());
-				prl("IF tempb "+ getRelationFor(op)
-						+" tempa THEN CALL a" + (counter + get2())
-						+ " FI;");
-				break;
-			}
-
 			case add: {
 				prl(getTopTwo());
 				prl("tempres := tempb + tempa;");
@@ -320,24 +322,56 @@ public class mjc2wsl{
 				break;
 			}
 
-			case enter: {
-				prl(createComment("enter not fully procesed yet"));
-				message("enter not fully procesed yet", M_WAR);
-				get();
-				get();
+			//TODO neg, shl, shr, inc
+			//TODO new_ newarray
+			//TODO aload, asstore, baload, bastore
+			//TODO arraylength
+			//TODO pop, dup, dup2
+			
+			case jmp: {
+				prl("CALL a" + (counter + get2()) + ";");
+				break;
+			}
+
+			case jeq:
+			case jne:
+			case jlt:
+			case jle:
+			case jgt:
+			case jge: {
+				prl(getTopTwo());
+				prl("IF tempb "+ getRelationFor(op)
+						+" tempa THEN CALL a" + (counter + get2())
+						+ " FI;");
 				break;
 			}
+
+			case call: {
+				prl(cmdToMStack(counter+2));
+				prl("CALL a" + (counter + get2()) + ";");
+				break;
+			}
+
 			case return_: {
 				prl(createComment("return not fully procesed yet"));
 				message("return not fully procesed yet", M_WAR);
 				break;
 			}
+			case enter: {
+				prl(createComment("enter not fully procesed yet"));
+				message("enter not fully procesed yet", M_WAR);
+				get();
+				get();
+				break;
+			}
 			case exit: {
 				prl(createComment("exit not fully procesed yet"));
 				message("exit not fully procesed yet", M_WAR);
 				break;
 			}
 
+			//TODO read, print
+
 			// the prints
 			case bprint: {
 				prl(getTopTwo());
@@ -356,6 +390,9 @@ public class mjc2wsl{
 				break;
 			}
 
+			//TODO trap
+
+
 			op = get();
 			if (op >= 0)
 				prl("CALL a" + counter + " END");