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
out.println("total errors:"+messageCounters[M_ERR]+" warnings:"+messageCounters[M_WAR]);
}
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 = ' ';
/** Constant used for marking a regular comment from the original file */
public static final char C_REG = ' ';
//Expression stack
private String cmdToEStack(int i) {
//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) {
}
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) {
}
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 getTopTwo(){
if (originalInComments)
prl(createComment(describeOpCode(op), C_OC));
prl("a" + counter + " == ");
if (originalInComments)
prl(createComment(describeOpCode(op), C_OC));
prl("a" + counter + " == ");
- if (addPrintForEachAddress) {
+ if (genPrintForEachAddress) {
prl("PRINT(\"a"+counter+"\");");
prl("PRINT(\"a"+counter+"\");");
- if (addPauseAfterEachAddress)
+ if (genPauseAfterEachAddress)
prl("debug_disposable_string := @Read_Line(Standard_Input_Port);");
}
switch (op) {
prl("debug_disposable_string := @Read_Line(Standard_Input_Port);");
}
switch (op) {
public void printHelp() {
System.out.println("MicroJava bytecode to WSL converter. v " + versionN
+ ", by Doni Pracner");
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");
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");
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) {
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) {
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) {
}
if (i >= args.length) {