mjc2wsl - op code processing - everything is ordered according to the numbers and...

[mjc2wsl.git] / src / mjc2wsl.java

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index c482ccf..b7c572b 100644 (file)
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -10,16 +10,16 @@ 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;
+       public static final int M_ERR = 2, M_WAR = 1, M_DEB = 0;
        
-       private int printLevel = 0;
+       private int printLevel = M_ERR;
        
        private int[] messageCounters = new int[M_ERR+1];
        
        private void message(String mes, int level){
-                       if (level>printLevel)
+                       if (level>=printLevel)
                                        System.out.println(mes);
                        messageCounters[level]++;
        }
@@ -254,6 +254,10 @@ public class mjc2wsl{
                                prl(cmdFromEStack(loc(op - store_0)));
                                break;
                        }
+                       
+                       //TODO getstatic, putstatic
+                       //TODO getfield, putfield
+                       
                        case const_: {
                                prl(cmdToEStack(get4()));
                                break;
@@ -269,24 +273,6 @@ public class mjc2wsl{
                                break;
                        }
 
-                       case jmp: {
-                               prl("CALL a" + (counter + get2()) + ";");
-                               break;
-                       }
-
-                       case jeq:
-                       case jne:
-                       case jlt:
-                       case jle:
-                       case jgt:
-                       case jge: {
-                               prl(getTopTwo());
-                               prl("IF tempb "+ getRelationFor(op)
-                                               +" tempa THEN CALL a" + (counter + get2())
-                                               + " FI;");
-                               break;
-                       }
-
                        case add: {
                                prl(getTopTwo());
                                prl("tempres := tempb + tempa;");
@@ -320,24 +306,52 @@ public class mjc2wsl{
                                break;
                        }
 
-                       case enter: {
-                               prl(createComment("enter not fully procesed yet"));
-                               message("enter not fully procesed yet", M_WAR);
-                               get();
-                               get();
+                       //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 jeq:
+                       case jne:
+                       case jlt:
+                       case jle:
+                       case jgt:
+                       case jge: {
+                               prl(getTopTwo());
+                               prl("IF tempb "+ getRelationFor(op)
+                                               +" tempa THEN CALL a" + (counter + get2())
+                                               + " FI;");
+                               break;
+                       }
+
+                       //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 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());
@@ -356,6 +370,9 @@ public class mjc2wsl{
                                break;
                        }
 
+                       //TODO trap
+
+
                        op = get();
                        if (op >= 0)
                                prl("CALL a" + counter + " END");
@@ -378,7 +395,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){
@@ -407,6 +427,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++;
                        }
@@ -436,7 +462,6 @@ public class mjc2wsl{
                        }
                        if (f.exists()) {
                                Calendar now = Calendar.getInstance();
-                               printLevel=10;
                                convertFile(f);
                                long mili = Calendar.getInstance().getTimeInMillis()
                                                - now.getTimeInMillis();