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]);
}
- 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 = ' ';
+"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 mjvm_estack := < >, mjvm_mstack := < >, ");
ret.append("\n mjvm_fp := 0, mjvm_sp := 0,");
ret.append("\n t_e_m_p := 0 > :");
}
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)+"]";
}
/**
//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 getTopTwo(){
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) {
}
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);
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
- case read: {
+ // read, print
+ case read:{
+ //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 bread: {
prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));");
prl(cmdToEStack("tempa"));
break;
}
// the prints
- case bprint: {
- prl(getTopTwo());
- prl("PRINT(tempb);");
- break;
+ case print:{
+ // 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
+ case bprint: {
+ // 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: {
- // TODO finish trap
- prl(createComment("trap not fully procesed yet"));
- message("trap not fully procesed yet", M_WAR);
- get();
+ prl("ERROR(\"Runtime error: trap("+get()+")\");");
break;
}
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");
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) {