X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=ee36c5188cf5d9f791352cd67249c4083c0dc43b;hp=86177134f1bd3cc9d6656c6afa286bd50c501b45;hb=80adcf724041ab52a9dcea93f395440332901634;hpb=1df11af4aa88816abcb609d38793129e11ad983d;ds=sidebyside diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index 8617713..ee36c51 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -10,8 +10,28 @@ 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.4"; + public static final int M_ERR = 2, M_WAR = 1, M_DEB = 0; + + private int printLevel = M_ERR; + + private int[] messageCounters = new int[M_ERR+1]; + + private void message(String mes, int level){ + if (level>=printLevel) + System.out.println(mes); + messageCounters[level]++; + } + + private void printMessageCounters(){ + printMessageCounters(System.out); + } + + private void printMessageCounters(PrintStream out){ + out.println("total errors:"+messageCounters[M_ERR]+" warnings:"+messageCounters[M_WAR]); + } + /** Constant used for marking a regular comment from the original file */ public static final char C_REG = ' '; /** @@ -89,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(); } @@ -103,6 +125,38 @@ public class mjc2wsl{ private boolean originalInComments = false; + private HashMap opMap = null; + + private String opCodeFile = "mj-bytecodes.properties"; + + private HashMap getOpMap() { + if (opMap==null) { + opMap = new HashMap (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; @@ -145,7 +199,7 @@ public class mjc2wsl{ } private String loc(int i){ - return "loc" + i; + return "mjvm_loc" + i; } /** @@ -166,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(){ @@ -186,10 +242,24 @@ 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 "="; - case jne: return "#"; + case jne: return "<>"; case jlt: return "<"; case jle: return "<="; case jgt: return ">"; @@ -209,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: { @@ -234,6 +304,10 @@ public class mjc2wsl{ prl(cmdFromEStack(loc(op - store_0))); break; } + + //TODO getstatic, putstatic + //TODO getfield, putfield + case const_: { prl(cmdToEStack(get4())); break; @@ -249,24 +323,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;"); @@ -300,21 +356,59 @@ public class mjc2wsl{ break; } + //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("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: { prl(createComment("enter not fully procesed yet")); + message("enter not fully procesed yet", M_WAR); get(); get(); break; } - case return_: { - prl(createComment("return not fully procesed yet")); - 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()); @@ -329,9 +423,13 @@ public class mjc2wsl{ } default: prl(createComment("unknown op error: " + op, C_ERR)); + message("unknown op error: "+ op, M_ERR); break; } + //TODO trap + + op = get(); if (op >= 0) prl("CALL a" + counter + " END"); @@ -354,7 +452,10 @@ public class mjc2wsl{ + ", by Doni Pracner"); System.out.println("usage:\n\t {options} mjc2wsl filename [outfile]"); System.out.println("options:\n\t--screen print output to screen"); - System.out.println("\t-o --oc include original code in comments"); + System.out.println("\t-o --oc[+-] include original code in comments"); + System.out.println("\t-v verbose, print warning messages"); + System.out.println("\t-q don't print even the error messages"); + System.out.println("\t-d print detailed debug messages"); } public String makeDefaultOutName(String inname){ @@ -383,6 +484,12 @@ public class mjc2wsl{ originalInComments = true; } else if (args[i].startsWith("--screen")) { 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++; } @@ -416,6 +523,7 @@ public class mjc2wsl{ long mili = Calendar.getInstance().getTimeInMillis() - now.getTimeInMillis(); System.out.println("conversion time:" + mili + " ms"); + printMessageCounters(); out.close(); } else System.out.println("file does not exist");