LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-26 12:00:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Sorting constantpool based on ActionPush position

Browse Source 
- ActionPush constant for maximum index of constant of type 8 push.
This commit is contained in:
Jindra Petřík
2018-01-21 10:59:19 +01:00
parent e436dccb07
commit 091a2e1226
3 changed files with 62 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionScript2Parser.java
+51 -5
View File
@@ -120,6 +120,7 @@ import com.jpexs.decompiler.flash.action.model.operations.SubtractActionItem;
import com.jpexs.decompiler.flash.action.model.operations.URShiftActionItem;
import com.jpexs.decompiler.flash.action.parser.ActionParseException;
import com.jpexs.decompiler.flash.action.swf4.ActionIf;
import com.jpexs.decompiler.flash.action.swf4.ActionPush;
import com.jpexs.decompiler.flash.action.swf4.ConstantIndex;
import com.jpexs.decompiler.flash.action.swf5.ActionConstantPool;
import com.jpexs.decompiler.flash.ecma.Null;
@@ -1872,18 +1873,63 @@ public class ActionScript2Parser {
return retTree;
}
public List<Action> actionsFromTree(List<GraphTargetItem> tree, List<String> constantPool) throws CompilationException {
private List<GraphSourceItem> generateActionList(List<GraphTargetItem> tree, List<String> constantPool) throws CompilationException {
ActionSourceGenerator gen = new ActionSourceGenerator(swfVersion, constantPool);
SourceGeneratorLocalData localData = new SourceGeneratorLocalData(new HashMap<>(), 0, Boolean.FALSE, 0);
return gen.generate(localData, tree);
}
public List<Action> actionsFromTree(List<GraphTargetItem> tree, List<String> constantPoolDraft) throws CompilationException {
List<Action> ret = new ArrayList<>();
SourceGeneratorLocalData localData = new SourceGeneratorLocalData(
new HashMap<>(), 0, Boolean.FALSE, 0);
List<GraphSourceItem> srcList = gen.generate(localData, tree);
List<GraphSourceItem> srcList = generateActionList(tree, constantPoolDraft);
List<String> orderedConstantPool = new ArrayList<>();
boolean canChangeConstantIndices;
int lastIndex = constantPoolDraft.size() - 1;
if (lastIndex <= ActionPush.MAX_CONSTANT_INDEX_TYPE8) {
//can change constant indices as ActionPush contains always 1 byte per constant
canChangeConstantIndices = true;
} else {
//variable number bytes per ActionPush constant,
//must generate again to make relative offsets in jumps work
canChangeConstantIndices = false;
}
//create ordered constant pool, update constantindices if they can be changed
for (GraphSourceItem src : srcList) {
if (src instanceof ActionPush) {
ActionPush ap = (ActionPush) src;
for (int i = 0; i < ap.values.size(); i++) {
Object val = ap.values.get(i);
if (val instanceof ConstantIndex) {
ConstantIndex ci = (ConstantIndex) val;
String cval = constantPoolDraft.get(ci.index);
int orderedIndex = orderedConstantPool.indexOf(cval);
if (orderedIndex == -1) {
orderedIndex = orderedConstantPool.size();
orderedConstantPool.add(cval);
}
if (canChangeConstantIndices) {
ci.index = orderedIndex;
}
}
}
}
}
if (!canChangeConstantIndices) {
//generate again, as number of bytes per ActionPush can change
srcList = generateActionList(tree, orderedConstantPool);
}
for (GraphSourceItem s : srcList) {
if (s instanceof Action) {
ret.add((Action) s);
}
}
ret.add(0, new ActionConstantPool(constantPool));
ret.add(0, new ActionConstantPool(orderedConstantPool));
return ret;
}
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java
+2 -2
View File
@@ -724,12 +724,12 @@ public class ActionSourceGenerator implements SourceGenerator {
if (pass == 1 && isFunc) { //Add methods in first pass
FunctionActionItem fi = (FunctionActionItem) en.getValue();
ifbody.add(new ActionPush(new RegisterNumber(traitsStatic.get(t) ? 1 : 2)));
ifbody.add(new ActionPush(getName(en.getKey())));
ifbody.add(pushConst(getName(en.getKey())));
ifbody.addAll(toActionList(fi.toSource(localData, this)));
ifbody.add(new ActionSetMember());
} else if (pass == 2 && !isFunc) { //add variables in second pass
ifbody.add(new ActionPush(new RegisterNumber(traitsStatic.get(t) ? 1 : 2)));
ifbody.add(new ActionPush(getName(en.getKey())));
ifbody.add(pushConst(getName(en.getKey())));
ifbody.addAll(toActionList(en.getValue().toSource(localData, this)));
ifbody.add(new ActionSetMember());
}
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java
+9 -2
View File
@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.␍ */
* License along with this library.
*/
package com.jpexs.decompiler.flash.action.swf4;
import com.jpexs.decompiler.flash.BaseLocalData;
@@ -62,6 +63,12 @@ public class ActionPush extends Action {
public List<String> constantPool;
/**
* Maximum constant index for storing in type 8, greater indices must be
* stored in type 9
*/
public static final int MAX_CONSTANT_INDEX_TYPE8 = 255;
public ActionPush(int actionLength, SWFInputStream sis, int version) throws IOException {
super(0x96, actionLength);
int type;
@@ -151,7 +158,7 @@ public class ActionPush extends Action {
}
} else if (o instanceof ConstantIndex) {
int cIndex = ((ConstantIndex) o).index;
if (cIndex < 256) {
if (cIndex <= MAX_CONSTANT_INDEX_TYPE8) {
sos.writeUI8(8);
sos.writeUI8(cIndex);
} else {