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
* @author Doni Pracner, http://perun.dmi.rs/pracner http://quemaster.com
*/
public class mjc2wsl{
- public static String versionN = "0.1.2";
-
- //regular comments from the original file
- //OC when original code is inserted in the file, next to the translations
- //SPEC special messages from the translator
- //ERR error messages from the translator
- public static final char C_REG = ' ', C_OC = '#', C_SPEC = '&', C_ERR = '!';
+ public static String versionN = "0.1.3";
- /** instruction code */
- public static final int
+ 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]);
+ }
+
+ /** Constant used for marking a regular comment from the original file */
+ public static final char C_REG = ' ';
+ /**
+ * Constant used for marking when original code is inserted in the file,
+ * next to the translations
+ */
+ public static final char C_OC = '#';
+ /** Constant used for marking special messages from the translator */
+ public static final char C_SPEC = '&';
+ /** Constant used for marking error messages from the translator */
+ public static final char C_ERR = '!';
+
+ /** instruction code in MicroJava bytecode. */
+ public static final int
load = 1,
load_0 = 2,
load_1 = 3,
private String getTop() {
return cmdFromEStack("tempa");
}
+
+ 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");
+ }
- public void convertStream(InputStream ins){
+ public void convertStream(InputStream ins) throws Exception{
mainIn = ins;
//skip start TODO make better
for (int i = 0; i < 14; i++)
prl(cmdFromEStack(loc(op - store_0)));
break;
}
+
+ //TODO getstatic, putstatic
+ //TODO getfield, putfield
+
case const_: {
prl(cmdToEStack(get4()));
break;
break;
}
+ case add: {
+ prl(getTopTwo());
+ prl("tempres := tempb + tempa;");
+ prl(cmdToEStack("tempres"));
+ break;
+ }
+ case sub: {
+ prl(getTopTwo());
+ prl("tempres := tempb - tempa;");
+ prl(cmdToEStack("tempres"));
+ break;
+ }
+ case mul: {
+ prl(getTopTwo());
+ prl("tempres := tempb * tempa;");
+ prl(cmdToEStack("tempres"));
+ break;
+ }
+ case div: {
+ prl(getTopTwo());
+ prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;");
+ prl("tempres := tempb DIV tempa;");
+ prl(cmdToEStack("tempres"));
+ break;
+ }
+ case rem: {
+ prl(getTopTwo());
+ prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;");
+ prl("tempres := tempb MOD tempa;");
+ prl(cmdToEStack("tempres"));
+ 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 jgt:
case jge: {
prl(getTopTwo());
- prl("IF tempb >= tempa THEN CALL a" + (counter + get2())
+ prl("IF tempb "+ getRelationFor(op)
+ +" tempa THEN CALL a" + (counter + get2())
+ " FI;");
break;
}
- case add: {
- prl(getTopTwo());
- prl("tempres := tempb + tempa;");
- prl(cmdToEStack("tempres"));
- break;
- }
- case div: {
- prl(getTopTwo());
- prl("tempres := tempb / tempa;");
- prl(cmdToEStack("tempres"));
+ //TODO call
+
+ case return_: {
+ prl(createComment("return not fully procesed yet"));
+ message("return not fully procesed yet", M_WAR);
break;
}
-
case enter: {
prl(createComment("enter not fully procesed yet"));
+ message("enter not fully procesed yet", M_WAR);
get();
get();
break;
}
- case return_: {
- prl(createComment("return not fully procesed yet"));
- break;
- }
case exit: {
prl(createComment("exit not fully procesed yet"));
+ message("exit not fully procesed yet", M_WAR);
break;
}
+ //TODO read, print
+
// the prints
case bprint: {
prl(getTopTwo());
}
default:
prl(createComment("unknown op error: " + op, C_ERR));
+ message("unknown op error: "+ op, M_ERR);
break;
}
+ //TODO trap
+
+
op = get();
if (op >= 0)
prl("CALL a" + counter + " END");
+ ", 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-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){
originalInComments = true;
} else if (args[i].startsWith("--screen")) {
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++;
}
long mili = Calendar.getInstance().getTimeInMillis()
- now.getTimeInMillis();
System.out.println("conversion time:" + mili + " ms");
+ printMessageCounters();
out.close();
} else
System.out.println("file does not exist");