X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fmjc2wsl.java;h=2f6aa8d944212439f6405405c04435bb7343c502;hp=6813fbf9c351bf863aaf96d599a1d10ee565286f;hb=1b7d6ae9ea605e75294f59d4fbe86968d93bacd9;hpb=09dd4d38eeffac7fd6eaa88a064bdacf99ae875e

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 6813fbf..2f6aa8d 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -32,6 +32,9 @@ public class mjc2wsl{
 			out.println("total errors:"+messageCounters[M_ERR]+" warnings:"+messageCounters[M_WAR]);
 	}
 	
+	private boolean addPauseAfterEachAddress=false, 
+		addPrintForEachAddress = false;
+	
 	/** Constant used for marking a regular comment from the original file */
 	public static final char C_REG = ' ';
 	/**
@@ -267,20 +270,34 @@ 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;
-		//skip start TODO make better
-		for (int i = 0; i < 14; i++)
-			get();
+		//process start 
+		byte m = (byte) get();
+		byte j = (byte) get();
+		if (m!='M' || j !='J') 
+				throw new Exception("Wrong start of bytecode file");
+		int codesize = get4();
+		int numberOfWords = get4();
+		int mainAdr = get4();
 		
 		prl(getStandardStart());
-		prl("SKIP;\n ACTIONS A_S_start:\n A_S_start == CALL a14 END");
+		prl("SKIP;\n ACTIONS A_S_start:\n A_S_start == CALL a"+(14+mainAdr)+" END");
 		int op = get();
 		while (op >= 0) {
 			if (originalInComments)
 				prl(createComment(describeOpCode(op), C_OC));
 			prl("a" + counter + " == ");
+			if (addPrintForEachAddress) {
+					prl("PRINT(\"a"+counter+"\");");
+					if (addPauseAfterEachAddress)
+							prl("debug_disposable_string := @Read_Line(Standard_Input_Port);");
+			}
 			switch (op) {
 			case load: {
 				prl(cmdToEStack(loc(get())));
@@ -376,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;
 			}
@@ -397,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("mjvm_loc" + i));
 				break;
 			}
 			case exit: {
@@ -426,18 +447,29 @@ public class mjc2wsl{
 				prl("PRINT(tempb);");
 				break;
 			}
+
+			case trap: {
+				// TODO finish trap
+				prl(createComment("trap not fully procesed yet"));
+				message("trap not fully procesed yet", M_WAR);
+				get();
+				break;
+			}
+			
+	
 			default:
 				prl(createComment("unknown op error: " + op, C_ERR));
 				message("unknown op error: "+ op, M_ERR);
 				break;
 			}
 
-			//TODO trap
-
-
+			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());