gitweb on Svarog
projekti pod git sistemom za održavanje verzija -- projects under the git version control systemdiff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
* @author Doni Pracner, http://perun.dmi.rs/pracner http://quemaster.com
*/
public class mjc2wsl{
* @author Doni Pracner, http://perun.dmi.rs/pracner http://quemaster.com
*/
public class mjc2wsl{
- public static String versionN = "0.1.3";
+ public static String versionN = "0.1.4";
public static final int M_ERR = 2, M_WAR = 1, M_DEB = 0;
public static final int M_ERR = 2, M_WAR = 1, M_DEB = 0;
out.println("total errors:"+messageCounters[M_ERR]+" warnings:"+messageCounters[M_WAR]);
}
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 = ' ';
/**
/** Constant used for marking a regular comment from the original file */
public static final char C_REG = ' ';
/**
private boolean originalInComments = false;
private boolean originalInComments = false;
+ private HashMap<Integer,String> opMap = null;
+
+ private String opCodeFile = "mj-bytecodes.properties";
+
+ private HashMap<Integer,String> getOpMap() {
+ if (opMap==null) {
+ opMap = new HashMap<Integer, String> (60, 0.98f);
+ try{
+ BufferedReader in = new BufferedReader(
+ new InputStreamReader(getClass().getResourceAsStream(opCodeFile)));
+ String str = in.readLine();
+ while (str != null) {
+ String[] ss = str.split("=");
+ opMap.put(Integer.parseInt(ss[0]),ss[1]);
+ str = in.readLine();
+ }
+ in.close();
+ }catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ return opMap;
+ }
+
+ public String getOpString(int op) {
+ return getOpMap().get(op);
+ }
+
+ public String describeOpCode(int op) {
+ return op + " (" + getOpString(op) + ")";
+ }
+
private InputStream mainIn;
private PrintWriter out = null;
private int counter = -1;
private InputStream mainIn;
private PrintWriter out = null;
private int counter = -1;
public void convertStream(InputStream ins) throws Exception{
mainIn = ins;
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(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)
int op = get();
while (op >= 0) {
if (originalInComments)
- prl(createComment("" + op, C_OC));
+ prl(createComment(describeOpCode(op), C_OC));
prl("a" + counter + " == ");
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())));
switch (op) {
case load: {
prl(cmdToEStack(loc(get())));
case enter: {
prl(createComment("enter not fully procesed yet"));
message("enter not fully procesed yet", M_WAR);
case enter: {
prl(createComment("enter not fully procesed yet"));
message("enter not fully procesed yet", M_WAR);
+ int parameters = get();
+
get();
get();
- get();
+ for (int i = parameters-1; i >= 0; i--)
+ prl(cmdFromEStack("mjvm_loc" + i));
break;
}
case exit: {
break;
}
case exit: {
}
//TODO read, print
}
//TODO read, print
+ case read: {
+ prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));");
+ prl(cmdToEStack("tempa"));
+ break;
+ }
// the prints
case bprint: {
// the prints
case bprint: {
prl("PRINT(tempb);");
break;
}
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;
}
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");
op = get();
if (op >= 0)
prl("CALL a" + counter + " END");