X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=4b231aab04e6d3fdb2c0d84d63aff4713b0f9f5a;hp=fd360e2ba7717552a53358f4b3115889fc84b1f9;hb=a2bd7f29ece868c30e34f85e4e474ad947794642;hpb=0a526039dc93eafced8abe7139bec1ae7d316e17 diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index fd360e2..4b231aa 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,18 @@ 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 mjvm_estack := < >, mjvm_mstack := < >, "); ret.append("\n mjvm_fp := 0, mjvm_sp := 0,"); ret.append("\n t_e_m_p := 0 > :"); @@ -202,7 +208,20 @@ 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)+"]"; + } + + private String genArray(int i){ + return "mjvm_arrays["+ i +"]"; + } + + private String genArray(String i){ + return "mjvm_arrays["+ i+"]"; } /** @@ -226,17 +245,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"); } @@ -286,16 +318,16 @@ public class mjc2wsl{ int numberOfWords = get4(); int mainAdr = get4(); - prl(getStandardStart()); + 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) { + if (genPrintForEachAddress) { prl("PRINT(\"a"+counter+"\");"); - if (addPauseAfterEachAddress) + if (genPauseAfterEachAddress) prl("debug_disposable_string := @Read_Line(Standard_Input_Port);"); } switch (op) { @@ -322,8 +354,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())); @@ -373,11 +419,79 @@ 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 - //TODO aload, asstore, baload, bastore - //TODO arraylength - //TODO pop, dup, dup2 + case new_ :{ + prl(createComment("memory allocation not processed properly", C_ERR)); + message("memory allocation not processed properly", M_ERR); + get2(); + 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()) + ";"); @@ -399,36 +513,37 @@ public class mjc2wsl{ } 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); int parameters = get(); - get(); + int locals = get(); + prl(cmdToMStack("mjvm_locals")); + prl("mjvm_locals := ARRAY("+locals+",0);"); for (int i = parameters-1; i >= 0; i--) - prl(cmdFromEStack("mjvm_loc" + 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")); @@ -436,15 +551,17 @@ 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; } @@ -484,7 +601,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"); @@ -516,16 +633,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) {