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 genPauseAfterEachAddress=false,
genPrintForEachAddress = false,
genPrintEStackOnChange = false;
+
+ private boolean genPopPush=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");
-
- ret.append("BEGIN ");
- ret.append("VAR < \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_objects := < >, ");
- ret.append("\n mjvm_estack := < >, mjvm_mstack := < > > : ");
-
+ +"C:\" with mjc2wsl v "+versionN+"\";\n\n");
+
+ ret.append(createAsciiString());
+
+ 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_objects := < >,");
+ ret.append("\n\tmjvm_estack := < >, mjvm_mstack := < > > :");
+
+ return ret.toString();
+ }
+
+ public String createAsciiString(){
+ StringBuilder ret = new StringBuilder("C:\"char array for ascii code conversions\";");
+ ret.append("\nascii := \"????????????????????????????????\"++\n");
+ ret.append("\" !\"++Quote++\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\";\n");
+
return ret.toString();
}
public String createStandardEnd(){
- StringBuilder ret = new StringBuilder("SKIP\nENDVAR");
+ StringBuilder ret = new StringBuilder("SKIP\nENDVAR\n");
ret.append("\nWHERE\n");
+ ret.append("\nFUNCT CHR(num) ==:\n");
+ ret.append("\tSUBSTR(ascii,num,1)\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("\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");
+
+ ret.append("\nEND");
return ret.toString();
}
public static String createComment(String str, char type) {
return "C:\"" + type + str.replace("\"", "''") + "\";";
}
+
+ // generalised stack operations
+
+ private String createToStack(String stack, String var){
+ if (genPopPush)
+ return "PUSH("+stack+"," + var + ");";
+ else
+ return stack + " := <" + var + " > ++ " + stack +";";
+ }
- //Expression stack
+ private String createFromStack(String stack, String var){
+ if (genPopPush)
+ return "POP("+ var + ", "+stack+");";
+ else
+ return var + ":= HEAD("+stack+"); "+stack+" := TAIL("+stack+");";
+ }
+//Expression stack
private String createToEStack(int i) {
- String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;";
- if (genPrintEStackOnChange)
- res += "PRINT(\"eStack\",mjvm_estack);";
- return res;
+ return createToEStack(i+"");
}
private String createToEStack(String i) {
- String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;";
+ String res = createToStack("mjvm_estack", i);
if (genPrintEStackOnChange)
res += "PRINT(\"eStack\",mjvm_estack);";
return res;
}
private String createFromEStack(String st) {
- String res = st
- + " := HEAD(mjvm_estack); mjvm_estack := TAIL(mjvm_estack);";
+ String res = createFromStack("mjvm_estack",st);
if (genPrintEStackOnChange)
res += "PRINT(\"eStack\",mjvm_estack);";
return res;
//Method stack
private String createToMStack(int i) {
- return "mjvm_mstack := <" + i + " > ++ mjvm_mstack;";
+ return createToMStack(i+"");
}
private String createToMStack(String i) {
- return "mjvm_mstack := <" + i + " > ++ mjvm_mstack;";
+ return createToStack("mjvm_mstack", i);
}
private String createFromMStack(String st) {
- return st + " := HEAD(mjvm_mstack); mjvm_mstack := TAIL(mjvm_mstack);";
+ return createFromStack("mjvm_mstack", st);
}
private String getRelationFor(int opcode) throws Exception {
prl("SKIP;\n ACTIONS a" + (14 + mainAdr) + " :");
int op = get();
while (op >= 0) {
+ prl(" a" + counter + " ==");
if (originalInComments)
prl(createComment(describeOpCode(op), C_OC));
- prl(" a" + counter + " == ");
if (genPrintForEachAddress) {
prl("PRINT(\"a" + counter + "\");");
if (genPauseAfterEachAddress)
case load_1:
case load_2:
case load_3: {
- prl(createToEStack(createLocal(op - load_0)));
+ prl(createStartVar("tempa"));
+ prl("tempa :="+createLocal(op - load_0)+";");
+ prl(createToEStack("tempa"));
+ prl(createEndVar());
break;
}
case store: {
case store_1:
case store_2:
case store_3: {
- prl(createFromEStack(createLocal(op - store_0)));
+ prl(createStartVar("tempa"));
+ prl(createFromEStack("tempa"));
+ prl(createLocal(op - store_0)+" := tempa;");
+ prl(createEndVar());
break;
}
// the prints
case bprint: {
- // TODO need to make it a char on print
- messages.message("chars will be printed as number codes", TransMessages.M_WAR);
- prl(createComment("char will be printed as a number code",
- C_SPEC));
+ prl(createStartVar("tempa", "tempb"));
+ prl(createTopTwoEStack());
+ prl("Print_MJ_CHAR(tempb,tempa);");
+ prl(createEndVar());
+ break;
}
case print: {
// TODO printing numbers needs different lengths of spacing
prl("CALL a" + counter + "\n END");
}
prl("SKIP\n END\nENDACTIONS;\n");
- prl(createStandardEnd());
+ pr(createStandardEnd());
}
public void convertFile(File f) {
System.out.println();
printHelpOutput();
System.out.println();
+ printHelpDirectives();
+ System.out.println();
printHelpGenerating();
System.out.println();
printHelpHelp();
System.out.println(" --genAll short for applying all code generation");
}
+ public void printHelpDirectives(){
+ System.out.println("Alternatives for code generation:");
+ System.out.println(" --genPopPush generate POP/PUSH instead of TAIL/HEAD");
+ }
+
public void printHelpHelp() {
System.out.println("Help and info options");
System.out.println(" -h basic help");
genPrintEStackOnChange = true;
genPrintForEachAddress = true;
genPauseAfterEachAddress = true;
+ } else if (args[i].compareToIgnoreCase("--genPopPush") == 0) {
+ genPopPush = true;
}
i++;
}