mjc2wsl - trap operation is now full

[mjc2wsl.git] / src / mjc2wsl.java

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 76d225b..fd360e2 100644 (file)
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -270,6 +270,10 @@ public class mjc2wsl{
                        }
                        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;
@@ -389,6 +393,7 @@ public class mjc2wsl{
                                prl(getTopTwo());
                                prl("IF tempb "+ getRelationFor(op)
                                                +" tempa THEN CALL a" + (counter + get2())
+                                               +" ELSE CALL a" + (counter+1)
                                                + " FI;");
                                break;
                        }
@@ -410,8 +415,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: {
@@ -441,10 +449,7 @@ public class mjc2wsl{
                        }
 
                        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;
                        }
                        
@@ -455,9 +460,13 @@ public class mjc2wsl{
                                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());