X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=274bb7e448cd0d90f883ecab19e0093b868ac04a;hp=77678a0beafefd26d47cee8adb44ec1bda285194;hb=9ed768a76bf830a6db379cdc7b91afd73a924361;hpb=bfa6f5cb35fa27845f7bdf72f2238f987bf6e83b

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 77678a0..274bb7e 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -120,6 +120,8 @@ 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\tmjvm_objects := < >, ");
 		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 +217,18 @@ 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+"]";
+	}
+	
+	private String genObject(String i){
+			return "mjvm_objects["+ i+"]";
+	}
+	
 	/**
 	 * Creates a WSL comment with care to quote chars.
 	 */
@@ -353,12 +367,20 @@ public class mjc2wsl{
 				prl(cmdFromEStack(genStatic(get2())));
 				break;
 			}
-			//TODO getfield, putfield
-			case getfield:
+
+			case getfield:{
+					int f = get2();
+					prl(getTop());
+					prl(cmdToEStack(genObject("tempa")+"["+(f+1)+"]"));
+					break;
+			}
 			case putfield:{
-					prl(createComment("fields are not processed properly", C_ERR));
-					message("fields are not processed properly", M_ERR);
-					get2();
+					int f = get2();
+					//we need to use a temparray as a pointer, WSL
+					//otherwise tries to access it as a list of lists and fails
+					prl(getTopTwo());
+					prl("VAR < tempArray := "+genObject("tempb")+" > :");
+					prl("tempArray["+(f+1)+"]:=tempa ENDVAR;");				
 					break;
 			}
 			
@@ -419,21 +441,66 @@ public class mjc2wsl{
 			
 			case inc  : {
 				int b1 = get(), b2 = get();
-				prl(loc(b1)+" := " +loc(b1)+" + "+b2);
+				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 new_ :{
+					int size = get2();
+					//TODO maybe objects and arrays should be in the same list?
+					prl("mjvm_objects := mjvm_objects ++ < ARRAY("+size+",0) >;");
+					prl(cmdToEStack("LENGTH(mjvm_objects)"));
+					break;
+			}
 			case newarray :{
-					prl(createComment("memory allocation not processed properly", C_ERR));
-					message("memory allocation  not processed properly", M_ERR);
-					get();
+					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
-			//TODO arraylength
-			//TODO dup, dup2
+			
+			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;
+			}
+			case arraylength :{
+				prl(getTop());
+				//TODO make an array length function of some sort!
+				prl(createComment("array length not known - LENGTH not aplicable to arrays",C_ERR));
+				message("array length not known - LENGTH not aplicable to arrays",M_ERR);
+				prl(createComment("put 1 on the stack for consistency",C_SPEC));
+				prl(cmdToEStack(1));
+				break;
+			}
+			
+			case dup : {
+					prl(getTop());
+					prl(cmdToEStack("tempa"));
+					prl(cmdToEStack("tempa"));
+					break;					
+			}
+			case dup2 : {
+					prl(getTopTwo());
+					prl(cmdToEStack("tempb"));
+					prl(cmdToEStack("tempa"));
+					prl(cmdToEStack("tempb"));
+					prl(cmdToEStack("tempa"));
+					break;					
+			}
 			
 			case pop : {
 					prl(cmdPopEStack());
@@ -465,9 +532,9 @@ public class mjc2wsl{
 			}
 
 			case return_: {
-				prl("IF EMPTY?(mjvm_mstack) THEN CALL Z FI");
-				//else we let things return		
-				prl("END b"+counter+" ==");
+				//we let the actions return
+				// there is nothing to clean up
+				prl("SKIP END b"+counter+" ==");
 				break;
 			}
 			case enter: {