gitweb on Svarog
projekti pod git sistemom za održavanje verzija -- projects under the git version control systemdiff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
+/*
+ Copyright (C) 2014 Doni Pracner
+
+ This file is part of mjc2wsl.
+
+ mjc2wsl is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ mjc2wsl is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with mjc2wsl. If not, see <http://www.gnu.org/licenses/>.
+*/
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
* @author Doni Pracner, http://perun.dmi.rs/pracner http://quemaster.com
*/
public class mjc2wsl{
* @author Doni Pracner, http://perun.dmi.rs/pracner http://quemaster.com
*/
public class mjc2wsl{
- public static String versionN = "0.1.3";
+ public static String versionN = "0.1.7";
- 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]);
- }
+ private TransMessages messages = new TransMessages();
+
+ private boolean genPauseAfterEachAddress=false,
+ genPrintForEachAddress = false,
+ genPrintEStackOnChange = false;
+
+ private boolean genPopPush=false;
/** Constant used for marking a regular comment from the original file */
public static final char C_REG = ' ';
/** Constant used for marking a regular comment from the original file */
public static final char C_REG = ' ';
bprint = 56,
trap = 57;
bprint = 56,
trap = 57;
- public String getStandardStart(){
- 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");
- for (int i = 0; i <= 3; i++)
- ret.append("loc" + i + " := 0, ");
- ret.append("\n estack := < >, mstack := < >, t_e_m_p := 0 > :");
-
- return ret.toString();
+ private boolean originalInComments = false;
+
+ private HashMap<Integer,String> opMap = null;
+
+ private String opCodeFile = "mj-bytecodes.properties";
+
+ private HashMap<Integer, String> getOpMap() {
+ if (opMap == null) {
+ opMap = new HashMap<Integer, String>(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);
}
}
- public String getStandardEnd(){
- return "SKIP\nENDVAR";
+ public String describeOpCode(int op) {
+ return op + " (" + getOpString(op) + ")";
}
}
- private boolean originalInComments = false;
-
private InputStream mainIn;
private PrintWriter out = null;
private int counter = -1;
private InputStream mainIn;
private PrintWriter out = null;
private int counter = -1;
return (get2() << 16) + (get2() << 16 >>> 16);
}
return (get2() << 16) + (get2() << 16 >>> 16);
}
- private String loc(int i){
- return "loc" + i;
+ public String createStandardStart(){
+ return createStandardStart(10);
+ }
+
+ public String createStandardStart(int numWords){
+ StringBuilder ret = new StringBuilder(
+ "C:\" This file automatically converted from microjava bytecode\";\n"
+ +"C:\" with mjc2wsl v "+versionN+"\";\n\n");
+
+ ret.append(createAsciiString());
+
+ ret.append("\nBEGIN");
+ ret.append("\nVAR <\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\tmjvm_estack := < >, mjvm_mstack := < > > :");
+
+ return ret.toString();
+ }
+
+ public String createAsciiString(){
+ StringBuilder ret = new StringBuilder("C:\"char array for ascii code conversions\";");
+ ret.append("\nascii := \"????????????????????????????????\"++\n");
+ ret.append("\" !\"++Quote++\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\";\n");
+
+ return ret.toString();
+ }
+
+ public String createStandardEnd(){
+ StringBuilder ret = new StringBuilder("SKIP\nENDVAR\n");
+ ret.append("\nWHERE\n");
+
+ ret.append("\nFUNCT CHR(num) ==:\n");
+ ret.append("\tSUBSTR(ascii,num,1)\n");
+ ret.append("END\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("\nPROC Print_MJ_CHAR(val, format VAR)==\n");
+ ret.append(createComment("print spacing", C_SPEC));
+ ret.append("\n\tIF val=10 OR val=13 THEN\n");
+ ret.append("\t\tPRINT(\"\");\n");
+ ret.append("\tELSE\n");
+ ret.append("\t\tIF format>1 THEN\n\t\t\tFOR i:=2 TO ");
+ ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n");
+ ret.append("\t\tFI;\n\t\tPRINFLUSH(CHR(val))\n");
+ ret.append("\tFI\n");
+ ret.append("END\n");
+
+ ret.append("\nEND");
+ return ret.toString();
+ }
+
+ private String createStartVar(String... vars){
+ StringBuilder ret = new StringBuilder("VAR < ");
+ ret.append(vars[0] + " := 0");
+ for (int i=1; i<vars.length; i++)
+ ret.append(", "+ vars[i] +" := 0");
+ ret.append(" > : ");
+
+ 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) + "]";
+ }
+
+ private String createStatic(int i) {
+ return "mjvm_statics[" + (i + 1) + "]";
+ }
+
+ private String createArray(int i) {
+ return "mjvm_arrays[" + i + "]";
+ }
+
+ private String createArray(String i) {
+ return "mjvm_arrays[" + i + "]";
+ }
+
+ private String createObject(String i) {
+ return "mjvm_objects[" + i + "]";
}
/**
}
/**
public static String createComment(String str, char type) {
return "C:\"" + type + str.replace("\"", "''") + "\";";
}
public static String createComment(String str, char type) {
return "C:\"" + type + str.replace("\"", "''") + "\";";
}
+
+ // generalised stack operations
+
+ private String createToStack(String stack, String var){
+ if (genPopPush)
+ return "PUSH("+stack+"," + var + ");";
+ else
+ return stack + " := <" + var + " > ++ " + stack +";";
+ }
- //Expression stack
+ private String createFromStack(String stack, String var){
+ if (genPopPush)
+ return "POP("+ var + ", "+stack+");";
+ else
+ return var + ":= HEAD("+stack+"); "+stack+" := TAIL("+stack+");";
+ }
+//Expression stack
- private String cmdToEStack(int i) {
- return "estack := <" + i + " > ++ estack;";
+ private String createToEStack(int i) {
+ return createToEStack(i+"");
}
}
- private String cmdToEStack(String i) {
- return "estack := <" + i + " > ++ estack;";
+ private String createToEStack(String i) {
+ String res = createToStack("mjvm_estack", i);
+ if (genPrintEStackOnChange)
+ res += "PRINT(\"eStack\",mjvm_estack);";
+ return res;
}
}
- private String cmdFromEStack(String st) {
- return st + " := HEAD(estack); estack := TAIL(estack);";
+ private String createFromEStack(String st) {
+ String res = createFromStack("mjvm_estack",st);
+ if (genPrintEStackOnChange)
+ res += "PRINT(\"eStack\",mjvm_estack);";
+ return res;
}
}
-
- private String getTopTwo(){
- return cmdFromEStack("tempa") + "\n" + cmdFromEStack("tempb");
+
+ private String createPopEStack() {
+ String res = "mjvm_estack := TAIL(mjvm_estack);";
+ if (genPrintEStackOnChange)
+ res += "PRINT(\"eStack\",mjvm_estack);";
+ return res;
}
}
- private String getTop() {
- return cmdFromEStack("tempa");
+ private String createTopTwoEStack() {
+ return createFromEStack("tempa") + "\n" + createFromEStack("tempb");
+ }
+
+ private String createTopEStack() {
+ return createFromEStack("tempa");
}
//Method stack
}
//Method stack
-
- private String cmdToMStack(int i) {
- return "mstack := <" + i + " > ++ mstack;";
+
+ private String createToMStack(int i) {
+ return createToMStack(i+"");
}
}
- private String cmdToMStack(String i) {
- return "mstack := <" + i + " > ++ mstack;";
+ private String createToMStack(String i) {
+ return createToStack("mjvm_mstack", i);
}
}
- private String cmdFromMStack(String st) {
- return st + " := HEAD(mstack); mstack := TAIL(mstack);";
+ private String createFromMStack(String st) {
+ return createFromStack("mjvm_mstack", st);
}
}
-
+
private String getRelationFor(int opcode) throws Exception {
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{
mainIn = ins;
}
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(createStandardStart(numberOfWords));
+ prl("SKIP;\n ACTIONS a" + (14 + mainAdr) + " :");
int op = get();
while (op >= 0) {
int op = get();
while (op >= 0) {
+ prl(" a" + counter + " ==");
if (originalInComments)
if (originalInComments)
- prl(createComment("" + op, C_OC));
- prl("a" + counter + " == ");
+ prl(createComment(describeOpCode(op), C_OC));
+ if (genPrintForEachAddress) {
+ prl("PRINT(\"a" + counter + "\");");
+ if (genPauseAfterEachAddress)
+ prl("debug_disposable_string := @Read_Line(Standard_Input_Port);");
+ }
switch (op) {
case load: {
switch (op) {
case load: {
- prl(cmdToEStack(loc(get())));
+ prl(createToEStack(createLocal(get())));
break;
}
case load_0:
case load_1:
case load_2:
case load_3: {
break;
}
case load_0:
case load_1:
case load_2:
case load_3: {
- prl(cmdToEStack(loc(op - load_0)));
+ prl(createStartVar("tempa"));
+ prl("tempa :="+createLocal(op - load_0)+";");
+ prl(createToEStack("tempa"));
+ prl(createEndVar());
break;
}
case store: {
break;
}
case store: {
- prl(cmdFromEStack(loc(get())));
+ prl(createFromEStack(createLocal(get())));
break;
}
case store_0:
case store_1:
case store_2:
case store_3: {
break;
}
case store_0:
case store_1:
case store_2:
case store_3: {
- prl(cmdFromEStack(loc(op - store_0)));
+ prl(createStartVar("tempa"));
+ prl(createFromEStack("tempa"));
+ prl(createLocal(op - store_0)+" := tempa;");
+ prl(createEndVar());
+ break;
+ }
+
+ case getstatic: {
+ prl(createToEStack(createStatic(get2())));
+ break;
+ }
+ case putstatic: {
+ prl(createFromEStack(createStatic(get2())));
+ break;
+ }
+
+ case getfield: {
+ int f = get2();
+ prl(createTopEStack());
+ prl(createToEStack(createObject("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(createTopTwoEStack());
+ prl("VAR < tempArray := " + createObject("tempb") + " > :");
+ prl("tempArray[" + (f + 1) + "]:=tempa ENDVAR;");
break;
}
break;
}
-
- //TODO getstatic, putstatic
- //TODO getfield, putfield
-
+
case const_: {
case const_: {
- prl(cmdToEStack(get4()));
+ prl(createToEStack(get4()));
break;
}
break;
}
case const_3:
case const_4:
case const_5: {
case const_3:
case const_4:
case const_5: {
- prl(cmdToEStack(op - const_0));
+ prl(createToEStack(op - const_0));
break;
}
case add: {
break;
}
case add: {
- prl(getTopTwo());
+ prl(createStartVar("tempa", "tempb", "tempres"));
+ prl(createTopTwoEStack());
prl("tempres := tempb + tempa;");
prl("tempres := tempb + tempa;");
- prl(cmdToEStack("tempres"));
+ prl(createToEStack("tempres"));
+ prl(createEndVar());
break;
}
case sub: {
break;
}
case sub: {
- prl(getTopTwo());
+ prl(createStartVar("tempa", "tempb", "tempres"));
+ prl(createTopTwoEStack());
prl("tempres := tempb - tempa;");
prl("tempres := tempb - tempa;");
- prl(cmdToEStack("tempres"));
+ prl(createToEStack("tempres"));
+ prl(createEndVar());
break;
}
case mul: {
break;
}
case mul: {
- prl(getTopTwo());
+ prl(createStartVar("tempa", "tempb", "tempres"));
+ prl(createTopTwoEStack());
prl("tempres := tempb * tempa;");
prl("tempres := tempb * tempa;");
- prl(cmdToEStack("tempres"));
+ prl(createToEStack("tempres"));
+ prl(createEndVar());
break;
}
case div: {
break;
}
case div: {
- prl(getTopTwo());
+ prl(createStartVar("tempa", "tempb", "tempres"));
+ prl(createTopTwoEStack());
prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;");
prl("tempres := tempb DIV tempa;");
prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;");
prl("tempres := tempb DIV tempa;");
- prl(cmdToEStack("tempres"));
+ prl(createToEStack("tempres"));
+ prl(createEndVar());
break;
}
case rem: {
break;
}
case rem: {
- prl(getTopTwo());
+ prl(createStartVar("tempa", "tempb", "tempres"));
+ prl(createTopTwoEStack());
prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;");
prl("tempres := tempb MOD tempa;");
prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;");
prl("tempres := tempb MOD tempa;");
- prl(cmdToEStack("tempres"));
+ prl(createToEStack("tempres"));
+ prl(createEndVar());
+ break;
+ }
+
+ case neg: {
+ prl(createStartVar("tempa"));
+ prl(createTopEStack());
+ prl(createToEStack("-tempa"));
+ prl(createEndVar());
+ break;
+ }
+
+ case shl: {
+ prl(createTopTwoEStack());
+ prl("VAR <tempres :=tempb, i:=1 >:");
+ prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres * 2 OD;");
+ prl(createToEStack("tempres"));
+ prl("ENDVAR;");
+ break;
+ }
+ case shr: {
+ prl(createTopTwoEStack());
+ prl("VAR <tempres :=tempb, i:=1 >:");
+ prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres DIV 2 OD;");
+ prl(createToEStack("tempres"));
+ prl("ENDVAR;");
+ break;
+ }
+
+ case inc: {
+ int b1 = get(), b2 = get();
+ prl(createLocal(b1) + " := " + createLocal(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(createToEStack("LENGTH(mjvm_objects)"));
+ break;
+ }
+ case newarray: {
+ get();// 0 - bytes, 1 - words; ignore for now
+ // TODO take into consideration 0/1
+ prl(createTopEStack());
+ prl("mjvm_arrays := mjvm_arrays ++ < ARRAY(tempa,0) >;");
+ prl(createToEStack("LENGTH(mjvm_arrays)"));
+ break;
+ }
+
+ case aload:
+ case baload: {
+ prl(createTopTwoEStack());
+ prl(createToEStack(createArray("tempb") + "[tempa+1]"));
+ break;
+ }
+ case astore:
+ case bastore: {
+ prl(createFromEStack("tempres"));
+ prl(createTopTwoEStack());
+ // 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 := " + createArray("tempb") + " > :");
+ prl("tempArray[tempa+1]:=tempres ENDVAR;");
+ break;
+ }
+ case arraylength: {
+ prl(createTopEStack());
+ prl("tempb := LENGTH("+ createArray("tempa") + ");");
+ prl(createToEStack("tempb"));
+ break;
+ }
+
+ case dup: {
+ prl(createTopEStack());
+ prl(createToEStack("tempa"));
+ prl(createToEStack("tempa"));
+ break;
+ }
+ case dup2: {
+ prl(createTopTwoEStack());
+ prl(createToEStack("tempb"));
+ prl(createToEStack("tempa"));
+ prl(createToEStack("tempb"));
+ prl(createToEStack("tempa"));
+ break;
+ }
+
+ case pop: {
+ prl(createPopEStack());
break;
}
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;
case jmp: {
prl("CALL a" + (counter + get2()) + ";");
break;
case jle:
case jgt:
case jge: {
case jle:
case jgt:
case jge: {
- prl(getTopTwo());
- prl("IF tempb "+ getRelationFor(op)
- +" tempa THEN CALL a" + (counter + get2())
+ prl(createStartVar("tempa", "tempb"));
+ prl(createTopTwoEStack());
+ prl("IF tempb " + getRelationFor(op) + " tempa THEN CALL a"
+ + (counter + get2()) + " ELSE CALL a" + (counter + 1)
+ " FI;");
+ " FI;");
+ prl(createEndVar());
+
break;
}
case call: {
break;
}
case call: {
- prl(cmdToMStack(counter+2));
prl("CALL a" + (counter + get2()) + ";");
break;
}
case return_: {
prl("CALL a" + (counter + get2()) + ";");
break;
}
case return_: {
- prl(createComment("return not fully procesed yet"));
- message("return not fully procesed yet", M_WAR);
+ // we let the actions return
+ // there is nothing to clean up
+ prl("SKIP\n END\n b" + counter + " ==");
break;
}
case enter: {
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(createToMStack("mjvm_locals"));
+ prl("mjvm_locals := ARRAY(" + locals + ",0);");
+ for (int i = parameters - 1; i >= 0; i--)
+ prl(createFromEStack(createLocal(i)));
break;
}
case exit: {
break;
}
case exit: {
- prl(createComment("exit not fully procesed yet"));
- message("exit not fully procesed yet", M_WAR);
+ prl(createFromMStack("mjvm_locals"));
break;
}
break;
}
- //TODO read, print
+ // read, print
+ case bread: {
+ // TODO make it a char for read
+ messages.message("char is read like a number", TransMessages.M_WAR);
+ 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;
+ }
// the prints
case bprint: {
// the prints
case bprint: {
- prl(getTopTwo());
- prl("PRINT(tempb);");
+ prl(createStartVar("tempa", "tempb"));
+ prl(createTopTwoEStack());
+ prl("Print_MJ_CHAR(tempb,tempa);");
+ prl(createEndVar());
break;
}
case print: {
break;
}
case print: {
- // TODO need to make it a char
- prl(getTopTwo());
- prl("PRINT(tempb);");
+ // TODO printing numbers needs different lengths of spacing
+ prl(createStartVar("tempa", "tempb"));
+
+ prl(createTopTwoEStack());
+ prl("Print_MJ(tempb,tempa);");
+ prl(createEndVar());
+ break;
+ }
+
+ case trap: {
+ prl("ERROR(\"Runtime error: trap(" + get() + ")\");");
break;
}
break;
}
+
default:
prl(createComment("unknown op error: " + op, C_ERR));
default:
prl(createComment("unknown op error: " + op, C_ERR));
- message("unknown op error: "+ op, M_ERR);
+ messages.message("unknown op error: " + op, TransMessages.M_ERR);
break;
}
break;
}
- //TODO trap
-
-
+ boolean wasJump = isJumpCode(op);
op = get();
if (op >= 0)
op = get();
if (op >= 0)
- prl("CALL a" + counter + " END");
+ if (wasJump)
+ prl("SKIP\n END");
+ else
+ prl("CALL a" + counter + "\n END");
}
}
- prl("CALL Z;\nSKIP END\nENDACTIONS;\n");
- prl(getStandardEnd());
-
+ prl("SKIP\n END\nENDACTIONS;\n");
+ pr(createStandardEnd());
}
}
-
+
public void convertFile(File f) {
try {
convertStream(new FileInputStream(f));
public void convertFile(File f) {
try {
convertStream(new FileInputStream(f));
}
public void printHelp() {
}
public void printHelp() {
+ printVersion();
+ printUsage();
+ printHelpOutput();
+ printHelpHelp();
+ }
+
+ public void printLongHelp() {
+ printVersion();
+ printUsage();
+ System.out.println();
+ printHelpOutput();
+ System.out.println();
+ printHelpDirectives();
+ 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");
+ }
+
+ 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");
+ }
+
+ public void printHelpDirectives(){
+ System.out.println("Alternatives for code generation:");
+ System.out.println(" --genPopPush generate POP/PUSH instead of TAIL/HEAD");
+ }
+
+ public void printHelpHelp() {
+ System.out.println("Help and info options");
+ System.out.println(" -h basic help");
+ 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");
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("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 don't print even the error messages");
- System.out.println("\t-d print detailed debug messages");
}
public String makeDefaultOutName(String inname){
}
public String makeDefaultOutName(String inname){
if (args[i].compareTo("-h") == 0) {
printHelp();
return;
if (args[i].compareTo("-h") == 0) {
printHelp();
return;
+ } 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)
} else if (args[i].compareTo("-o") == 0
|| args[i].startsWith("--oc")) {
if (args[i].length() == 2)
originalInComments = args[i].charAt(4) == '+';
else
originalInComments = true;
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) {
out = new PrintWriter(System.out);
} else if (args[i].compareTo("-d") == 0) {
- printLevel = M_DEB;//print debug info
+ messages.setPrintLevel(TransMessages.M_DEB);// print debug info
} else if (args[i].compareTo("-v") == 0) {
} else if (args[i].compareTo("-v") == 0) {
- printLevel = M_WAR;//print warnings
+ messages.setPrintLevel(TransMessages.M_WAR);// print warnings
} else if (args[i].compareTo("-q") == 0) {
} else if (args[i].compareTo("-q") == 0) {
- printLevel = M_ERR+1;//no printing
+ messages.setPrintLevel(TransMessages.M_QUIET);// 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;
+ } else if (args[i].compareToIgnoreCase("--genPopPush") == 0) {
+ genPopPush = true;
}
i++;
}
}
i++;
}
long mili = Calendar.getInstance().getTimeInMillis()
- now.getTimeInMillis();
System.out.println("conversion time:" + mili + " ms");
long mili = Calendar.getInstance().getTimeInMillis()
- now.getTimeInMillis();
System.out.println("conversion time:" + mili + " ms");
- printMessageCounters();
+ messages.printMessageCounters();
out.close();
} else
System.out.println("file does not exist");
out.close();
} else
System.out.println("file does not exist");