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
ret.append("VAR < tempa := 0, tempb := 0, tempres :=0,\n\t");
ret.append("mjvm_locals := ARRAY(1,0), ");
ret.append("\n\tmjvm_statics := ARRAY("+numWords+",0), ");
ret.append("VAR < tempa := 0, tempb := 0, tempres :=0,\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 := < >, ");
ret.append("\n mjvm_fp := 0, mjvm_sp := 0,");
ret.append("\n t_e_m_p := 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 > :");
return "mjvm_statics[" + (i+1)+"]";
}
return "mjvm_statics[" + (i+1)+"]";
}
+ private String genArray(int i){
+ return "mjvm_arrays["+ i +"]";
+ }
+
+ private String genArray(String i){
+ return "mjvm_arrays["+ i+"]";
+ }
+
+ private String genObject(String i){
+ return "mjvm_objects["+ i+"]";
+ }
+
/**
* Creates a WSL comment with care to quote chars.
*/
/**
* Creates a WSL comment with care to quote chars.
*/
prl(cmdFromEStack(genStatic(get2())));
break;
}
prl(cmdFromEStack(genStatic(get2())));
break;
}
- //TODO getfield, putfield
- case getfield:
+
+ case getfield:{
+ int f = get2();
+ prl(getTop());
+ prl(cmdToEStack(genObject("tempa")+"["+(f+1)+"]"));
+ break;
+ }
case putfield:{
case putfield:{
- prl(createComment("fields are not processed properly", C_ERR));
- message("fields are not processed properly", M_ERR);
- get2();
+ 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(getTopTwo());
+ prl("VAR < tempArray := "+genObject("tempb")+" > :");
+ prl("tempArray["+(f+1)+"]:=tempa ENDVAR;");
break;
}
break;
}
prl(cmdToEStack("-tempa"));
break;
}
prl(cmdToEStack("-tempa"));
break;
}
- //TODO shl, shr
-
+
+ case shl : {
+ prl(getTopTwo());
+ prl("VAR <tempres :=tempb, i:=1 >:");
+ prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres * 2 OD;");
+ prl(cmdToEStack("tempres"));
+ prl("ENDVAR;");
+ break;
+ }
+ case shr : {
+ prl(getTopTwo());
+ prl("VAR <tempres :=tempb, i:=1 >:");
+ prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres DIV 2 OD;");
+ prl(cmdToEStack("tempres"));
+ prl("ENDVAR;");
+ break;
+ }
+
case inc : {
int b1 = get(), b2 = get();
case inc : {
int b1 = get(), b2 = get();
- prl(loc(b1)+" := " +loc(b1)+" + "+b2);
+ prl(loc(b1)+" := " +loc(b1)+" + "+b2+";");
break;
}
break;
}
- //TODO new_ newarray
- case new_ :
- get();//needs a short, but a byte will be taken bellow as well
+
+ case new_ :{
+ int size = get2();
+ //TODO maybe objects and arrays should be in the same list?
+ prl("mjvm_objects := mjvm_objects ++ < ARRAY("+size+",0) >;");
+ prl(cmdToEStack("LENGTH(mjvm_objects)"));
+ break;
+ }
case newarray :{
case newarray :{
- prl(createComment("memory allocation not processed properly", C_ERR));
- message("memory allocation not processed properly", M_ERR);
- get();
+ get();// 0 - bytes, 1 - words; ignore for now
+ //TODO take into consideration 0/1
+ prl(getTop());
+ prl("mjvm_arrays := mjvm_arrays ++ < ARRAY(tempa,0) >;");
+ prl(cmdToEStack("LENGTH(mjvm_arrays)"));
break;
}
break;
}
- //TODO aload, asstore, baload, bastore
- //TODO arraylength
- //TODO dup, dup2
+
+ case aload:
+ case baload:{
+ prl(getTopTwo());
+ prl(cmdToEStack(genArray("tempb")+"[tempa+1]"));
+ break;
+ }
+ case astore:
+ case bastore:{
+ prl(cmdFromEStack("tempres"));
+ prl(getTopTwo());
+ //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 := "+genArray("tempb")+" > :");
+ prl("tempArray[tempa+1]:=tempres ENDVAR;");
+ break;
+ }
+ case arraylength :{
+ prl(getTop());
+ //TODO make an array length function of some sort!
+ prl(createComment("array length not known - LENGTH not aplicable to arrays",C_ERR));
+ message("array length not known - LENGTH not aplicable to arrays",M_ERR);
+ prl(createComment("put 1 on the stack for consistency",C_SPEC));
+ prl(cmdToEStack(1));
+ break;
+ }
+
+ case dup : {
+ prl(getTop());
+ prl(cmdToEStack("tempa"));
+ prl(cmdToEStack("tempa"));
+ break;
+ }
+ case dup2 : {
+ prl(getTopTwo());
+ prl(cmdToEStack("tempb"));
+ prl(cmdToEStack("tempa"));
+ prl(cmdToEStack("tempb"));
+ prl(cmdToEStack("tempa"));
+ break;
+ }
case pop : {
prl(cmdPopEStack());
case pop : {
prl(cmdPopEStack());
}
case return_: {
}
case return_: {
- prl("IF EMPTY?(mjvm_mstack) THEN CALL Z FI");
- //else we let things return
- prl("END b"+counter+" ==");
+ //we let the actions return
+ // there is nothing to clean up
+ prl("SKIP END b"+counter+" ==");
break;
}
case enter: {
break;
}
case enter: {