X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=69287f6460ba8c3edf0a0b0eef48829c055cc6b8;hp=970089e1674a9360aad8d7627b2e2c139718e0b4;hb=14e2062e3bd241ae77571820a3beb5a3339dd06d;hpb=34d91ce4e669ada036d2d8dfb969218465c9f7e2;ds=sidebyside diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index 970089e..69287f6 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -10,16 +10,42 @@ import java.util.*; * @author Doni Pracner, http://perun.dmi.rs/pracner http://quemaster.com */ public class mjc2wsl{ - public static String versionN = "0.1.2"; - - //regular comments from the original file - //OC when original code is inserted in the file, next to the translations - //SPEC special messages from the translator - //ERR error messages from the translator - public static final char C_REG = ' ', C_OC = '#', C_SPEC = '&', C_ERR = '!'; + public static String versionN = "0.1.3"; - /** instruction code */ - public static final int + 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 = ' '; + /** + * Constant used for marking when original code is inserted in the file, + * next to the translations + */ + public static final char C_OC = '#'; + /** Constant used for marking special messages from the translator */ + public static final char C_SPEC = '&'; + /** Constant used for marking error messages from the translator */ + public static final char C_ERR = '!'; + + /** instruction code in MicroJava bytecode. */ + public static final int load = 1, load_0 = 2, load_1 = 3, @@ -83,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(); } @@ -139,7 +167,7 @@ public class mjc2wsl{ } private String loc(int i){ - return "loc" + i; + return "mjvm_loc" + i; } /** @@ -160,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(){ @@ -179,8 +209,34 @@ public class mjc2wsl{ private String getTop() { return cmdFromEStack("tempa"); } + + //Method stack + + private String cmdToMStack(int i) { + return "mjvm_mstack := <" + i + " > ++ mjvm_mstack;"; + } - public void convertStream(InputStream ins){ + 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 jlt: return "<"; + case jle: return "<="; + case jgt: return ">"; + case jge: return ">="; + } + throw new Exception("Wrong opcode for a relation"); + } + + public void convertStream(InputStream ins) throws Exception{ mainIn = ins; //skip start TODO make better for (int i = 0; i < 14; i++) @@ -216,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; @@ -231,6 +291,45 @@ public class mjc2wsl{ break; } + case add: { + prl(getTopTwo()); + prl("tempres := tempb + tempa;"); + prl(cmdToEStack("tempres")); + break; + } + case sub: { + prl(getTopTwo()); + prl("tempres := tempb - tempa;"); + prl(cmdToEStack("tempres")); + break; + } + case mul: { + prl(getTopTwo()); + prl("tempres := tempb * tempa;"); + prl(cmdToEStack("tempres")); + break; + } + case div: { + prl(getTopTwo()); + prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;"); + prl("tempres := tempb DIV tempa;"); + prl(cmdToEStack("tempres")); + break; + } + case rem: { + prl(getTopTwo()); + prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;"); + prl("tempres := tempb MOD tempa;"); + prl(cmdToEStack("tempres")); + 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; @@ -243,39 +342,41 @@ public class mjc2wsl{ case jgt: case jge: { prl(getTopTwo()); - prl("IF tempb >= tempa THEN CALL a" + (counter + get2()) + prl("IF tempb "+ getRelationFor(op) + +" tempa THEN CALL a" + (counter + get2()) + " FI;"); break; } - case add: { - prl(getTopTwo()); - prl("tempres := tempb + tempa;"); - prl(cmdToEStack("tempres")); + case call: { + prl(cmdToMStack(counter+2)); + prl("CALL a" + (counter + get2()) + ";"); break; } - case div: { - prl(getTopTwo()); - prl("tempres := tempb / tempa;"); - prl(cmdToEStack("tempres")); + + 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()); @@ -290,9 +391,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"); @@ -315,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){ @@ -344,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++; } @@ -377,6 +491,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");