X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=388f1ad39b965402297e05535b2a157482c3cd27;hp=bed0f378d498bb9963a4b5b72664ef4d97cd1b97;hb=efe68ac5eb23f8a7711a44c4a7d4e830b64cd068;hpb=26e7629391c7e34522dff7ebea448781152079c0 diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index bed0f37..388f1ad 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -28,7 +28,7 @@ import java.util.*; * @author Doni Pracner, http://perun.dmi.rs/pracner http://quemaster.com */ public class mjc2wsl{ - public static String versionN = "0.1.5"; + public static String versionN = "0.1.6"; private TransMessages messages = new TransMessages(); @@ -192,22 +192,47 @@ 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\t"); + ret.append("BEGIN "); + ret.append("VAR < \n\t"); 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 > :"); + ret.append("\n mjvm_estack := < >, mjvm_mstack := < > > : "); return ret.toString(); } public String createStandardEnd(){ - return "SKIP\nENDVAR"; + StringBuilder ret = new StringBuilder("SKIP\nENDVAR"); + ret.append("\nWHERE\n"); + + ret.append("\nPROC Print_MJ(val, format VAR)==\n"); + ret.append(createComment("print spacing", C_SPEC)); + + ret.append("\n\tIF format>1 THEN\n\t\tFOR i:=2 TO "); + ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n"); + ret.append("\tFI;\n\tPRINFLUSH(val)\nEND\n"); + + ret.append("\nEND\n"); + + return ret.toString(); } + private String createStartVar(String... vars){ + StringBuilder ret = new StringBuilder("VAR < "); + ret.append(vars[0] + " := 0"); + for (int i=1; i : "); + + return ret.toString(); + } + + private String createEndVar(){ + return "ENDVAR;"; + } + private String createLocal(int i) { // arrays start at 1 in WSL, so we need an offset return "mjvm_locals[" + (i + 1) + "]"; @@ -328,13 +353,12 @@ public class mjc2wsl{ int mainAdr = get4(); prl(createStandardStart(numberOfWords)); - prl("SKIP;\n ACTIONS A_S_start:\n A_S_start == CALL a" + (14 + mainAdr) - + " END"); + prl("SKIP;\n ACTIONS a" + (14 + mainAdr) + " :"); int op = get(); while (op >= 0) { if (originalInComments) prl(createComment(describeOpCode(op), C_OC)); - prl("a" + counter + " == "); + prl(" a" + counter + " == "); if (genPrintForEachAddress) { prl("PRINT(\"a" + counter + "\");"); if (genPauseAfterEachAddress) @@ -405,41 +429,53 @@ public class mjc2wsl{ } case add: { + prl(createStartVar("tempa", "tempb", "tempres")); prl(createTopTwoEStack()); prl("tempres := tempb + tempa;"); prl(createToEStack("tempres")); + prl(createEndVar()); break; } case sub: { + prl(createStartVar("tempa", "tempb", "tempres")); prl(createTopTwoEStack()); prl("tempres := tempb - tempa;"); prl(createToEStack("tempres")); + prl(createEndVar()); break; } case mul: { + prl(createStartVar("tempa", "tempb", "tempres")); prl(createTopTwoEStack()); prl("tempres := tempb * tempa;"); prl(createToEStack("tempres")); + prl(createEndVar()); break; } case div: { + prl(createStartVar("tempa", "tempb", "tempres")); prl(createTopTwoEStack()); prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;"); prl("tempres := tempb DIV tempa;"); prl(createToEStack("tempres")); + prl(createEndVar()); break; } case rem: { + prl(createStartVar("tempa", "tempb", "tempres")); prl(createTopTwoEStack()); prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;"); prl("tempres := tempb MOD tempa;"); prl(createToEStack("tempres")); + prl(createEndVar()); break; } case neg: { + prl(createStartVar("tempa")); prl(createTopEStack()); prl(createToEStack("-tempa")); + prl(createEndVar()); break; } @@ -501,13 +537,8 @@ public class mjc2wsl{ } case arraylength: { prl(createTopEStack()); - // TODO make an array length function of some sort! - prl(createComment( - "array length not known - LENGTH not aplicable to arrays", - C_ERR)); - messages.message("array length not known - LENGTH not aplicable to arrays", TransMessages.M_ERR); - prl(createComment("put 1 on the stack for consistency", C_SPEC)); - prl(createToEStack(1)); + prl("tempb := LENGTH("+ createArray("tempa") + ");"); + prl(createToEStack("tempb")); break; } @@ -542,10 +573,13 @@ public class mjc2wsl{ case jle: case jgt: case jge: { + prl(createStartVar("tempa", "tempb")); prl(createTopTwoEStack()); prl("IF tempb " + getRelationFor(op) + " tempa THEN CALL a" + (counter + get2()) + " ELSE CALL a" + (counter + 1) + " FI;"); + prl(createEndVar()); + break; } @@ -557,7 +591,7 @@ public class mjc2wsl{ case return_: { // we let the actions return // there is nothing to clean up - prl("SKIP END b" + counter + " =="); + prl("SKIP\n END\n b" + counter + " =="); break; } case enter: { @@ -582,8 +616,10 @@ public class mjc2wsl{ prl(createComment("char is read like a number", C_SPEC)); } case read: { + prl(createStartVar("tempa")); prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));"); prl(createToEStack("tempa")); + prl(createEndVar()); break; } @@ -596,10 +632,11 @@ public class mjc2wsl{ } case print: { // TODO printing numbers needs different lengths of spacing + prl(createStartVar("tempa", "tempb")); + prl(createTopTwoEStack()); - 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);"); + prl("Print_MJ(tempb,tempa);"); + prl(createEndVar()); break; } @@ -618,11 +655,11 @@ public class mjc2wsl{ op = get(); if (op >= 0) if (wasJump) - prl("SKIP END"); + prl("SKIP\n END"); else - prl("CALL a" + counter + " END"); + prl("CALL a" + counter + "\n END"); } - prl("CALL Z;\nSKIP END\nENDACTIONS;\n"); + prl("SKIP\n END\nENDACTIONS;\n"); prl(createStandardEnd()); } @@ -636,38 +673,51 @@ public class mjc2wsl{ public void printHelp() { printVersion(); - System.out.println("usage:\n\t mjc2wsl {options} filename [outfile]"); - System.out.println("basic 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"); - System.out.println("\t-q quiet; don't print even the error messages"); - System.out.println("\t-d print detailed debug messages"); - System.out.println("\t-h basic help; this screen"); - System.out.println("\t--help print more detailed help"); + printUsage(); + printHelpOutput(); + printHelpHelp(); } public void printLongHelp() { printVersion(); - System.out.println("usage:\n\t mjc2wsl {options} filename [outfile]"); + printUsage(); + System.out.println(); + printHelpOutput(); + System.out.println(); + printHelpGenerating(); + System.out.println(); + printHelpHelp(); + } + + public void printHelpOutput() { System.out.println("Output options:"); System.out.println(" --screen print output to screen"); System.out.println(" -o --oc[+-] include original code in comments"); System.out.println(" -v verbose, print warning messages"); System.out.println(" -q quiet; don't print even the error messages"); System.out.println(" -d print detailed debug messages"); + } - System.out.println("\nOptions for generating extra code for tracking code execution"); + public void printHelpGenerating() { + System.out.println("Options for generating extra code for tracking code execution"); System.out.println(" --genEStackPrint generate print for all EStack changes"); System.out.println(" --genAddrPrint generate prints after every address of the original code "); System.out.println(" --genAddrPause generate a pause after every address of the original code "); System.out.println(" --genAddr short for --genAddrPrint and --genAddrPause"); System.out.println(" --genAll short for applying all code generation"); - - System.out.println("\nHelp options"); + } + + public void printHelpHelp() { + System.out.println("Help and info options"); System.out.println(" -h basic help"); - System.out.println(" --help print more detailed help; this screen"); + System.out.println(" --help print more detailed help"); + System.out.println(" --version or -version print version and exit"); } + public void printUsage(){ + System.out.println("usage:\n\t mjc2wsl {options} filename [outfile]"); + } + public void printVersion() { System.out.println("MicroJava bytecode to WSL converter. v " + versionN + ", by Doni Pracner"); @@ -692,6 +742,10 @@ public class mjc2wsl{ } else if (args[i].compareTo("--help") == 0) { printLongHelp(); return; + } else if (args[i].compareTo("--version") == 0 + || args[i].compareTo("-version") == 0) { + printVersion(); + return; } else if (args[i].compareTo("-o") == 0 || args[i].startsWith("--oc")) { if (args[i].length() == 2)