This repository has been archived by the owner on Jul 1, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update LuaJC with fix from SquidDev-CC/Studio#13
- Loading branch information
Showing
22 changed files
with
1,112 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| mc_version=1.7.10 | ||
| forge_version=10.13.2.1291 | ||
| cc_version=1.73 | ||
| mod_version=0.1.4 | ||
| mod_version=0.1.4.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
190 changes: 190 additions & 0 deletions
190
src/main/java/squiddev/cctweaks/core/luajc/BasicBlock.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,190 @@ | ||
| package squiddev.cctweaks.core.luajc; | ||
|
|
||
| import org.luaj.vm2.Lua; | ||
| import org.luaj.vm2.Prototype; | ||
|
|
||
| import java.util.Vector; | ||
|
|
||
| public class BasicBlock { | ||
| int pc0, pc1; // range of program counter values for the block | ||
| BasicBlock[] prev; // previous basic blocks (0-n of these) | ||
| BasicBlock[] next; // next basic blocks (0, 1, or 2 of these) | ||
| boolean islive; // true if this block is used | ||
|
|
||
| public BasicBlock(Prototype p, int pc0) { | ||
| this.pc0 = this.pc1 = pc0; | ||
| } | ||
|
|
||
| public String toString() { | ||
| return (pc0 + 1) + "-" + (pc1 + 1) | ||
| + (prev != null ? " prv: " + str(prev, 1) : "") | ||
| + (next != null ? " nxt: " + str(next, 0) : "") | ||
| + "\n"; | ||
| } | ||
|
|
||
| private String str(BasicBlock[] b, int p) { | ||
| if (b == null) { | ||
| return ""; | ||
| } | ||
| StringBuilder sb = new StringBuilder(); | ||
| sb.append("("); | ||
| for (int i = 0, n = b.length; i < n; i++) { | ||
| if (i > 0) sb.append(","); | ||
| sb.append(String.valueOf(p == 1 ? b[i].pc1 + 1 : b[i].pc0 + 1)); | ||
| } | ||
| sb.append(")"); | ||
| return sb.toString(); | ||
| } | ||
|
|
||
| public static BasicBlock[] findBasicBlocks(Prototype p) { | ||
|
|
||
| // mark beginnings, endings | ||
| final int n = p.code.length; | ||
| final boolean[] isbeg = new boolean[n]; | ||
| final boolean[] isend = new boolean[n]; | ||
| isbeg[0] = true; | ||
| BranchVisitor bv = new BranchVisitor(isbeg) { | ||
| public void visitBranch(int pc0, int pc1) { | ||
| isend[pc0] = true; | ||
| isbeg[pc1] = true; | ||
| } | ||
|
|
||
| public void visitReturn(int pc) { | ||
| isend[pc] = true; | ||
| } | ||
| }; | ||
| visitBranches(p, bv); // 1st time to mark branches | ||
| visitBranches(p, bv); // 2nd time to catch merges | ||
|
|
||
| // create basic blocks | ||
| final BasicBlock[] blocks = new BasicBlock[n]; | ||
| for (int i = 0; i < n; i++) { | ||
| isbeg[i] = true; | ||
| BasicBlock b = new BasicBlock(p, i); | ||
| blocks[i] = b; | ||
| while (!isend[i] && i + 1 < n && !isbeg[i + 1]) { | ||
| blocks[b.pc1 = ++i] = b; | ||
| } | ||
| } | ||
|
|
||
| // count previous, next | ||
| final int[] nnext = new int[n]; | ||
| final int[] nprev = new int[n]; | ||
| visitBranches(p, new BranchVisitor(isbeg) { | ||
| public void visitBranch(int pc0, int pc1) { | ||
| nnext[pc0]++; | ||
| nprev[pc1]++; | ||
| } | ||
| }); | ||
|
|
||
| // allocate and cross-reference | ||
| visitBranches(p, new BranchVisitor(isbeg) { | ||
| public void visitBranch(int pc0, int pc1) { | ||
| if (blocks[pc0].next == null) blocks[pc0].next = new BasicBlock[nnext[pc0]]; | ||
| if (blocks[pc1].prev == null) blocks[pc1].prev = new BasicBlock[nprev[pc1]]; | ||
| blocks[pc0].next[--nnext[pc0]] = blocks[pc1]; | ||
| blocks[pc1].prev[--nprev[pc1]] = blocks[pc0]; | ||
| } | ||
| }); | ||
| return blocks; | ||
| } | ||
|
|
||
| abstract public static class BranchVisitor { | ||
| final boolean[] isbeg; | ||
|
|
||
| public BranchVisitor(boolean[] isbeg) { | ||
| this.isbeg = isbeg; | ||
| } | ||
|
|
||
| public void visitBranch(int frompc, int topc) { | ||
| } | ||
|
|
||
| public void visitReturn(int atpc) { | ||
| } | ||
| } | ||
|
|
||
| public static void visitBranches(Prototype p, BranchVisitor visitor) { | ||
| int sbx, j, c; | ||
| int[] code = p.code; | ||
| int n = code.length; | ||
| for (int i = 0; i < n; i++) { | ||
| int ins = code[i]; | ||
| switch (Lua.GET_OPCODE(ins)) { | ||
| case Lua.OP_LOADBOOL: | ||
| if (0 == Lua.GETARG_C(ins)) { | ||
| break; | ||
| } | ||
| if (Lua.GET_OPCODE(code[i + 1]) == Lua.OP_JMP) { | ||
| throw new IllegalArgumentException("OP_LOADBOOL followed by jump at " + i); | ||
| } | ||
| visitor.visitBranch(i, i + 2); | ||
| continue; | ||
| case Lua.OP_EQ: | ||
| case Lua.OP_LT: | ||
| case Lua.OP_LE: | ||
| case Lua.OP_TEST: | ||
| case Lua.OP_TESTSET: | ||
| case Lua.OP_TFORLOOP: | ||
| if (Lua.GET_OPCODE(code[i + 1]) != Lua.OP_JMP) { | ||
| throw new IllegalArgumentException("test not followed by jump at " + i); | ||
| } | ||
| sbx = Lua.GETARG_sBx(code[i + 1]); | ||
| ++i; | ||
| j = i + sbx + 1; | ||
| visitor.visitBranch(i, j); | ||
| visitor.visitBranch(i, i + 1); | ||
| continue; | ||
| case Lua.OP_FORLOOP: | ||
| sbx = Lua.GETARG_sBx(ins); | ||
| j = i + sbx + 1; | ||
| visitor.visitBranch(i, j); | ||
| visitor.visitBranch(i, i + 1); | ||
| continue; | ||
| case Lua.OP_JMP: | ||
| case Lua.OP_FORPREP: | ||
| sbx = Lua.GETARG_sBx(ins); | ||
| j = i + sbx + 1; | ||
| visitor.visitBranch(i, j); | ||
| continue; | ||
| case Lua.OP_TAILCALL: | ||
| case Lua.OP_RETURN: | ||
| visitor.visitReturn(i); | ||
| continue; | ||
| } | ||
| if (i + 1 < n && visitor.isbeg[i + 1]) { | ||
| visitor.visitBranch(i, i + 1); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static BasicBlock[] findLiveBlocks(BasicBlock[] blocks) { | ||
| // add reachable blocks | ||
| Vector<BasicBlock> next = new Vector<BasicBlock>(); | ||
| next.addElement(blocks[0]); | ||
| while (!next.isEmpty()) { | ||
| BasicBlock b = next.elementAt(0); | ||
| next.removeElementAt(0); | ||
| if (!b.islive) { | ||
| b.islive = true; | ||
| for (int i = 0, n = b.next != null ? b.next.length : 0; i < n; i++) { | ||
| if (!b.next[i].islive) { | ||
| next.addElement(b.next[i]); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // create list in natural order | ||
| Vector<BasicBlock> list = new Vector<BasicBlock>(); | ||
| for (int i = 0; i < blocks.length; i = blocks[i].pc1 + 1) { | ||
| if (blocks[i].islive) { | ||
| list.addElement(blocks[i]); | ||
| } | ||
| } | ||
|
|
||
| // convert to array | ||
| BasicBlock[] array = new BasicBlock[list.size()]; | ||
| list.copyInto(array); | ||
| return array; | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
...n/java/org/luaj/vm2/luajc/IGetSource.java → ...iddev/cctweaks/core/luajc/IGetSource.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package org.luaj.vm2.luajc; | ||
| package squiddev.cctweaks.core.luajc; | ||
|
|
||
| import org.luaj.vm2.Prototype; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.