mjc2wsl - enter processing the local variables

[mjc2wsl.git] / src / mjc2wsl.java

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index ee36c51..f05d271 100644 (file)
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -32,6 +32,9 @@ public class mjc2wsl{
                        out.println("total errors:"+messageCounters[M_ERR]+" warnings:"+messageCounters[M_WAR]);
        }
        
+       private boolean addPauseAfterEachAddress=false, 
+               addPrintForEachAddress = false;
+       
        /** Constant used for marking a regular comment from the original file */
        public static final char C_REG = ' ';
        /**
@@ -270,17 +273,27 @@ public class mjc2wsl{
 
        public void convertStream(InputStream ins) throws Exception{
                mainIn = ins;
-               //skip start TODO make better
-               for (int i = 0; i < 14; i++)
-                       get();
+               //process start 
+               byte m = (byte) get();
+               byte j = (byte) get();
+               if (m!='M' || j !='J') 
+                               throw new Exception("Wrong start of bytecode file");
+               int codesize = get4();
+               int numberOfWords = get4();
+               int mainAdr = get4();
                
                prl(getStandardStart());
-               prl("SKIP;\n ACTIONS A_S_start:\n A_S_start == CALL a14 END");
+               prl("SKIP;\n ACTIONS A_S_start:\n A_S_start == CALL a"+(14+mainAdr)+" END");
                int op = get();
                while (op >= 0) {
                        if (originalInComments)
                                prl(createComment(describeOpCode(op), C_OC));
                        prl("a" + counter + " == ");
+                       if (addPrintForEachAddress) {
+                                       prl("PRINT(\"a"+counter+"\");");
+                                       if (addPauseAfterEachAddress)
+                                                       prl("debug_disposable_string := @Read_Line(Standard_Input_Port);");
+                       }
                        switch (op) {
                        case load: {
                                prl(cmdToEStack(loc(get())));
@@ -397,8 +410,11 @@ public class mjc2wsl{
                        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("mjvm_loc" + i));
                                break;
                        }
                        case exit: {
@@ -408,6 +424,11 @@ public class mjc2wsl{
                        }
 
                        //TODO read, print
+                       case read: {
+                               prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));");
+                               prl(cmdToEStack("tempa"));
+                               break;
+                       }
 
                        // the prints
                        case bprint: {
@@ -421,15 +442,22 @@ public class mjc2wsl{
                                prl("PRINT(tempb);");
                                break;
                        }
+
+                       case trap: {
+                               // TODO finish trap
+                               prl(createComment("trap not fully procesed yet"));
+                               message("trap not fully procesed yet", M_WAR);
+                               get();
+                               break;
+                       }
+                       
+       
                        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");