X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=77678a0beafefd26d47cee8adb44ec1bda285194;hp=6813fbf9c351bf863aaf96d599a1d10ee565286f;hb=bfa6f5cb35fa27845f7bdf72f2238f987bf6e83b;hpb=09dd4d38eeffac7fd6eaa88a064bdacf99ae875e diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index 6813fbf..77678a0 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -32,6 +32,10 @@ public class mjc2wsl{ out.println("total errors:"+messageCounters[M_ERR]+" warnings:"+messageCounters[M_WAR]); } + 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 = ' '; /** @@ -105,13 +109,17 @@ 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 mjvm_estack := < >, mjvm_mstack := < >, "); ret.append("\n mjvm_fp := 0, mjvm_sp := 0,"); ret.append("\n t_e_m_p := 0 > :"); @@ -199,7 +207,12 @@ public class mjc2wsl{ } private String loc(int i){ - return "mjvm_loc" + 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)+"]"; } /** @@ -223,17 +236,30 @@ 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 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"); } @@ -267,20 +293,34 @@ public class mjc2wsl{ } 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{ mainIn = ins; - //skip start TODO make better - for (int i = 0; i < 14; i++) - get(); + //process start + byte m = (byte) get(); + byte j = (byte) get(); + if (m!='M' || j !='J') + throw new Exception("Wrong start of bytecode file"); + int codesize = get4(); + int numberOfWords = get4(); + int mainAdr = get4(); - prl(getStandardStart()); - prl("SKIP;\n ACTIONS A_S_start:\n A_S_start == CALL a14 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 (genPrintForEachAddress) { + prl("PRINT(\"a"+counter+"\");"); + if (genPauseAfterEachAddress) + prl("debug_disposable_string := @Read_Line(Standard_Input_Port);"); + } switch (op) { case load: { prl(cmdToEStack(loc(get()))); @@ -305,8 +345,22 @@ public class mjc2wsl{ break; } - //TODO getstatic, putstatic + case getstatic:{ + prl(cmdToEStack(genStatic(get2()))); + break; + } + case putstatic: { + prl(cmdFromEStack(genStatic(get2()))); + break; + } //TODO getfield, putfield + case getfield: + case putfield:{ + prl(createComment("fields are not processed properly", C_ERR)); + message("fields are not processed properly", M_ERR); + get2(); + break; + } case const_: { prl(cmdToEStack(get4())); @@ -356,11 +410,35 @@ public class mjc2wsl{ break; } - //TODO neg, shl, shr, inc + case neg :{ + prl(getTop()); + prl(cmdToEStack("-tempa")); + break; + } + //TODO shl, shr + + case inc : { + int b1 = get(), b2 = get(); + prl(loc(b1)+" := " +loc(b1)+" + "+b2); + break; + } //TODO new_ newarray + case new_ : + get();//needs a short, but a byte will be taken bellow as well + case newarray :{ + prl(createComment("memory allocation not processed properly", C_ERR)); + message("memory allocation not processed properly", M_ERR); + get(); + break; + } //TODO aload, asstore, baload, bastore //TODO arraylength - //TODO pop, dup, dup2 + //TODO dup, dup2 + + case pop : { + prl(cmdPopEStack()); + break; + } case jmp: { prl("CALL a" + (counter + get2()) + ";"); @@ -376,38 +454,43 @@ public class mjc2wsl{ prl(getTopTwo()); 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"); + prl("IF EMPTY?(mjvm_mstack) THEN CALL Z FI"); //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(); + 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")); @@ -415,29 +498,39 @@ public class mjc2wsl{ } // the prints - case bprint: { - prl(getTopTwo()); - prl("PRINT(tempb);"); - break; + case bprint:{ + // 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: { + prl("ERROR(\"Runtime error: trap("+get()+")\");"); + break; + } + + default: prl(createComment("unknown op error: " + op, C_ERR)); message("unknown op error: "+ op, M_ERR); break; } - //TODO trap - - + 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()); @@ -455,7 +548,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"); @@ -487,16 +580,28 @@ 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 } 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++; + 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++; } if (i >= args.length) {