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 = ' ';
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(loc(i) + " := 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 > :");
//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(){
}
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;
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) {
prl(getTopTwo());
prl("IF tempb "+ getRelationFor(op)
+" tempa THEN CALL a" + (counter + get2())
+ +" ELSE CALL a" + (counter+1)
+ " FI;");
break;
}
case enter: {
prl(createComment("enter not fully procesed yet"));
message("enter not fully procesed yet", M_WAR);
+ int parameters = get();
+
get();
- get();
+ for (int i = parameters-1; i >= 0; i--)
+ prl(cmdFromEStack(loc(i)));
break;
}
case exit: {
}
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;
}
break;
}
+ boolean wasJump = isJumpCode(op);
op = get();
if (op >= 0)
- prl("CALL a" + counter + " END");
+ if (wasJump)
+ prl("SKIP END");
+ else
+ prl("CALL a" + counter + " END");
}
prl("CALL Z;\nSKIP END\nENDACTIONS;\n");
prl(getStandardEnd());
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("--genAll") == 0) {
+ genPrintEStackOnChange = true;
+ genPrintForEachAddress = true;
+ genPauseAfterEachAddress = true;
+ }i++;
}
if (i >= args.length) {