experimental transformations - added Flag Removal to the auto transfs

[mjc2wsl.git] / src / mjc2wsl.java

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index fe9b0bd..bc6f465 100644 (file)
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -219,6 +219,20 @@ public class mjc2wsl{
                return ret.toString();
        }
 
                return ret.toString();
        }
 

+       private String createStartVar(String... vars){
+               StringBuilder ret = new StringBuilder("VAR < ");
+               ret.append(vars[0] + " := 0");
+               for (int i=1; i<vars.length; i++)
+                               ret.append(", "+ vars[i] +" := 0");
+               ret.append(" > : ");
+               
+               return ret.toString();
+       }
+       
+       private String createEndVar(){
+               return "ENDVAR;";
+       }
+       

        private String createLocal(int i) {
                // arrays start at 1 in WSL, so we need an offset
                return "mjvm_locals[" + (i + 1) + "]";
        private String createLocal(int i) {
                // arrays start at 1 in WSL, so we need an offset
                return "mjvm_locals[" + (i + 1) + "]";


@@ -344,7 +358,7 @@ public class mjc2wsl{
                while (op >= 0) {
                        if (originalInComments)
                                prl(createComment(describeOpCode(op), C_OC));
                while (op >= 0) {
                        if (originalInComments)
                                prl(createComment(describeOpCode(op), C_OC));

-                       prl("a" + counter + " == ");
+                       prl(" a" + counter + " == ");

                        if (genPrintForEachAddress) {
                                prl("PRINT(\"a" + counter + "\");");
                                if (genPauseAfterEachAddress)
                        if (genPrintForEachAddress) {
                                prl("PRINT(\"a" + counter + "\");");
                                if (genPauseAfterEachAddress)


@@ -433,17 +447,21 @@ public class mjc2wsl{
                                break;
                        }
                        case div: {
                                break;
                        }
                        case div: {

+                               prl(createStartVar("tempa", "tempb", "tempres"));

                                prl(createTopTwoEStack());
                                prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;");
                                prl("tempres := tempb DIV tempa;");
                                prl(createToEStack("tempres"));
                                prl(createTopTwoEStack());
                                prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;");
                                prl("tempres := tempb DIV tempa;");
                                prl(createToEStack("tempres"));

+                               prl(createEndVar());

                                break;
                        }
                        case rem: {
                                break;
                        }
                        case rem: {

+                               prl(createStartVar("tempa", "tempb", "tempres"));

                                prl(createTopTwoEStack());
                                prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;");
                                prl("tempres := tempb MOD tempa;");
                                prl(createToEStack("tempres"));
                                prl(createTopTwoEStack());
                                prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;");
                                prl("tempres := tempb MOD tempa;");
                                prl(createToEStack("tempres"));

+                               prl(createEndVar());

                                break;
                        }
 
                                break;
                        }
 


@@ -562,7 +580,7 @@ public class mjc2wsl{
                        case return_: {
                                // we let the actions return
                                // there is nothing to clean up
                        case return_: {
                                // we let the actions return
                                // there is nothing to clean up

-                               prl("SKIP END b" + counter + " ==");
+                               prl("SKIP\n END\n b" + counter + " ==");

                                break;
                        }
                        case enter: {
                                break;
                        }
                        case enter: {


@@ -621,11 +639,11 @@ public class mjc2wsl{
                        op = get();
                        if (op >= 0)
                                if (wasJump)
                        op = get();
                        if (op >= 0)
                                if (wasJump)

-                                       prl("SKIP END");
+                                       prl("SKIP\n END");

                                else
                                else

-                                       prl("CALL a" + counter + " END");
+                                       prl("CALL a" + counter + "\n END");

                }
                }

-               prl("\nSKIP END\nENDACTIONS;\n");
+               prl("SKIP\n END\nENDACTIONS;\n");

                prl(createStandardEnd());
        }
 
                prl(createStandardEnd());
        }