X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=65b6348cf19b08e6e239f10510daf14464b3a69a;hp=76d225b5c73c5f4b3d08b0bc47e966586b13813f;hb=9a00b56dbb4af4b59c426387e4a2156c5757b0c4;hpb=9fe5956ccf526188287b4e9939b4b73ba22920ba

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 76d225b..65b6348 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -114,7 +114,7 @@ public class mjc2wsl{
 
 		ret.append("VAR < tempa := 0, tempb := 0, tempres :=0,\n\t");
 		for (int i = 0; i <= 3; i++)
-			ret.append("mjvm_loc" + i + " := 0, ");
+			ret.append(loc(i) + " := 0, ");
 		ret.append("\n	mjvm_estack := < >, mjvm_mstack := < >, "); 
 		ret.append("\n	mjvm_fp := 0, mjvm_sp := 0,");
 		ret.append("\n	t_e_m_p := 0 > :");
@@ -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(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());