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

diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
index 6813fbf..917978c 100644
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
@@ -270,12 +270,17 @@ public class mjc2wsl{
 
 	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)
@@ -426,15 +431,22 @@ 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
-
-
 			op = get();
 			if (op >= 0)
 				prl("CALL a" + counter + " END");