From 944dee8c2c74926e41479d3335bb003bdb60099b Mon Sep 17 00:00:00 2001 From: Doni Pracner Date: Sun, 19 Jan 2014 22:16:15 +0100 Subject: [PATCH 01/16] new sample for ArrayTesting --- samples/ArrayTest.mj | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 samples/ArrayTest.mj diff --git a/samples/ArrayTest.mj b/samples/ArrayTest.mj new file mode 100644 index 0000000..a098183 --- /dev/null +++ b/samples/ArrayTest.mj @@ -0,0 +1,20 @@ +program ArrayTest + int[] arr; + int i; + int max; +{ + void main(){ + max = 10; + arr = new int[max]; + i = 0; + while (i Date: Sun, 19 Jan 2014 22:22:25 +0100 Subject: [PATCH 02/16] mjc2wsl - array support - newarray, aload, baload, astore, bastore --- src/mjc2wsl.java | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index 10e9c2c..3a97270 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -120,6 +120,7 @@ public class mjc2wsl{ 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 mjvm_estack := < >, mjvm_mstack := < >, "); ret.append("\n mjvm_fp := 0, mjvm_sp := 0,"); ret.append("\n t_e_m_p := 0 > :"); @@ -215,6 +216,14 @@ public class mjc2wsl{ return "mjvm_statics[" + (i+1)+"]"; } + private String genArray(int i){ + return "mjvm_arrays["+ i +"]"; + } + + private String genArray(String i){ + return "mjvm_arrays["+ i+"]"; + } + /** * Creates a WSL comment with care to quote chars. */ @@ -423,15 +432,37 @@ public class mjc2wsl{ break; } //TODO new_ newarray - case new_ : - get();//needs a short, but a byte will be taken bellow as well - case newarray :{ + case new_ :{ prl(createComment("memory allocation not processed properly", C_ERR)); message("memory allocation not processed properly", M_ERR); - get(); + get2(); + break; + } + case newarray :{ + 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; } - //TODO aload, asstore, baload, bastore + + 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; + } //TODO arraylength //TODO dup, dup2 -- 2.17.1 From 353908644ff9b8a5620304b351384327a98d3c81 Mon Sep 17 00:00:00 2001 From: Doni Pracner Date: Sun, 19 Jan 2014 22:37:12 +0100 Subject: [PATCH 03/16] new sample for ArraysTesting - multiple in recursion --- samples/ArraysTest.mj | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 samples/ArraysTest.mj diff --git a/samples/ArraysTest.mj b/samples/ArraysTest.mj new file mode 100644 index 0000000..e9ae981 --- /dev/null +++ b/samples/ArraysTest.mj @@ -0,0 +1,29 @@ +program ArraysTest +{ + void rek_arr(int i) + int[] a; int loc, loc2; { + if (i>1){ + a = new int[i]; + loc = 0; + loc2 = 1; + while (loc Date: Mon, 20 Jan 2014 01:26:25 +0100 Subject: [PATCH 04/16] mjc2wsl - return does not need a condition. This makes the action system more likely to be recursive (not a hybrid) --- src/mjc2wsl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index 3a97270..82ae9cc 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -496,9 +496,9 @@ public class mjc2wsl{ } 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: { -- 2.17.1 From febf6617024a975bf47d970941371a87ac6f59ad Mon Sep 17 00:00:00 2001 From: Doni Pracner Date: Mon, 20 Jan 2014 18:05:40 +0100 Subject: [PATCH 05/16] mjc2wsl - array length added, but only formally, there are problems with this --- src/mjc2wsl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index 82ae9cc..6f7efe1 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -463,7 +463,16 @@ public class mjc2wsl{ prl("tempArray[tempa+1]:=tempres ENDVAR;"); break; } - //TODO arraylength + 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; + } + //TODO dup, dup2 case pop : { -- 2.17.1 From a2bd7f29ece868c30e34f85e4e474ad947794642 Mon Sep 17 00:00:00 2001 From: Doni Pracner Date: Mon, 20 Jan 2014 18:06:20 +0100 Subject: [PATCH 06/16] mjc2wsl - dup, dup2 commands --- src/mjc2wsl.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index 6f7efe1..4b231aa 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -473,7 +473,20 @@ public class mjc2wsl{ break; } - //TODO dup, dup2 + 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()); -- 2.17.1 From 9ed768a76bf830a6db379cdc7b91afd73a924361 Mon Sep 17 00:00:00 2001 From: Doni Pracner Date: Mon, 20 Jan 2014 20:39:17 +0100 Subject: [PATCH 07/16] mjc2wsl - object support - new, get/put field --- src/mjc2wsl.java | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index 4b231aa..274bb7e 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -121,6 +121,7 @@ public class mjc2wsl{ 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 > :"); @@ -224,6 +225,10 @@ public class mjc2wsl{ return "mjvm_arrays["+ i+"]"; } + private String genObject(String i){ + return "mjvm_objects["+ i+"]"; + } + /** * Creates a WSL comment with care to quote chars. */ @@ -362,12 +367,20 @@ public class mjc2wsl{ 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:{ - 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; } @@ -431,11 +444,12 @@ public class mjc2wsl{ prl(loc(b1)+" := " +loc(b1)+" + "+b2+";"); break; } - //TODO new_ newarray + case new_ :{ - prl(createComment("memory allocation not processed properly", C_ERR)); - message("memory allocation not processed properly", M_ERR); - get2(); + 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 :{ -- 2.17.1 From ff725c41ec41c38d0ff51c1f315dc472ac9747d1 Mon Sep 17 00:00:00 2001 From: Doni Pracner Date: Mon, 20 Jan 2014 22:54:05 +0100 Subject: [PATCH 08/16] mjc2wsl - shr and shl added --- src/mjc2wsl.java | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index 274bb7e..1682978 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -437,8 +437,24 @@ public class mjc2wsl{ prl(cmdToEStack("-tempa")); break; } - //TODO shl, shr - + + case shl : { + prl(getTopTwo()); + prl("VAR :"); + 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 :"); + 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(); prl(loc(b1)+" := " +loc(b1)+" + "+b2+";"); -- 2.17.1 From 2f7415a1b72f06124c38c71019b8117a7cbada10 Mon Sep 17 00:00:00 2001 From: Doni Pracner Date: Tue, 21 Jan 2014 17:11:09 +0100 Subject: [PATCH 09/16] minor - mjc2wsl - formatting, align indention etc --- src/mjc2wsl.java | 318 ++++++++++++++++++++++++----------------------- 1 file changed, 163 insertions(+), 155 deletions(-) diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index 1682978..0030818 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -139,32 +139,32 @@ public class mjc2wsl{ private String opCodeFile = "mj-bytecodes.properties"; - private HashMap getOpMap() { - if (opMap==null) { - opMap = new HashMap (60, 0.98f); - try{ - BufferedReader in = new BufferedReader( - new InputStreamReader(getClass().getResourceAsStream(opCodeFile))); - String str = in.readLine(); - while (str != null) { - String[] ss = str.split("="); - opMap.put(Integer.parseInt(ss[0]),ss[1]); - str = in.readLine(); - } - in.close(); - }catch (Exception ex) { - ex.printStackTrace(); - } - } - return opMap; + private HashMap getOpMap() { + if (opMap == null) { + opMap = new HashMap(60, 0.98f); + try { + BufferedReader in = new BufferedReader(new InputStreamReader( + getClass().getResourceAsStream(opCodeFile))); + String str = in.readLine(); + while (str != null) { + String[] ss = str.split("="); + opMap.put(Integer.parseInt(ss[0]), ss[1]); + str = in.readLine(); + } + in.close(); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + return opMap; } public String getOpString(int op) { - return getOpMap().get(op); + return getOpMap().get(op); } - + public String describeOpCode(int op) { - return op + " (" + getOpString(op) + ")"; + return op + " (" + getOpString(op) + ")"; } private InputStream mainIn; @@ -208,25 +208,25 @@ public class mjc2wsl{ return (get2() << 16) + (get2() << 16 >>> 16); } - private String loc(int i){ - //arrays start at 1 in WSL, so we need an offset - return "mjvm_locals[" + (i+1)+"]"; + private String loc(int 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)+"]"; + + private String genStatic(int i) { + return "mjvm_statics[" + (i + 1) + "]"; } - - private String genArray(int i){ - return "mjvm_arrays["+ i +"]"; + + private String genArray(int i) { + return "mjvm_arrays[" + i + "]"; } - - private String genArray(String i){ - return "mjvm_arrays["+ i+"]"; + + private String genArray(String i) { + return "mjvm_arrays[" + i + "]"; } - - private String genObject(String i){ - return "mjvm_objects["+ i+"]"; + + private String genObject(String i) { + return "mjvm_objects[" + i + "]"; } /** @@ -251,30 +251,34 @@ public class mjc2wsl{ private String cmdToEStack(int i) { String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;"; - if (genPrintEStackOnChange) res +="PRINT(\"eStack\",mjvm_estack);"; + if (genPrintEStackOnChange) + res += "PRINT(\"eStack\",mjvm_estack);"; return res; } private String cmdToEStack(String i) { String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;"; - if (genPrintEStackOnChange) res +="PRINT(\"eStack\",mjvm_estack);"; + if (genPrintEStackOnChange) + res += "PRINT(\"eStack\",mjvm_estack);"; return res; } private String cmdFromEStack(String st) { - String res = st + " := HEAD(mjvm_estack); mjvm_estack := TAIL(mjvm_estack);"; - if (genPrintEStackOnChange) res +="PRINT(\"eStack\",mjvm_estack);"; + String res = st + + " := HEAD(mjvm_estack); mjvm_estack := TAIL(mjvm_estack);"; + if (genPrintEStackOnChange) + res += "PRINT(\"eStack\",mjvm_estack);"; return res; } - + private String cmdPopEStack() { String res = "mjvm_estack := TAIL(mjvm_estack);"; - if (genPrintEStackOnChange) res +="PRINT(\"eStack\",mjvm_estack);"; + if (genPrintEStackOnChange) + res += "PRINT(\"eStack\",mjvm_estack);"; return res; } - - - private String getTopTwo(){ + + private String getTopTwo() { return cmdFromEStack("tempa") + "\n" + cmdFromEStack("tempb"); } @@ -283,7 +287,7 @@ public class mjc2wsl{ } //Method stack - + private String cmdToMStack(int i) { return "mjvm_mstack := <" + i + " > ++ mjvm_mstack;"; } @@ -295,21 +299,21 @@ public class mjc2wsl{ private String cmdFromMStack(String st) { return st + " := HEAD(mjvm_mstack); mjvm_mstack := TAIL(mjvm_mstack);"; } - + private String getRelationFor(int opcode) throws Exception { - switch (opcode) { - case jeq: return "="; - case jne: return "<>"; - case jlt: return "<"; - case jle: return "<="; - case jgt: return ">"; - case jge: return ">="; - } - throw new Exception("Wrong opcode for a relation"); + switch (opcode) { + case jeq: return "="; + case jne: return "<>"; + case jlt: return "<"; + case jle: return "<="; + case jgt: return ">"; + case jge: return ">="; + } + throw new Exception("Wrong opcode for a relation"); } - + private boolean isJumpCode(int opcode) { - return (opcode>=jmp) && (opcode<=jge); + return (opcode >= jmp) && (opcode <= jge); } public void convertStream(InputStream ins) throws Exception{ @@ -324,16 +328,17 @@ public class mjc2wsl{ int mainAdr = get4(); prl(getStandardStart(numberOfWords)); - prl("SKIP;\n ACTIONS A_S_start:\n A_S_start == CALL a"+(14+mainAdr)+" END"); + prl("SKIP;\n ACTIONS A_S_start:\n A_S_start == CALL a" + (14 + mainAdr) + + " END"); int op = get(); while (op >= 0) { if (originalInComments) prl(createComment(describeOpCode(op), C_OC)); prl("a" + counter + " == "); if (genPrintForEachAddress) { - prl("PRINT(\"a"+counter+"\");"); - if (genPauseAfterEachAddress) - prl("debug_disposable_string := @Read_Line(Standard_Input_Port);"); + prl("PRINT(\"a" + counter + "\");"); + if (genPauseAfterEachAddress) + prl("debug_disposable_string := @Read_Line(Standard_Input_Port);"); } switch (op) { case load: { @@ -358,32 +363,32 @@ public class mjc2wsl{ prl(cmdFromEStack(loc(op - store_0))); break; } - - case getstatic:{ + + case getstatic: { prl(cmdToEStack(genStatic(get2()))); break; - } + } case putstatic: { prl(cmdFromEStack(genStatic(get2()))); break; } - case getfield:{ - int f = get2(); - prl(getTop()); - prl(cmdToEStack(genObject("tempa")+"["+(f+1)+"]")); - break; + case getfield: { + int f = get2(); + prl(getTop()); + prl(cmdToEStack(genObject("tempa") + "[" + (f + 1) + "]")); + 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(getTopTwo()); - prl("VAR < tempArray := "+genObject("tempb")+" > :"); - prl("tempArray["+(f+1)+"]:=tempa ENDVAR;"); - 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(getTopTwo()); + prl("VAR < tempArray := " + genObject("tempb") + " > :"); + prl("tempArray[" + (f + 1) + "]:=tempa ENDVAR;"); + break; } - + case const_: { prl(cmdToEStack(get4())); break; @@ -432,13 +437,13 @@ public class mjc2wsl{ break; } - case neg :{ + case neg: { prl(getTop()); prl(cmdToEStack("-tempa")); break; - } + } - case shl : { + case shl: { prl(getTopTwo()); prl("VAR :"); prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres * 2 OD;"); @@ -446,7 +451,7 @@ public class mjc2wsl{ prl("ENDVAR;"); break; } - case shr : { + case shr: { prl(getTopTwo()); prl("VAR :"); prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres DIV 2 OD;"); @@ -455,74 +460,78 @@ public class mjc2wsl{ break; } - case inc : { + case inc: { int b1 = get(), b2 = get(); - prl(loc(b1)+" := " +loc(b1)+" + "+b2+";"); + prl(loc(b1) + " := " + loc(b1) + " + " + b2 + ";"); break; } - 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 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 :{ - 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; + case newarray: { + 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; } - + case aload: - case baload:{ + case baload: { prl(getTopTwo()); - prl(cmdToEStack(genArray("tempb")+"[tempa+1]")); + prl(cmdToEStack(genArray("tempb") + "[tempa+1]")); break; } case astore: - case bastore:{ + 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")+" > :"); + // 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 :{ + 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)); + // 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 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 dup2: { + prl(getTopTwo()); + prl(cmdToEStack("tempb")); + prl(cmdToEStack("tempa")); + prl(cmdToEStack("tempb")); + prl(cmdToEStack("tempa")); + break; } - - case pop : { - prl(cmdPopEStack()); - break; + + case pop: { + prl(cmdPopEStack()); + break; } - + case jmp: { prl("CALL a" + (counter + get2()) + ";"); break; @@ -535,9 +544,8 @@ public class mjc2wsl{ case jgt: case jge: { prl(getTopTwo()); - prl("IF tempb "+ getRelationFor(op) - +" tempa THEN CALL a" + (counter + get2()) - +" ELSE CALL a" + (counter+1) + prl("IF tempb " + getRelationFor(op) + " tempa THEN CALL a" + + (counter + get2()) + " ELSE CALL a" + (counter + 1) + " FI;"); break; } @@ -548,19 +556,19 @@ public class mjc2wsl{ } case return_: { - //we let the actions return + // we let the actions return // there is nothing to clean up - prl("SKIP END b"+counter+" =="); + prl("SKIP END b" + counter + " =="); break; } case enter: { int parameters = 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))); + prl("mjvm_locals := ARRAY(" + locals + ",0);"); + for (int i = parameters - 1; i >= 0; i--) + prl(cmdFromEStack(loc(i))); break; } case exit: { @@ -569,10 +577,10 @@ public class mjc2wsl{ } // read, print - case bread:{ - //TODO make it a char for read + 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)); + prl(createComment("char is read like a number", C_SPEC)); } case read: { prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));"); @@ -581,29 +589,29 @@ public class mjc2wsl{ } // the prints - case bprint:{ + 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)); + prl(createComment("char will be printed as a number code", + C_SPEC)); } case print: { // TODO printing numbers needs different lengths of spacing prl(getTopTwo()); - pr(createComment("print spacing",C_SPEC)); + 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; } case trap: { - prl("ERROR(\"Runtime error: trap("+get()+")\");"); + prl("ERROR(\"Runtime error: trap(" + get() + ")\");"); break; } - - + default: prl(createComment("unknown op error: " + op, C_ERR)); - message("unknown op error: "+ op, M_ERR); + message("unknown op error: " + op, M_ERR); break; } @@ -611,15 +619,14 @@ public class mjc2wsl{ op = get(); if (op >= 0) if (wasJump) - prl("SKIP END"); + prl("SKIP END"); else - prl("CALL a" + counter + " END"); + prl("CALL a" + counter + " END"); } prl("CALL Z;\nSKIP END\nENDACTIONS;\n"); prl(getStandardEnd()); - } - + public void convertFile(File f) { try { convertStream(new FileInputStream(f)); @@ -666,11 +673,11 @@ public class mjc2wsl{ } else if (args[i].compareTo("--screen") == 0) { out = new PrintWriter(System.out); } else if (args[i].compareTo("-d") == 0) { - printLevel = M_DEB;//print debug info + printLevel = M_DEB;// print debug info } else if (args[i].compareTo("-v") == 0) { - printLevel = M_WAR;//print warnings + printLevel = M_WAR;// print warnings } else if (args[i].compareTo("-q") == 0) { - printLevel = M_ERR+1;//no printing + printLevel = M_ERR + 1;// no printing } else if (args[i].compareToIgnoreCase("--genEStackPrint") == 0) { genPrintEStackOnChange = true; } else if (args[i].compareToIgnoreCase("--genAddrPause") == 0) { @@ -684,7 +691,8 @@ public class mjc2wsl{ genPrintEStackOnChange = true; genPrintForEachAddress = true; genPauseAfterEachAddress = true; - }i++; + } + i++; } if (i >= args.length) { -- 2.17.1 From 2bb2844b53ef2fdee27da8e235f070c5b741f28c Mon Sep 17 00:00:00 2001 From: Doni Pracner Date: Tue, 21 Jan 2014 17:25:27 +0100 Subject: [PATCH 10/16] mjc2wsl - refactoring, renamed all the methods that generate pieces of WSL to start with 'create'. --- src/mjc2wsl.java | 152 +++++++++++++++++++++++------------------------ 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index 0030818..dafe6e4 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -108,11 +108,11 @@ public class mjc2wsl{ bprint = 56, trap = 57; - public String getStandardStart(){ - return getStandardStart(10); + public String createStandardStart(){ + return createStandardStart(10); } - public String getStandardStart(int numWords){ + public String createStandardStart(int numWords){ StringBuilder ret = new StringBuilder( "C:\" This file automatically converted from microjava bytecode\";\n" +"C:\" with mjc2wsl v "+versionN+"\";\n"); @@ -129,7 +129,7 @@ public class mjc2wsl{ return ret.toString(); } - public String getStandardEnd(){ + public String createStandardEnd(){ return "SKIP\nENDVAR"; } @@ -208,24 +208,24 @@ public class mjc2wsl{ return (get2() << 16) + (get2() << 16 >>> 16); } - private String loc(int i) { + private String createLocal(int i) { // arrays start at 1 in WSL, so we need an offset return "mjvm_locals[" + (i + 1) + "]"; } - private String genStatic(int i) { + private String createStatic(int i) { return "mjvm_statics[" + (i + 1) + "]"; } - private String genArray(int i) { + private String createArray(int i) { return "mjvm_arrays[" + i + "]"; } - private String genArray(String i) { + private String createArray(String i) { return "mjvm_arrays[" + i + "]"; } - private String genObject(String i) { + private String createObject(String i) { return "mjvm_objects[" + i + "]"; } @@ -249,21 +249,21 @@ public class mjc2wsl{ //Expression stack - private String cmdToEStack(int i) { + private String createToEStack(int i) { String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;"; if (genPrintEStackOnChange) res += "PRINT(\"eStack\",mjvm_estack);"; return res; } - private String cmdToEStack(String i) { + private String createToEStack(String i) { String res = "mjvm_estack := <" + i + " > ++ mjvm_estack;"; if (genPrintEStackOnChange) res += "PRINT(\"eStack\",mjvm_estack);"; return res; } - private String cmdFromEStack(String st) { + private String createFromEStack(String st) { String res = st + " := HEAD(mjvm_estack); mjvm_estack := TAIL(mjvm_estack);"; if (genPrintEStackOnChange) @@ -271,32 +271,32 @@ public class mjc2wsl{ return res; } - private String cmdPopEStack() { + private String createPopEStack() { 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"); + private String createTopTwoEStack() { + return createFromEStack("tempa") + "\n" + createFromEStack("tempb"); } - private String getTop() { - return cmdFromEStack("tempa"); + private String createTopEStack() { + return createFromEStack("tempa"); } //Method stack - private String cmdToMStack(int i) { + private String createToMStack(int i) { return "mjvm_mstack := <" + i + " > ++ mjvm_mstack;"; } - private String cmdToMStack(String i) { + private String createToMStack(String i) { return "mjvm_mstack := <" + i + " > ++ mjvm_mstack;"; } - private String cmdFromMStack(String st) { + private String createFromMStack(String st) { return st + " := HEAD(mjvm_mstack); mjvm_mstack := TAIL(mjvm_mstack);"; } @@ -327,7 +327,7 @@ public class mjc2wsl{ int numberOfWords = get4(); int mainAdr = get4(); - prl(getStandardStart(numberOfWords)); + prl(createStandardStart(numberOfWords)); prl("SKIP;\n ACTIONS A_S_start:\n A_S_start == CALL a" + (14 + mainAdr) + " END"); int op = get(); @@ -342,55 +342,55 @@ public class mjc2wsl{ } switch (op) { case load: { - prl(cmdToEStack(loc(get()))); + prl(createToEStack(createLocal(get()))); break; } case load_0: case load_1: case load_2: case load_3: { - prl(cmdToEStack(loc(op - load_0))); + prl(createToEStack(createLocal(op - load_0))); break; } case store: { - prl(cmdFromEStack(loc(get()))); + prl(createFromEStack(createLocal(get()))); break; } case store_0: case store_1: case store_2: case store_3: { - prl(cmdFromEStack(loc(op - store_0))); + prl(createFromEStack(createLocal(op - store_0))); break; } case getstatic: { - prl(cmdToEStack(genStatic(get2()))); + prl(createToEStack(createStatic(get2()))); break; } case putstatic: { - prl(cmdFromEStack(genStatic(get2()))); + prl(createFromEStack(createStatic(get2()))); break; } case getfield: { int f = get2(); - prl(getTop()); - prl(cmdToEStack(genObject("tempa") + "[" + (f + 1) + "]")); + prl(createTopEStack()); + prl(createToEStack(createObject("tempa") + "[" + (f + 1) + "]")); 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(getTopTwo()); - prl("VAR < tempArray := " + genObject("tempb") + " > :"); + prl(createTopTwoEStack()); + prl("VAR < tempArray := " + createObject("tempb") + " > :"); prl("tempArray[" + (f + 1) + "]:=tempa ENDVAR;"); break; } case const_: { - prl(cmdToEStack(get4())); + prl(createToEStack(get4())); break; } @@ -400,69 +400,69 @@ public class mjc2wsl{ case const_3: case const_4: case const_5: { - prl(cmdToEStack(op - const_0)); + prl(createToEStack(op - const_0)); break; } case add: { - prl(getTopTwo()); + prl(createTopTwoEStack()); prl("tempres := tempb + tempa;"); - prl(cmdToEStack("tempres")); + prl(createToEStack("tempres")); break; } case sub: { - prl(getTopTwo()); + prl(createTopTwoEStack()); prl("tempres := tempb - tempa;"); - prl(cmdToEStack("tempres")); + prl(createToEStack("tempres")); break; } case mul: { - prl(getTopTwo()); + prl(createTopTwoEStack()); prl("tempres := tempb * tempa;"); - prl(cmdToEStack("tempres")); + prl(createToEStack("tempres")); break; } case div: { - prl(getTopTwo()); + prl(createTopTwoEStack()); prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;"); prl("tempres := tempb DIV tempa;"); - prl(cmdToEStack("tempres")); + prl(createToEStack("tempres")); break; } case rem: { - prl(getTopTwo()); + prl(createTopTwoEStack()); prl("IF tempa = 0 THEN ERROR(\"division by zero\") FI;"); prl("tempres := tempb MOD tempa;"); - prl(cmdToEStack("tempres")); + prl(createToEStack("tempres")); break; } case neg: { - prl(getTop()); - prl(cmdToEStack("-tempa")); + prl(createTopEStack()); + prl(createToEStack("-tempa")); break; } case shl: { - prl(getTopTwo()); + prl(createTopTwoEStack()); prl("VAR :"); prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres * 2 OD;"); - prl(cmdToEStack("tempres")); + prl(createToEStack("tempres")); prl("ENDVAR;"); break; } case shr: { - prl(getTopTwo()); + prl(createTopTwoEStack()); prl("VAR :"); prl("\tFOR i:=1 TO tempa STEP 1 DO tempres := tempres DIV 2 OD;"); - prl(cmdToEStack("tempres")); + prl(createToEStack("tempres")); prl("ENDVAR;"); break; } case inc: { int b1 = get(), b2 = get(); - prl(loc(b1) + " := " + loc(b1) + " + " + b2 + ";"); + prl(createLocal(b1) + " := " + createLocal(b1) + " + " + b2 + ";"); break; } @@ -471,36 +471,36 @@ public class mjc2wsl{ // TODO maybe objects and arrays should be in the same list? prl("mjvm_objects := mjvm_objects ++ < ARRAY(" + size + ",0) >;"); - prl(cmdToEStack("LENGTH(mjvm_objects)")); + prl(createToEStack("LENGTH(mjvm_objects)")); break; } case newarray: { get();// 0 - bytes, 1 - words; ignore for now // TODO take into consideration 0/1 - prl(getTop()); + prl(createTopEStack()); prl("mjvm_arrays := mjvm_arrays ++ < ARRAY(tempa,0) >;"); - prl(cmdToEStack("LENGTH(mjvm_arrays)")); + prl(createToEStack("LENGTH(mjvm_arrays)")); break; } case aload: case baload: { - prl(getTopTwo()); - prl(cmdToEStack(genArray("tempb") + "[tempa+1]")); + prl(createTopTwoEStack()); + prl(createToEStack(createArray("tempb") + "[tempa+1]")); break; } case astore: case bastore: { - prl(cmdFromEStack("tempres")); - prl(getTopTwo()); + 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 := " + genArray("tempb") + " > :"); + prl("VAR < tempArray := " + createArray("tempb") + " > :"); prl("tempArray[tempa+1]:=tempres ENDVAR;"); break; } case arraylength: { - prl(getTop()); + prl(createTopEStack()); // TODO make an array length function of some sort! prl(createComment( "array length not known - LENGTH not aplicable to arrays", @@ -508,27 +508,27 @@ public class mjc2wsl{ 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)); + prl(createToEStack(1)); break; } case dup: { - prl(getTop()); - prl(cmdToEStack("tempa")); - prl(cmdToEStack("tempa")); + prl(createTopEStack()); + prl(createToEStack("tempa")); + prl(createToEStack("tempa")); break; } case dup2: { - prl(getTopTwo()); - prl(cmdToEStack("tempb")); - prl(cmdToEStack("tempa")); - prl(cmdToEStack("tempb")); - prl(cmdToEStack("tempa")); + prl(createTopTwoEStack()); + prl(createToEStack("tempb")); + prl(createToEStack("tempa")); + prl(createToEStack("tempb")); + prl(createToEStack("tempa")); break; } case pop: { - prl(cmdPopEStack()); + prl(createPopEStack()); break; } @@ -543,7 +543,7 @@ public class mjc2wsl{ case jle: case jgt: case jge: { - prl(getTopTwo()); + prl(createTopTwoEStack()); prl("IF tempb " + getRelationFor(op) + " tempa THEN CALL a" + (counter + get2()) + " ELSE CALL a" + (counter + 1) + " FI;"); @@ -565,14 +565,14 @@ public class mjc2wsl{ int parameters = get(); int locals = get(); - prl(cmdToMStack("mjvm_locals")); + prl(createToMStack("mjvm_locals")); prl("mjvm_locals := ARRAY(" + locals + ",0);"); for (int i = parameters - 1; i >= 0; i--) - prl(cmdFromEStack(loc(i))); + prl(createFromEStack(createLocal(i))); break; } case exit: { - prl(cmdFromMStack("mjvm_locals")); + prl(createFromMStack("mjvm_locals")); break; } @@ -584,7 +584,7 @@ public class mjc2wsl{ } case read: { prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));"); - prl(cmdToEStack("tempa")); + prl(createToEStack("tempa")); break; } @@ -597,7 +597,7 @@ public class mjc2wsl{ } case print: { // TODO printing numbers needs different lengths of spacing - prl(getTopTwo()); + prl(createTopTwoEStack()); 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);"); @@ -624,7 +624,7 @@ public class mjc2wsl{ prl("CALL a" + counter + " END"); } prl("CALL Z;\nSKIP END\nENDACTIONS;\n"); - prl(getStandardEnd()); + prl(createStandardEnd()); } public void convertFile(File f) { -- 2.17.1 From 3b31cbbe8fa685918d254c4106cfef524518367e Mon Sep 17 00:00:00 2001 From: Doni Pracner Date: Tue, 21 Jan 2014 18:03:47 +0100 Subject: [PATCH 11/16] refactor - extract the Messages system into a new class --- src/TransMessages.java | 46 ++++++++++++++++++++++ src/mjc2wsl.java | 89 +++++++++++++++++------------------------- 2 files changed, 81 insertions(+), 54 deletions(-) create mode 100644 src/TransMessages.java diff --git a/src/TransMessages.java b/src/TransMessages.java new file mode 100644 index 0000000..a544421 --- /dev/null +++ b/src/TransMessages.java @@ -0,0 +1,46 @@ +import java.io.PrintStream; + + +/** + * Handle the messages that the translator (or someone else) will + * give to this class depending on the print level. + * + */ +public class TransMessages { + private int printLevel; + public int[] messageCounters; + public static final int M_DEB = 0; + public static final int M_WAR = 1; + public static final int M_ERR = 2; + public static final int M_QUIET = 3; + private PrintStream outStream; + + public TransMessages() { + this.setPrintLevel(M_ERR); + this.messageCounters = new int[TransMessages.M_QUIET]; + } + + void message(String mes, int level){ + if (level>=getPrintLevel()) { + outStream = System.out; + outStream.println(mes); + } + messageCounters[level]++; + } + + void printMessageCounters(PrintStream out){ + out.println("total errors:"+messageCounters[TransMessages.M_ERR]+" warnings:"+messageCounters[TransMessages.M_WAR]); + } + + void printMessageCounters(){ + printMessageCounters(outStream); + } + + public int getPrintLevel() { + return printLevel; + } + + public void setPrintLevel(int printLevel) { + this.printLevel = printLevel; + } +} \ No newline at end of file diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index dafe6e4..e23b10e 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -12,26 +12,8 @@ import java.util.*; public class mjc2wsl{ public static String versionN = "0.1.4"; - public static final int M_ERR = 2, M_WAR = 1, M_DEB = 0; - - private int printLevel = M_ERR; - - private int[] messageCounters = new int[M_ERR+1]; - - private void message(String mes, int level){ - if (level>=printLevel) - System.out.println(mes); - messageCounters[level]++; - } - - private void printMessageCounters(){ - printMessageCounters(System.out); - } - - private void printMessageCounters(PrintStream out){ - out.println("total errors:"+messageCounters[M_ERR]+" warnings:"+messageCounters[M_WAR]); - } - + private TransMessages messages = new TransMessages(); + private boolean genPauseAfterEachAddress=false, genPrintForEachAddress = false, genPrintEStackOnChange = false; @@ -108,31 +90,6 @@ public class mjc2wsl{ bprint = 56, trap = 57; - public String createStandardStart(){ - return createStandardStart(10); - } - - 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("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 > :"); - - return ret.toString(); - } - - public String createStandardEnd(){ - return "SKIP\nENDVAR"; - } - private boolean originalInComments = false; private HashMap opMap = null; @@ -208,6 +165,31 @@ public class mjc2wsl{ return (get2() << 16) + (get2() << 16 >>> 16); } + public String createStandardStart(){ + return createStandardStart(10); + } + + 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("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 > :"); + + return ret.toString(); + } + + public String createStandardEnd(){ + return "SKIP\nENDVAR"; + } + private String createLocal(int i) { // arrays start at 1 in WSL, so we need an offset return "mjvm_locals[" + (i + 1) + "]"; @@ -505,8 +487,7 @@ public class mjc2wsl{ 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); + messages.message("array length not known - LENGTH not aplicable to arrays", TransMessages.M_ERR); prl(createComment("put 1 on the stack for consistency", C_SPEC)); prl(createToEStack(1)); break; @@ -579,7 +560,7 @@ public class mjc2wsl{ // read, print case bread: { // TODO make it a char for read - message("char is read like a number", M_WAR); + messages.message("char is read like a number", TransMessages.M_WAR); prl(createComment("char is read like a number", C_SPEC)); } case read: { @@ -591,7 +572,7 @@ public class mjc2wsl{ // the prints case bprint: { // TODO need to make it a char on print - message("chars will be printed as number codes", M_WAR); + messages.message("chars will be printed as number codes", TransMessages.M_WAR); prl(createComment("char will be printed as a number code", C_SPEC)); } @@ -611,7 +592,7 @@ public class mjc2wsl{ default: prl(createComment("unknown op error: " + op, C_ERR)); - message("unknown op error: " + op, M_ERR); + messages.message("unknown op error: " + op, TransMessages.M_ERR); break; } @@ -673,11 +654,11 @@ public class mjc2wsl{ } else if (args[i].compareTo("--screen") == 0) { out = new PrintWriter(System.out); } else if (args[i].compareTo("-d") == 0) { - printLevel = M_DEB;// print debug info + messages.setPrintLevel(TransMessages.M_DEB);// print debug info } else if (args[i].compareTo("-v") == 0) { - printLevel = M_WAR;// print warnings + messages.setPrintLevel(TransMessages.M_WAR);// print warnings } else if (args[i].compareTo("-q") == 0) { - printLevel = M_ERR + 1;// no printing + messages.setPrintLevel(TransMessages.M_QUIET);// no printing } else if (args[i].compareToIgnoreCase("--genEStackPrint") == 0) { genPrintEStackOnChange = true; } else if (args[i].compareToIgnoreCase("--genAddrPause") == 0) { @@ -724,7 +705,7 @@ public class mjc2wsl{ long mili = Calendar.getInstance().getTimeInMillis() - now.getTimeInMillis(); System.out.println("conversion time:" + mili + " ms"); - printMessageCounters(); + messages.printMessageCounters(); out.close(); } else System.out.println("file does not exist"); -- 2.17.1 From 189988664f52d80c68e06b4edfa667ebde59831f Mon Sep 17 00:00:00 2001 From: Doni Pracner Date: Tue, 21 Jan 2014 18:21:10 +0100 Subject: [PATCH 12/16] applied GPL to sources in src --- src/COPYING | 675 +++++++++++++++++++++++++++++++++++++++++ src/TransMessages.java | 19 +- src/mjc2wsl.java | 18 ++ 3 files changed, 711 insertions(+), 1 deletion(-) create mode 100644 src/COPYING diff --git a/src/COPYING b/src/COPYING new file mode 100644 index 0000000..359d931 --- /dev/null +++ b/src/COPYING @@ -0,0 +1,675 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show +w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file diff --git a/src/TransMessages.java b/src/TransMessages.java index a544421..f00c27a 100644 --- a/src/TransMessages.java +++ b/src/TransMessages.java @@ -1,6 +1,23 @@ +/* + Copyright (C) 2014 Doni Pracner + + This file is part of mjc2wsl. + + mjc2wsl is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mjc2wsl is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mjc2wsl. If not, see . +*/ import java.io.PrintStream; - /** * Handle the messages that the translator (or someone else) will * give to this class depending on the print level. diff --git a/src/mjc2wsl.java b/src/mjc2wsl.java index e23b10e..ab8899a 100644 --- a/src/mjc2wsl.java +++ b/src/mjc2wsl.java @@ -1,3 +1,21 @@ +/* + Copyright (C) 2014 Doni Pracner + + This file is part of mjc2wsl. + + mjc2wsl is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + mjc2wsl is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with mjc2wsl. If not, see . +*/ import java.io.*; import java.util.*; -- 2.17.1 From 21394a937d11949b9f37a5330f588dd337407439 Mon Sep 17 00:00:00 2001 From: Doni Pracner Date: Thu, 23 Jan 2014 22:47:38 +0100 Subject: [PATCH 13/16] minor mjc2wsl - outputstream initialisation for messages --- src/TransMessages.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/TransMessages.java b/src/TransMessages.java index f00c27a..5880c79 100644 --- a/src/TransMessages.java +++ b/src/TransMessages.java @@ -30,7 +30,7 @@ public class TransMessages { public static final int M_WAR = 1; public static final int M_ERR = 2; public static final int M_QUIET = 3; - private PrintStream outStream; + private PrintStream outStream = System.out; public TransMessages() { this.setPrintLevel(M_ERR); @@ -39,7 +39,6 @@ public class TransMessages { void message(String mes, int level){ if (level>=getPrintLevel()) { - outStream = System.out; outStream.println(mes); } messageCounters[level]++; -- 2.17.1 From bdbc7698321df4c4f7611202a8a07add543bfa1f Mon Sep 17 00:00:00 2001 From: Doni Pracner Date: Thu, 23 Jan 2014 23:02:08 +0100 Subject: [PATCH 14/16] ant - changed properties according to the change dir structure (lib) --- build.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.xml b/build.xml index e3617bf..d9c6d14 100644 --- a/build.xml +++ b/build.xml @@ -19,10 +19,10 @@ - - - - + + + + -- 2.17.1 From e59b5cca30d9da6f739b9e728d1ed269f897b47b Mon Sep 17 00:00:00 2001 From: Doni Pracner Date: Thu, 23 Jan 2014 23:25:57 +0100 Subject: [PATCH 15/16] txt about the compiler --- lib/compiler.txt | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 lib/compiler.txt diff --git a/lib/compiler.txt b/lib/compiler.txt new file mode 100644 index 0000000..7171aac --- /dev/null +++ b/lib/compiler.txt @@ -0,0 +1,49 @@ +MicroJava Compiler +================== + +About MicroJava +--------------- + +MicroJava is a simple language made by H. Mössenböck for a Compiler Construction +course. It is not the same as Java Micro Edition (JavaME) used on mobile +phones. + +More about the course, the language and its VM: +http://www.ssw.uni-linz.ac.at/Misc/CC/ + +The site for the Serbian version of the course: +http://perun.pmf.uns.ac.rs/kurbalija/Teaching/kk.htm + + +About the compiler and runner +----------------------------- + +The source files for a functional MJ compiler are given in the compiler-src +folder. These are heavily based on the source templates that are used in +the Compiler Construction classes and finished by students during the +course. + +The original source templates were written by Moessenboeck and are available +on the sites given above, though there are posible updates. The version +given has the compiler finished by a student, and a few additional changes +(such as the optional decoding while writeing to file). + + +Usage +----- + +An ant build script can be found in the root folder of the project and it +includes (among others) tasks for building the sources, as well as using +the compiler and runner. + +Otherwise calls can be made with: + +java MJ.Compiler [-print] +java MJ.Run [-d] + +There is also a Decoder available: + +java MJ.Decode + +You might want to include the "compiler-bin" into your CLASSPATH, or just +use "-cp compiler-bin" in the command line. -- 2.17.1 From e3140851cb2899b2a352ef2825317bc939f5bf50 Mon Sep 17 00:00:00 2001 From: Doni Pracner Date: Thu, 23 Jan 2014 23:27:00 +0100 Subject: [PATCH 16/16] README updated a bit --- README.txt | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/README.txt b/README.txt index 9e832b7..8a52470 100644 --- a/README.txt +++ b/README.txt @@ -1,14 +1,17 @@ MJC2WSL - convert MicroJava Compiled Bytecode to WSL/FermaT =========================================================== +mjc2wsl is distributed under the GPL licence, for more details check the src +folder. + + Quick build and test -------------------- -Running ant in the folder should compile the tool as well -as the MJ compiler and then do a test - compile all of the -sample MicroJava codes into MJ bytecode, translate them -to WSL and then apply the given transformations in MetaWSL -to the programs. +Running ant in the folder should compile the tool as well as the MJ compiler +and then do a test - compile all of the sample MicroJava codes into MJ +bytecode, translate them to WSL and then apply the given transformations in +MetaWSL to the programs. Requirements @@ -27,24 +30,27 @@ Downloads available at http://www.cse.dmu.ac.uk/~mward/fermat.html Setting the FermaT dir ---------------------- -The ant build script assumes that Fermat is in "C:/fermat3" under -Windows and "~/fermat3" for everything else (Linux/Mac...). +The ant build script assumes that Fermat is in "C:/fermat3" under Windows +and "~/fermat3" for everything else (Linux/Mac...). -If you need to change this you can rename (or copy) the given -file "custom.properties.default" to "custom.properties" and -specify a correct path for your system. +If you need to change this you can rename (or copy) the given file +"custom.properties.default" to "custom.properties" and specify a correct +path for your system. About MicroJava --------------- -This is a simple language made by H. Mössenböck for a Compiler -Construction course. It is not the same as Java Micro Edition -(JavaME) used on mobile phones. +This is a simple language made by H. Mössenböck for a Compiler Construction +course. It is not the same as Java Micro Edition (JavaME) used on mobile +phones. More about the course, the language and its VM: http://www.ssw.uni-linz.ac.at/Misc/CC/ +A functional compiler is distributed in the lib folder for ease of testing +and evaluating. Check the folder for further details. + Contact ------- -- 2.17.1