X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=6813fbf9c351bf863aaf96d599a1d10ee565286f;hp=b7c572b609049776dfe8e73865b24ce3723d24a1;hb=09dd4d38eeffac7fd6eaa88a064bdacf99ae875e;hpb=d2765c4da1c043455d8c09da02d95f5f740594d8

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index b7c572b..6813fbf 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.3";
+	public static String versionN = "0.1.4";
 
 	public static final int M_ERR = 2, M_WAR = 1, M_DEB = 0;
 	
@@ -109,10 +109,12 @@ public class mjc2wsl{
 			"C:\" This file automatically converted from microjava bytecode\";\n"
 			+"C:\" with mjc2wsl v "+versionN+"\";\n");
 
-		ret.append("VAR < tempa := 0, tempb := 0, tempres :=0,\n");
+		ret.append("VAR < tempa := 0, tempb := 0, tempres :=0,\n\t");
 		for (int i = 0; i <= 3; i++)
-			ret.append("loc" + i + " := 0, ");
-		ret.append("\n	estack := < >, t_e_m_p := 0 > :");
+			ret.append("mjvm_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 > :");
 
 		return ret.toString();
 	}
@@ -123,6 +125,38 @@ public class mjc2wsl{
 	
 	private boolean originalInComments = false;	
 	
+	private HashMap<Integer,String> opMap = null;
+	
+	private String opCodeFile = "mj-bytecodes.properties";
+	
+	private HashMap<Integer,String> getOpMap() {
+			if (opMap==null) {
+					opMap = new HashMap<Integer, String> (60, 0.98f);
+					try{
+					BufferedReader in = new BufferedReader(
+							new InputStreamReader(getClass().getResourceAsStream(opCodeFile)));
+					String str = in.readLine();
+					while (str != null) {
+							String[] ss = str.split("=");
+							opMap.put(Integer.parseInt(ss[0]),ss[1]);
+							str = in.readLine();
+					}
+					in.close();
+					}catch (Exception ex) {
+						ex.printStackTrace();
+					}
+			}
+			return opMap;
+	}
+	
+	public String getOpString(int op) {
+			return getOpMap().get(op);
+	}
+	
+	public String describeOpCode(int op) {
+			return op + " (" + getOpString(op) + ")";
+	}
+	
 	private InputStream mainIn;
 	private PrintWriter out = null;
 	private int counter = -1;
@@ -165,7 +199,7 @@ public class mjc2wsl{
 	}
 	
 	private String loc(int i){
-		return "loc" + i;
+		return "mjvm_loc" + i;
 	}
 	
 	/**
@@ -186,16 +220,18 @@ public class mjc2wsl{
 		return "C:\"" + type + str.replace("\"", "''") + "\";";
 	}
 
+	//Expression stack
+	
 	private String cmdToEStack(int i) {
-		return "estack := <" + i + " > ++ estack;";
+		return "mjvm_estack := <" + i + " > ++ mjvm_estack;";
 	}
 
 	private String cmdToEStack(String i) {
-		return "estack := <" + i + " > ++ estack;";
+		return "mjvm_estack := <" + i + " > ++ mjvm_estack;";
 	}
 
 	private String cmdFromEStack(String st) {
-		return st + " := HEAD(estack); estack := TAIL(estack);";
+		return st + " := HEAD(mjvm_estack); mjvm_estack := TAIL(mjvm_estack);";
 	}
 	
 	private String getTopTwo(){
@@ -206,6 +242,20 @@ public class mjc2wsl{
 		return cmdFromEStack("tempa");
 	}
 	
+	//Method stack
+	
+	private String cmdToMStack(int i) {
+		return "mjvm_mstack := <" + i + " > ++ mjvm_mstack;";
+	}
+
+	private String cmdToMStack(String i) {
+		return "mjvm_mstack := <" + i + " > ++ mjvm_mstack;";
+	}
+
+	private String cmdFromMStack(String st) {
+		return st + " := HEAD(mjvm_mstack); mjvm_mstack := TAIL(mjvm_mstack);";
+	}
+	
 	private String getRelationFor(int opcode) throws Exception {
 			switch (opcode) {
 					case jeq: return "=";
@@ -229,7 +279,7 @@ public class mjc2wsl{
 		int op = get();
 		while (op >= 0) {
 			if (originalInComments)
-				prl(createComment("" + op, C_OC));
+				prl(createComment(describeOpCode(op), C_OC));
 			prl("a" + counter + " == ");
 			switch (op) {
 			case load: {
@@ -330,11 +380,18 @@ public class mjc2wsl{
 				break;
 			}
 
-			//TODO call
+			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);
+				prl("IF EMPTY?(mjvm_mstack) THEN CALL Z ELSE");
+				//else we let things return		
+				prl(cmdFromMStack("tempa"));
+				prl("SKIP FI");
+				prl("END b"+counter+" ==");
 				break;
 			}
 			case enter: {
@@ -351,6 +408,11 @@ public class mjc2wsl{
 			}
 
 			//TODO read, print
+			case read: {
+				prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));");
+				prl(cmdToEStack("tempa"));
+				break;
+			}
 
 			// the prints
 			case bprint: {