gitweb on Svarog

projekti pod git sistemom za održavanje verzija -- projects under the git version control system
mjc2wsl - CALL op added, Mstack operations added
[mjc2wsl.git] / src / mjc2wsl.java
index 521be05..f84fc3a 100644 (file)
@@ -10,8 +10,28 @@ import java.util.*;
  * @author Doni Pracner, http://perun.dmi.rs/pracner http://quemaster.com
  */
 public class mjc2wsl{
-       public static String versionN = "0.1.2";
+       public static String versionN = "0.1.3";
 
+       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 = ' ';
        /**
@@ -92,7 +112,7 @@ public class mjc2wsl{
                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 := < >, t_e_m_p := 0 > :");
+               ret.append("\n  estack := < >, mstack := < >, t_e_m_p := 0 > :");
 
                return ret.toString();
        }
@@ -166,6 +186,8 @@ public class mjc2wsl{
                return "C:\"" + type + str.replace("\"", "''") + "\";";
        }
 
+       //Expression stack
+       
        private String cmdToEStack(int i) {
                return "estack := <" + i + " > ++ estack;";
        }
@@ -186,10 +208,24 @@ public class mjc2wsl{
                return cmdFromEStack("tempa");
        }
        
+       //Method stack
+       
+       private String cmdToMStack(int i) {
+               return "mstack := <" + i + " > ++ mstack;";
+       }
+
+       private String cmdToMStack(String i) {
+               return "mstack := <" + i + " > ++ mstack;";
+       }
+
+       private String cmdFromMStack(String st) {
+               return st + " := HEAD(mstack); mstack := TAIL(mstack);";
+       }
+       
        private String getRelationFor(int opcode) throws Exception {
                        switch (opcode) {
                                        case jeq: return "=";
-                                       case jne: return "#";
+                                       case jne: return "<>";
                                        case jlt: return "<";
                                        case jle: return "<=";
                                        case jgt: return ">";
@@ -234,6 +270,10 @@ public class mjc2wsl{
                                prl(cmdFromEStack(loc(op - store_0)));
                                break;
                        }
+                       
+                       //TODO getstatic, putstatic
+                       //TODO getfield, putfield
+                       
                        case const_: {
                                prl(cmdToEStack(get4()));
                                break;
@@ -249,6 +289,45 @@ public class mjc2wsl{
                                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;
@@ -267,34 +346,32 @@ public class mjc2wsl{
                                break;
                        }
 
-                       case add: {
-                               prl(getTopTwo());
-                               prl("tempres := tempb + tempa;");
-                               prl(cmdToEStack("tempres"));
+                       case call: {
+                               prl(cmdToMStack(counter+2));
+                               prl("CALL a" + (counter + get2()) + ";");
                                break;
                        }
-                       case div: {
-                               prl(getTopTwo());
-                               prl("tempres := tempb / tempa;");
-                               prl(cmdToEStack("tempres"));
+
+                       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());
@@ -309,9 +386,13 @@ public class mjc2wsl{
                        }
                        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");
@@ -334,7 +415,10 @@ public class mjc2wsl{
                                + ", 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){
@@ -363,6 +447,12 @@ public class mjc2wsl{
                                                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++;
                        }
@@ -396,6 +486,7 @@ public class mjc2wsl{
                                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");
Svarog.pmf.uns.ac.rs/gitweb maintanance Doni Pracner