X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=003081897da1d559f6220449cdd7bd6517f1d2c2;hp=76d225b5c73c5f4b3d08b0bc47e966586b13813f;hb=2f7415a1b72f06124c38c71019b8117a7cbada10;hpb=9fe5956ccf526188287b4e9939b4b73ba22920ba diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index 76d225b..0030818 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -32,8 +32,9 @@ public class mjc2wsl{ out.println("total errors:"+messageCounters[M_ERR]+" warnings:"+messageCounters[M_WAR]); } - private boolean addPauseAfterEachAddress=false, - addPrintForEachAddress = false; + private boolean genPauseAfterEachAddress=false, + genPrintForEachAddress = false, + genPrintEStackOnChange = false; /** Constant used for marking a regular comment from the original file */ public static final char C_REG = ' '; @@ -108,13 +109,19 @@ public class mjc2wsl{ trap = 57; public String getStandardStart(){ + return getStandardStart(10); + } + + public String getStandardStart(int numWords){ StringBuilder ret = new StringBuilder( "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\t"); - for (int i = 0; i <= 3; i++) - ret.append("mjvm_loc" + i + " := 0, "); + ret.append("mjvm_locals := ARRAY(1,0), "); + ret.append("\n\tmjvm_statics := ARRAY("+numWords+",0), "); + ret.append("\n\tmjvm_arrays := < >, "); + ret.append("\n\tmjvm_objects := < >, "); ret.append("\n mjvm_estack := < >, mjvm_mstack := < >, "); ret.append("\n mjvm_fp := 0, mjvm_sp := 0,"); ret.append("\n t_e_m_p := 0 > :"); @@ -132,32 +139,32 @@ public class mjc2wsl{ 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; + 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); + return getOpMap().get(op); } - + public String describeOpCode(int op) { - return op + " (" + getOpString(op) + ")"; + return op + " (" + getOpString(op) + ")"; } private InputStream mainIn; @@ -201,8 +208,25 @@ public class mjc2wsl{ return (get2() << 16) + (get2() << 16 >>> 16); } - private String loc(int i){ - return "mjvm_loc" + i; + private String loc(int i) { + // arrays start at 1 in WSL, so we need an offset + return "mjvm_locals[" + (i + 1) + "]"; + } + + private String genStatic(int i) { + return "mjvm_statics[" + (i + 1) + "]"; + } + + private String genArray(int i) { + return "mjvm_arrays[" + i + "]"; + } + + private String genArray(String i) { + return "mjvm_arrays[" + i + "]"; + } + + private String genObject(String i) { + return "mjvm_objects[" + i + "]"; } /** @@ -226,18 +250,35 @@ public class mjc2wsl{ //Expression stack private String cmdToEStack(int i) { - return "mjvm_estack := <" + i + " > ++ mjvm_estack;"; + String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;"; + if (genPrintEStackOnChange) + res += "PRINT(\"eStack\",mjvm_estack);"; + return res; } private String cmdToEStack(String i) { - return "mjvm_estack := <" + i + " > ++ mjvm_estack;"; + String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;"; + if (genPrintEStackOnChange) + res += "PRINT(\"eStack\",mjvm_estack);"; + return res; } private String cmdFromEStack(String st) { - return st + " := HEAD(mjvm_estack); mjvm_estack := TAIL(mjvm_estack);"; + String res = st + + " := HEAD(mjvm_estack); mjvm_estack := TAIL(mjvm_estack);"; + if (genPrintEStackOnChange) + res += "PRINT(\"eStack\",mjvm_estack);"; + return res; } - - private String getTopTwo(){ + + private String cmdPopEStack() { + String res = "mjvm_estack := TAIL(mjvm_estack);"; + if (genPrintEStackOnChange) + res += "PRINT(\"eStack\",mjvm_estack);"; + return res; + } + + private String getTopTwo() { return cmdFromEStack("tempa") + "\n" + cmdFromEStack("tempb"); } @@ -246,7 +287,7 @@ public class mjc2wsl{ } //Method stack - + private String cmdToMStack(int i) { return "mjvm_mstack := <" + i + " > ++ mjvm_mstack;"; } @@ -258,17 +299,21 @@ public class mjc2wsl{ 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"); + 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"); + } + + private boolean isJumpCode(int opcode) { + return (opcode >= jmp) && (opcode <= jge); } public void convertStream(InputStream ins) throws Exception{ @@ -282,17 +327,18 @@ public class mjc2wsl{ int numberOfWords = get4(); int mainAdr = get4(); - prl(getStandardStart()); - prl("SKIP;\n ACTIONS A_S_start:\n A_S_start == CALL a"+(14+mainAdr)+" END"); + prl(getStandardStart(numberOfWords)); + prl("SKIP;\n ACTIONS A_S_start:\n A_S_start == CALL a" + (14 + mainAdr) + + " END"); int op = get(); while (op >= 0) { if (originalInComments) prl(createComment(describeOpCode(op), C_OC)); prl("a" + counter + " == "); - if (addPrintForEachAddress) { - prl("PRINT(\"a"+counter+"\");"); - if (addPauseAfterEachAddress) - prl("debug_disposable_string := @Read_Line(Standard_Input_Port);"); + if (genPrintForEachAddress) { + prl("PRINT(\"a" + counter + "\");"); + if (genPauseAfterEachAddress) + prl("debug_disposable_string := @Read_Line(Standard_Input_Port);"); } switch (op) { case load: { @@ -317,10 +363,32 @@ public class mjc2wsl{ prl(cmdFromEStack(loc(op - store_0))); break; } - - //TODO getstatic, putstatic - //TODO getfield, putfield - + + case getstatic: { + prl(cmdToEStack(genStatic(get2()))); + break; + } + case putstatic: { + prl(cmdFromEStack(genStatic(get2()))); + break; + } + + case getfield: { + int f = get2(); + prl(getTop()); + prl(cmdToEStack(genObject("tempa") + "[" + (f + 1) + "]")); + break; + } + case putfield: { + int f = get2(); + // we need to use a temparray as a pointer, WSL + // otherwise tries to access it as a list of lists and fails + prl(getTopTwo()); + prl("VAR < tempArray := " + genObject("tempb") + " > :"); + prl("tempArray[" + (f + 1) + "]:=tempa ENDVAR;"); + break; + } + case const_: { prl(cmdToEStack(get4())); break; @@ -369,12 +437,101 @@ public class mjc2wsl{ break; } - //TODO neg, shl, shr, inc - //TODO new_ newarray - //TODO aload, asstore, baload, bastore - //TODO arraylength - //TODO pop, dup, dup2 - + case neg: { + prl(getTop()); + prl(cmdToEStack("-tempa")); + break; + } + + case shl: { + prl(getTopTwo()); + prl("VAR :"); + prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres * 2 OD;"); + prl(cmdToEStack("tempres")); + prl("ENDVAR;"); + break; + } + case shr: { + prl(getTopTwo()); + prl("VAR :"); + prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres DIV 2 OD;"); + prl(cmdToEStack("tempres")); + prl("ENDVAR;"); + break; + } + + case inc: { + int b1 = get(), b2 = get(); + prl(loc(b1) + " := " + loc(b1) + " + " + b2 + ";"); + break; + } + + case new_: { + int size = get2(); + // TODO maybe objects and arrays should be in the same list? + prl("mjvm_objects := mjvm_objects ++ < ARRAY(" + size + + ",0) >;"); + prl(cmdToEStack("LENGTH(mjvm_objects)")); + break; + } + case newarray: { + get();// 0 - bytes, 1 - words; ignore for now + // TODO take into consideration 0/1 + prl(getTop()); + prl("mjvm_arrays := mjvm_arrays ++ < ARRAY(tempa,0) >;"); + prl(cmdToEStack("LENGTH(mjvm_arrays)")); + break; + } + + case aload: + case baload: { + prl(getTopTwo()); + prl(cmdToEStack(genArray("tempb") + "[tempa+1]")); + break; + } + case astore: + case bastore: { + prl(cmdFromEStack("tempres")); + prl(getTopTwo()); + // we need to use a temparray as a pointer, WSL + // otherwise tries to access it as a list of lists and fails + prl("VAR < tempArray := " + genArray("tempb") + " > :"); + prl("tempArray[tempa+1]:=tempres ENDVAR;"); + break; + } + case arraylength: { + prl(getTop()); + // TODO make an array length function of some sort! + prl(createComment( + "array length not known - LENGTH not aplicable to arrays", + C_ERR)); + message("array length not known - LENGTH not aplicable to arrays", + M_ERR); + prl(createComment("put 1 on the stack for consistency", C_SPEC)); + prl(cmdToEStack(1)); + break; + } + + case dup: { + prl(getTop()); + prl(cmdToEStack("tempa")); + prl(cmdToEStack("tempa")); + break; + } + case dup2: { + prl(getTopTwo()); + prl(cmdToEStack("tempb")); + prl(cmdToEStack("tempa")); + prl(cmdToEStack("tempb")); + prl(cmdToEStack("tempa")); + break; + } + + case pop: { + prl(cmdPopEStack()); + break; + } + case jmp: { prl("CALL a" + (counter + get2()) + ";"); break; @@ -387,40 +544,44 @@ public class mjc2wsl{ case jgt: case jge: { prl(getTopTwo()); - prl("IF tempb "+ getRelationFor(op) - +" tempa THEN CALL a" + (counter + get2()) + prl("IF tempb " + getRelationFor(op) + " tempa THEN CALL a" + + (counter + get2()) + " ELSE CALL a" + (counter + 1) + " 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+" =="); + // we let the actions return + // there is nothing to clean up + prl("SKIP END b" + counter + " =="); break; } case enter: { - prl(createComment("enter not fully procesed yet")); - message("enter not fully procesed yet", M_WAR); - get(); - get(); + int parameters = get(); + + int locals = get(); + prl(cmdToMStack("mjvm_locals")); + prl("mjvm_locals := ARRAY(" + locals + ",0);"); + for (int i = parameters - 1; i >= 0; i--) + prl(cmdFromEStack(loc(i))); break; } case exit: { - prl(createComment("exit not fully procesed yet")); - message("exit not fully procesed yet", M_WAR); + prl(cmdFromMStack("mjvm_locals")); break; } - //TODO read, print + // read, print + case bread: { + // TODO make it a char for read + message("char is read like a number", M_WAR); + prl(createComment("char is read like a number", C_SPEC)); + } case read: { prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));"); prl(cmdToEStack("tempa")); @@ -429,41 +590,43 @@ public class mjc2wsl{ // the prints case bprint: { - prl(getTopTwo()); - prl("PRINT(tempb);"); - break; + // TODO need to make it a char on print + message("chars will be printed as number codes", M_WAR); + prl(createComment("char will be printed as a number code", + C_SPEC)); } case print: { - // TODO need to make it a char + // TODO printing numbers needs different lengths of spacing prl(getTopTwo()); - prl("PRINT(tempb);"); + pr(createComment("print spacing", C_SPEC)); + prl("IF tempa>1 THEN FOR i:=2 TO tempa STEP 1 DO PRINFLUSH(\" \") OD FI;"); + prl("PRINFLUSH(tempb);"); break; } case trap: { - // TODO finish trap - prl(createComment("trap not fully procesed yet")); - message("trap not fully procesed yet", M_WAR); - get(); + prl("ERROR(\"Runtime error: trap(" + get() + ")\");"); break; } - - + default: prl(createComment("unknown op error: " + op, C_ERR)); - message("unknown op error: "+ op, M_ERR); + message("unknown op error: " + op, M_ERR); break; } + boolean wasJump = isJumpCode(op); op = get(); if (op >= 0) - prl("CALL a" + counter + " END"); + if (wasJump) + prl("SKIP END"); + else + prl("CALL a" + counter + " END"); } prl("CALL Z;\nSKIP END\nENDACTIONS;\n"); prl(getStandardEnd()); - } - + public void convertFile(File f) { try { convertStream(new FileInputStream(f)); @@ -475,7 +638,7 @@ public class mjc2wsl{ public void printHelp() { System.out.println("MicroJava bytecode to WSL converter. v " + versionN + ", by Doni Pracner"); - System.out.println("usage:\n\t {options} mjc2wsl filename [outfile]"); + System.out.println("usage:\n\t mjc2wsl {options} 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-v verbose, print warning messages"); @@ -507,14 +670,27 @@ public class mjc2wsl{ originalInComments = args[i].charAt(4) == '+'; else originalInComments = true; - } else if (args[i].startsWith("--screen")) { + } else if (args[i].compareTo("--screen") == 0) { out = new PrintWriter(System.out); } else if (args[i].compareTo("-d") == 0) { - printLevel = M_DEB;//print debug info + printLevel = M_DEB;// print debug info } else if (args[i].compareTo("-v") == 0) { - printLevel = M_WAR;//print warnings + printLevel = M_WAR;// print warnings } else if (args[i].compareTo("-q") == 0) { - printLevel = M_ERR+1;//no printing + printLevel = M_ERR + 1;// no printing + } else if (args[i].compareToIgnoreCase("--genEStackPrint") == 0) { + genPrintEStackOnChange = true; + } else if (args[i].compareToIgnoreCase("--genAddrPause") == 0) { + genPauseAfterEachAddress = true; + } else if (args[i].compareToIgnoreCase("--genAddrPrint") == 0) { + genPrintForEachAddress = true; + } else if (args[i].compareToIgnoreCase("--genAddr") == 0) { + genPrintForEachAddress = true; + genPauseAfterEachAddress = true; + } else if (args[i].compareToIgnoreCase("--genAll") == 0) { + genPrintEStackOnChange = true; + genPrintForEachAddress = true; + genPauseAfterEachAddress = true; } i++; }