gitweb on Svarog
projekti pod git sistemom za održavanje verzija -- projects under the git version control system
diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java
--- a/src/mjc2wsl.java
+++ b/src/mjc2wsl.java
private boolean genPopPush=false;
+ private boolean genInlinePrint=false;
+
/** Constant used for marking a regular comment from the original file */
public static final char C_REG = ' ';
/**
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("\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(createComment("print spacing", C_SPEC));
- ret.append("\n\tIF format>1 THEN\n\t\tFOR i:=2 TO ");
- ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n");
- ret.append("\tFI;\n\tPRINFLUSH(val)\nEND\n");
-
- 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("format STEP 1 DO PRINFLUSH(\" \") OD\n");
- ret.append("\t\tFI;\n\t\tPRINFLUSH(CHR(val))\n");
- ret.append("\tFI\n");
- ret.append("END\n");
+ if (!genInlinePrint) {
+ ret.append("\nPROC Print_MJ(val, format VAR)==\n");
+ ret.append(createComment("print spacing", C_SPEC));
+ ret.append("\n\tIF format>1 THEN\n\t\tFOR i:=2 TO ");
+ ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n");
+ ret.append("\tFI;\n\tPRINFLUSH(val)\nEND\n");
+
+ ret.append("\nPROC Print_MJ_CHAR(val, format VAR)==\n");
+ ret.append(createComment("print spacing", C_SPEC));
+ ret.append("\n\tIF format>1 THEN\n\t\tFOR i:=2 TO ");
+ ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n");
+ ret.append("\tFI;\n\tPRINFLUSH(CHR(val))\n");
+ ret.append("END\n");
+ }
ret.append("\nEND");
return ret.toString();
case getfield: {
int f = get2();
+ prl(createStartVar("tempa"));
prl(createTopEStack());
prl(createToEStack(createObject("tempa") + "[" + (f + 1) + "]"));
+ prl(createEndVar());
break;
}
case putfield: {
int f = get2();
- // we need to use a temparray as a pointer, WSL
- // otherwise tries to access it as a list of lists and fails
- prl(createTopTwoEStack());
- prl("VAR < tempArray := " + createObject("tempb") + " > :");
- prl("tempArray[" + (f + 1) + "]:=tempa ENDVAR;");
+ prl(createStartVar("tempa", "tempb"));
+ prl(createTopTwoEStack());
+ prl(createObject("tempb") + "[" + (f + 1) + "]:=tempa;");
+ prl(createEndVar());
break;
}
break;
}
+ case const_m1: {
+ prl(createToEStack(-1));
+ break;
+ }
+
case const_0:
case const_1:
case const_2:
}
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(createEndVar());
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(createEndVar());
break;
}
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(createEndVar());
break;
}
case aload:
case baload: {
+ prl(createStartVar("tempa", "tempb"));
prl(createTopTwoEStack());
prl(createToEStack(createArray("tempb") + "[tempa+1]"));
+ prl(createEndVar());
break;
}
case astore:
break;
}
case arraylength: {
+ prl(createStartVar("tempa", "tempb"));
prl(createTopEStack());
prl("tempb := LENGTH("+ createArray("tempa") + ");");
prl(createToEStack("tempb"));
+ prl(createEndVar());
break;
}
case dup: {
+ prl(createStartVar("tempa", "tempb"));
prl(createTopEStack());
prl(createToEStack("tempa"));
prl(createToEStack("tempa"));
+ prl(createEndVar());
break;
}
case dup2: {
+ prl(createStartVar("tempa", "tempb"));
prl(createTopTwoEStack());
prl(createToEStack("tempb"));
prl(createToEStack("tempa"));
prl(createToEStack("tempb"));
prl(createToEStack("tempa"));
+ prl(createEndVar());
break;
}
case bprint: {
prl(createStartVar("tempa", "tempb"));
prl(createTopTwoEStack());
- prl("Print_MJ_CHAR(tempb,tempa);");
+ if (genInlinePrint){
+ prl(createComment("print spacing and transformation",C_SPEC));
+ prl("PRINFLUSH(SUBSTR(\" \", 0, MIN(10, tempa - 1)), @List_To_String(< tempb >));");
+ } else
+ prl("Print_MJ_CHAR(tempb,tempa);");
prl(createEndVar());
break;
}
prl(createStartVar("tempa", "tempb"));
prl(createTopTwoEStack());
- prl("Print_MJ(tempb,tempa);");
+ if (genInlinePrint){
+ prl(createComment("print spacing",C_SPEC));
+ prl("PRINFLUSH(SUBSTR(\" \", 0, MIN(10, tempa - 1)), tempb);");
+ }
+ else
+ prl("Print_MJ(tempb,tempa);");
prl(createEndVar());
break;
}
genPauseAfterEachAddress = true;
} else if (args[i].compareToIgnoreCase("--genPopPush") == 0) {
genPopPush = true;
+ } else if (args[i].compareToIgnoreCase("--genInlinePrint") == 0) {
+ genInlinePrint = true;
}
i++;
}