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.6";
+ public static String versionN = "0.1.7";
private TransMessages messages = new TransMessages();
private TransMessages messages = new TransMessages();
public String createStandardStart(int numWords){
StringBuilder ret = new StringBuilder(
"C:\" This file automatically converted from microjava bytecode\";\n"
public String createStandardStart(int numWords){
StringBuilder ret = new StringBuilder(
"C:\" This file automatically converted from microjava bytecode\";\n"
- +"C:\" with mjc2wsl v "+versionN+"\";\n\n");
-
- ret.append(createAsciiString());
+ +"C:\" with mjc2wsl v "+versionN+"\";\n");
ret.append("\nBEGIN");
ret.append("\nVAR <\n\t");
ret.append("mjvm_locals := ARRAY(1,0),");
ret.append("\n\tmjvm_statics := ARRAY("+numWords+",0),");
ret.append("\n\tmjvm_arrays := < >,");
ret.append("\nBEGIN");
ret.append("\nVAR <\n\t");
ret.append("mjvm_locals := ARRAY(1,0),");
ret.append("\n\tmjvm_statics := ARRAY("+numWords+",0),");
ret.append("\n\tmjvm_arrays := < >,");
+ ret.append("\n\tmjvm_flag_jump := 0,");
ret.append("\n\tmjvm_objects := < >,");
ret.append("\n\tmjvm_estack := < >, mjvm_mstack := < > > :");
ret.append("\n\tmjvm_objects := < >,");
ret.append("\n\tmjvm_estack := < >, mjvm_mstack := < > > :");
ret.append("\nWHERE\n");
ret.append("\nFUNCT CHR(num) ==:\n");
ret.append("\nWHERE\n");
ret.append("\nFUNCT CHR(num) ==:\n");
- ret.append("\tSUBSTR(ascii,num,1)\n");
+ ret.append("\t@List_To_String(< num >)\n");
ret.append("END\n");
ret.append("\nPROC Print_MJ(val, format VAR)==\n");
ret.append("END\n");
ret.append("\nPROC Print_MJ(val, format VAR)==\n");
ret.append("\nPROC Print_MJ_CHAR(val, format VAR)==\n");
ret.append(createComment("print spacing", C_SPEC));
ret.append("\nPROC Print_MJ_CHAR(val, format VAR)==\n");
ret.append(createComment("print spacing", C_SPEC));
- ret.append("\n\tIF val=10 OR val=13 THEN\n");
- ret.append("\t\tPRINT(\"\");\n");
- ret.append("\tELSE\n");
- ret.append("\t\tIF format>1 THEN\n\t\t\tFOR i:=2 TO ");
+ ret.append("\n\tIF format>1 THEN\n\t\tFOR i:=2 TO ");
ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n");
ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n");
- ret.append("\t\tFI;\n\t\tPRINFLUSH(CHR(val))\n");
- ret.append("\tFI\n");
+ ret.append("\tFI;\n\tPRINFLUSH(CHR(val))\n");
ret.append("END\n");
ret.append("\nEND");
ret.append("END\n");
ret.append("\nEND");
}
case shl: {
}
case shl: {
+ prl(createStartVar("tempa", "tempb"));
prl(createTopTwoEStack());
prl("VAR <tempres :=tempb, i:=1 >:");
prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres * 2 OD;");
prl(createToEStack("tempres"));
prl("ENDVAR;");
prl(createTopTwoEStack());
prl("VAR <tempres :=tempb, i:=1 >:");
prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres * 2 OD;");
prl(createToEStack("tempres"));
prl("ENDVAR;");
+ prl(createEndVar());
break;
}
case shr: {
break;
}
case shr: {
+ prl(createStartVar("tempa", "tempb"));
prl(createTopTwoEStack());
prl("VAR <tempres :=tempb, i:=1 >:");
prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres DIV 2 OD;");
prl(createToEStack("tempres"));
prl("ENDVAR;");
prl(createTopTwoEStack());
prl("VAR <tempres :=tempb, i:=1 >:");
prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres DIV 2 OD;");
prl(createToEStack("tempres"));
prl("ENDVAR;");
+ prl(createEndVar());
break;
}
break;
}
case newarray: {
get();// 0 - bytes, 1 - words; ignore for now
// TODO take into consideration 0/1
case newarray: {
get();// 0 - bytes, 1 - words; ignore for now
// TODO take into consideration 0/1
+ prl(createStartVar("tempa"));
prl(createTopEStack());
prl("mjvm_arrays := mjvm_arrays ++ < ARRAY(tempa,0) >;");
prl(createToEStack("LENGTH(mjvm_arrays)"));
prl(createTopEStack());
prl("mjvm_arrays := mjvm_arrays ++ < ARRAY(tempa,0) >;");
prl(createToEStack("LENGTH(mjvm_arrays)"));
+ prl(createEndVar());
break;
}
case aload:
case baload: {
break;
}
case aload:
case baload: {
+ prl(createStartVar("tempa", "tempb"));
prl(createTopTwoEStack());
prl(createToEStack(createArray("tempb") + "[tempa+1]"));
prl(createTopTwoEStack());
prl(createToEStack(createArray("tempb") + "[tempa+1]"));
+ prl(createEndVar());
break;
}
case astore:
case bastore: {
break;
}
case astore:
case bastore: {
+ prl(createStartVar("tempa", "tempb", "tempres"));
prl(createFromEStack("tempres"));
prl(createTopTwoEStack());
prl(createFromEStack("tempres"));
prl(createTopTwoEStack());
- // we need to use a temparray as a pointer, WSL
- // otherwise tries to access it as a list of lists and fails
- prl("VAR < tempArray := " + createArray("tempb") + " > :");
- prl("tempArray[tempa+1]:=tempres ENDVAR;");
+ prl("mjvm_arrays[tempb][tempa+1]:=tempres;");
+ prl(createEndVar());
break;
}
case arraylength: {
break;
}
case arraylength: {
+ prl(createStartVar("tempa", "tempb"));
prl(createTopEStack());
prl("tempb := LENGTH("+ createArray("tempa") + ");");
prl(createToEStack("tempb"));
prl(createTopEStack());
prl("tempb := LENGTH("+ createArray("tempa") + ");");
prl(createToEStack("tempb"));
+ prl(createEndVar());
break;
}
case dup: {
break;
}
case dup: {
+ prl(createStartVar("tempa", "tempb"));
prl(createTopEStack());
prl(createToEStack("tempa"));
prl(createToEStack("tempa"));
prl(createTopEStack());
prl(createToEStack("tempa"));
prl(createToEStack("tempa"));
+ prl(createEndVar());
break;
}
case dup2: {
break;
}
case dup2: {
+ prl(createStartVar("tempa", "tempb"));
prl(createTopTwoEStack());
prl(createToEStack("tempb"));
prl(createToEStack("tempa"));
prl(createToEStack("tempb"));
prl(createToEStack("tempa"));
prl(createTopTwoEStack());
prl(createToEStack("tempb"));
prl(createToEStack("tempa"));
prl(createToEStack("tempb"));
prl(createToEStack("tempa"));
+ prl(createEndVar());
break;
}
break;
}
case jge: {
prl(createStartVar("tempa", "tempb"));
prl(createTopTwoEStack());
case jge: {
prl(createStartVar("tempa", "tempb"));
prl(createTopTwoEStack());
- prl("IF tempb " + getRelationFor(op) + " tempa THEN CALL a"
- + (counter + get2()) + " ELSE CALL a" + (counter + 1)
+ prl("IF tempb " + getRelationFor(op)
+ + " tempa THEN mjvm_flag_jump := 1"
+ + " ELSE mjvm_flag_jump := 0"
+ " FI;");
prl(createEndVar());
+ " FI;");
prl(createEndVar());
+ prl("IF mjvm_flag_jump = 1 THEN CALL a"
+ + (counter + get2())
+ + " ELSE CALL a" + (counter + 1)
+ + " FI;");
break;
}
break;
}