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
trap = 57;
public String getStandardStart(){
+ return getStandardStart(10);
+ }
+
+ public String getStandardStart(int numWords){
StringBuilder ret = new StringBuilder(
"C:\" This file automatically converted from microjava bytecode\";\n"
+"C:\" with mjc2wsl v "+versionN+"\";\n");
ret.append("VAR < tempa := 0, tempb := 0, tempres :=0,\n\t");
- for (int i = 0; i <= 3; i++)
- ret.append(loc(i) + " := 0, ");
+ ret.append("mjvm_locals := ARRAY(1,0), ");
+ ret.append("\n\tmjvm_statics := ARRAY("+numWords+",0), ");
ret.append("\n mjvm_estack := < >, mjvm_mstack := < >, ");
ret.append("\n mjvm_fp := 0, mjvm_sp := 0,");
ret.append("\n t_e_m_p := 0 > :");
}
private String loc(int i){
- return "mjvm_loc" + i;
+ //arrays start at 1 in WSL, so we need an offset
+ return "mjvm_locals[" + (i+1)+"]";
+ }
+
+ private String genStatic(int i){
+ return "mjvm_statics[" + (i+1)+"]";
}
/**
return res;
}
+ private String cmdPopEStack() {
+ String res = "mjvm_estack := TAIL(mjvm_estack);";
+ if (genPrintEStackOnChange) res +="PRINT(\"eStack\",mjvm_estack);";
+ return res;
+ }
+
+
private String getTopTwo(){
return cmdFromEStack("tempa") + "\n" + cmdFromEStack("tempb");
}
int numberOfWords = get4();
int mainAdr = get4();
- prl(getStandardStart());
+ prl(getStandardStart(numberOfWords));
prl("SKIP;\n ACTIONS A_S_start:\n A_S_start == CALL a"+(14+mainAdr)+" END");
int op = get();
while (op >= 0) {
break;
}
- //TODO getstatic, putstatic
+ case getstatic:{
+ prl(cmdToEStack(genStatic(get2())));
+ break;
+ }
+ case putstatic: {
+ prl(cmdFromEStack(genStatic(get2())));
+ break;
+ }
//TODO getfield, putfield
+ case getfield:
+ case putfield:{
+ prl(createComment("fields are not processed properly", C_ERR));
+ message("fields are not processed properly", M_ERR);
+ get2();
+ break;
+ }
case const_: {
prl(cmdToEStack(get4()));
break;
}
- //TODO neg, shl, shr, inc
+ case neg :{
+ prl(getTop());
+ prl(cmdToEStack("-tempa"));
+ break;
+ }
+ //TODO shl, shr
+
+ case inc : {
+ int b1 = get(), b2 = get();
+ prl(loc(b1)+" := " +loc(b1)+" + "+b2);
+ break;
+ }
//TODO new_ newarray
+ case new_ :
+ get();//needs a short, but a byte will be taken bellow as well
+ case newarray :{
+ prl(createComment("memory allocation not processed properly", C_ERR));
+ message("memory allocation not processed properly", M_ERR);
+ get();
+ break;
+ }
//TODO aload, asstore, baload, bastore
//TODO arraylength
- //TODO pop, dup, dup2
+ //TODO dup, dup2
+
+ case pop : {
+ prl(cmdPopEStack());
+ break;
+ }
case jmp: {
prl("CALL a" + (counter + get2()) + ";");
}
case call: {
- prl(cmdToMStack(counter+2));
prl("CALL a" + (counter + get2()) + ";");
break;
}
case return_: {
- prl("IF EMPTY?(mjvm_mstack) THEN CALL Z ELSE");
+ prl("IF EMPTY?(mjvm_mstack) THEN CALL Z FI");
//else we let things return
- prl(cmdFromMStack("tempa"));
- prl("SKIP FI");
prl("END b"+counter+" ==");
break;
}
case enter: {
- prl(createComment("enter not fully procesed yet"));
- message("enter not fully procesed yet", M_WAR);
int parameters = get();
- get();
+ int locals = get();
+ prl(cmdToMStack("mjvm_locals"));
+ prl("mjvm_locals := ARRAY("+locals+",0);");
for (int i = parameters-1; i >= 0; i--)
prl(cmdFromEStack(loc(i)));
break;
}
case exit: {
- prl(createComment("exit not fully procesed yet"));
- message("exit not fully procesed yet", M_WAR);
+ prl(cmdFromMStack("mjvm_locals"));
break;
}
- //TODO read, print
+ // read, print
+ case bread:{
+ //TODO make it a char for read
+ message("char is read like a number", M_WAR);
+ prl(createComment("char is read like a number",C_SPEC));
+ }
case read: {
prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));");
prl(cmdToEStack("tempa"));
}
// the prints
- case bprint: {
- prl(getTopTwo());
- prl("PRINT(tempb);");
- break;
+ case bprint:{
+ // TODO need to make it a char on print
+ message("chars will be printed as number codes", M_WAR);
+ prl(createComment("char will be printed as a number code",C_SPEC));
}
case print: {
- // TODO need to make it a char
+ // TODO printing numbers needs different lengths of spacing
prl(getTopTwo());
- prl("PRINT(tempb);");
+ pr(createComment("print spacing",C_SPEC));
+ prl("IF tempa>1 THEN FOR i:=2 TO tempa STEP 1 DO PRINFLUSH(\" \") OD FI;");
+ prl("PRINFLUSH(tempb);");
break;
}
public void printHelp() {
System.out.println("MicroJava bytecode to WSL converter. v " + versionN
+ ", by Doni Pracner");
- System.out.println("usage:\n\t {options} mjc2wsl filename [outfile]");
+ System.out.println("usage:\n\t mjc2wsl {options} filename [outfile]");
System.out.println("options:\n\t--screen print output to screen");
System.out.println("\t-o --oc[+-] include original code in comments");
System.out.println("\t-v verbose, print warning messages");