X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=bc6f4656427485f057a9bfe8e4b4676113b3d616;hp=8ee7852c13a9ff67570e5db945b44caeca8fa0b9;hb=37bd7e6ee3efaa3a310c4cd6ead85cbeda90ca94;hpb=ec5ee9b63f3f86802c8ca1d5fee0e87ef521de98

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 8ee7852..bc6f465 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -219,6 +219,20 @@ public class mjc2wsl{
 		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) + "]";
@@ -339,13 +353,12 @@ public class mjc2wsl{
 		int mainAdr = get4();
 		
 		prl(createStandardStart(numberOfWords));
-		prl("SKIP;\n ACTIONS A_S_start:\n A_S_start == CALL a" + (14 + mainAdr)
-				+ " END");
+		prl("SKIP;\n ACTIONS a" + (14 + mainAdr) + " :");
 		int op = get();
 		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)
@@ -434,17 +447,21 @@ public class mjc2wsl{
 				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(createEndVar());
 				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(createEndVar());
 				break;
 			}
 
@@ -563,7 +580,7 @@ public class mjc2wsl{
 			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: {
@@ -622,11 +639,11 @@ public class mjc2wsl{
 			op = get();
 			if (op >= 0)
 				if (wasJump)
-					prl("SKIP END");
+					prl("SKIP\n END");
 				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());
 	}