X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=b7edf0bec3d47fd6718b2dff997ae57c90e01bb8;hp=c482ccfeaa9c294df9d3a1dc75485686dc93be14;hb=2050d4ec077043d9e84577d28951ba072e3688bf;hpb=b7f0a8052e0644d10da8ecba9b3fc413a793d263 diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index c482ccf..b7edf0b 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -10,16 +10,16 @@ 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; + public static final int M_ERR = 2, M_WAR = 1, M_DEB = 0; - private int printLevel = 0; + private int printLevel = M_ERR; private int[] messageCounters = new int[M_ERR+1]; private void message(String mes, int level){ - if (level>printLevel) + if (level>=printLevel) System.out.println(mes); messageCounters[level]++; } @@ -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(); } @@ -165,7 +167,7 @@ public class mjc2wsl{ } private String loc(int i){ - return "loc" + i; + return "mjvm_loc" + i; } /** @@ -186,16 +188,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 +210,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 "="; @@ -254,6 +272,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 +291,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,6 +324,44 @@ 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); @@ -327,17 +369,14 @@ public class mjc2wsl{ get(); break; } - case return_: { - prl(createComment("return not fully procesed yet")); - message("return not fully procesed yet", M_WAR); - 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 +395,9 @@ public class mjc2wsl{ break; } + //TODO trap + + op = get(); if (op >= 0) prl("CALL a" + counter + " END"); @@ -378,7 +420,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){ @@ -407,6 +452,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++; } @@ -436,7 +487,6 @@ public class mjc2wsl{ } if (f.exists()) { Calendar now = Calendar.getInstance(); - printLevel=10; convertFile(f); long mili = Calendar.getInstance().getTimeInMillis() - now.getTimeInMillis();