mjc2wsl - array support - newarray, aload, baload, astore, bastore

[mjc2wsl.git] / src / mjc2wsl.java

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index c45de80..3a97270 100644 (file)
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -120,6 +120,7 @@ public class mjc2wsl{
                ret.append("VAR < tempa := 0, tempb := 0, tempres :=0,\n\t");
                ret.append("mjvm_locals := ARRAY(1,0), ");
                ret.append("\n\tmjvm_statics := ARRAY("+numWords+",0), ");
+               ret.append("\n\tmjvm_arrays := < >, ");
                ret.append("\n  mjvm_estack := < >, mjvm_mstack := < >, "); 
                ret.append("\n  mjvm_fp := 0, mjvm_sp := 0,");
                ret.append("\n  t_e_m_p := 0 > :");
@@ -215,6 +216,14 @@ public class mjc2wsl{
                        return "mjvm_statics[" + (i+1)+"]";
        }
        
+       private String genArray(int i){
+                       return "mjvm_arrays["+ i +"]";
+       }
+       
+       private String genArray(String i){
+                       return "mjvm_arrays["+ i+"]";
+       }
+       
        /**
         * Creates a WSL comment with care to quote chars.
         */
@@ -253,6 +262,13 @@ public class mjc2wsl{
                return res;
        }
        
+       private String cmdPopEStack() {
+               String res = "mjvm_estack := TAIL(mjvm_estack);";
+               if (genPrintEStackOnChange) res +="PRINT(\"eStack\",mjvm_estack);";
+               return res;
+       }
+       
+       
        private String getTopTwo(){
                return cmdFromEStack("tempa") + "\n" + cmdFromEStack("tempb");
        }
@@ -403,19 +419,57 @@ public class mjc2wsl{
                                break;
                        }
 
-                       //TODO neg, shl, shr, inc
+                       case neg :{
+                               prl(getTop());
+                               prl(cmdToEStack("-tempa"));
+                               break;
+                       }                       
+                       //TODO shl, shr
+                       
+                       case inc  : {
+                               int b1 = get(), b2 = get();
+                               prl(loc(b1)+" := " +loc(b1)+" + "+b2+";");
+                               break;
+                       }
                        //TODO new_ newarray
-                       case new_ :
-                                       get();//needs a short, but a byte will be taken bellow as well
-                       case newarray :{
+                       case new_ :{
                                        prl(createComment("memory allocation not processed properly", C_ERR));
                                        message("memory allocation  not processed properly", M_ERR);
-                                       get();
+                                       get2();
+                                       break;
+                       }
+                       case newarray :{
+                                       get();// 0 - bytes, 1 - words; ignore for now
+                                       //TODO take into consideration 0/1
+                                       prl(getTop());
+                                       prl("mjvm_arrays := mjvm_arrays ++ < ARRAY(tempa,0) >;");
+                                       prl(cmdToEStack("LENGTH(mjvm_arrays)"));
                                        break;
                        }
-                       //TODO aload, asstore, baload, bastore
+                       
+                       case aload:
+                       case baload:{
+                               prl(getTopTwo());
+                               prl(cmdToEStack(genArray("tempb")+"[tempa+1]"));
+                               break;
+                       }
+                       case astore:
+                       case bastore:{
+                               prl(cmdFromEStack("tempres"));
+                               prl(getTopTwo());
+                               //we need to use a temparray as a pointer, WSL
+                               //otherwise tries to access it as a list of lists and fails
+                               prl("VAR < tempArray := "+genArray("tempb")+" > :");
+                               prl("tempArray[tempa+1]:=tempres ENDVAR;");
+                               break;
+                       }
                        //TODO arraylength
-                       //TODO pop, dup, dup2
+                       //TODO dup, dup2
+                       
+                       case pop : {
+                                       prl(cmdPopEStack());
+                                       break;                                  
+                       }
                        
                        case jmp: {
                                prl("CALL a" + (counter + get2()) + ";");
@@ -463,24 +517,24 @@ public class mjc2wsl{
                        }
 
                        // read, print
-                       case read:{
+                       case bread:{
                                //TODO make it a char for read
                                message("char is read like a number", M_WAR);
                                prl(createComment("char is read like a number",C_SPEC));
                        }
-                       case bread: {
+                       case read: {
                                prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));");
                                prl(cmdToEStack("tempa"));
                                break;
                        }
 
                        // the prints
-                       case print:{
+                       case bprint:{
                                // TODO need to make it a char on print
                                message("chars will be printed as number codes", M_WAR);
                                prl(createComment("char will be printed as a number code",C_SPEC));
                        }
-                       case bprint: {
+                       case print: {
                                // TODO printing numbers needs different lengths of spacing
                                prl(getTopTwo());
                                pr(createComment("print spacing",C_SPEC));