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

AS1/2 direct editation - reordering of large (>256 items) constantpools

Browse Source
This commit is contained in:
Jindra Petřík
2018-01-21 13:03:20 +01:00
parent 9e2497f2b8
commit 2f6d0e66ac
3 changed files with 111 additions and 43 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
+53 -42
View File
@@ -1879,66 +1879,77 @@ public class ActionScript2Parser {
return gen.generate(localData, tree);
}
public List<Action> actionsFromTree(List<GraphTargetItem> tree, List<String> constantPoolDraft) throws CompilationException {
private List<Action> actionsFromTree(List<GraphTargetItem> tree, List<String> constantPool, boolean doOrder) throws CompilationException, NeedsGenerateAgainException {
List<Action> ret = new ArrayList<>();
List<GraphSourceItem> srcList = generateActionList(tree, constantPoolDraft);
List<GraphSourceItem> srcList = generateActionList(tree, constantPool);
List<String> orderedConstantPool = new ArrayList<>();
if (doOrder) {
List<String> orderedConstantPool = new ArrayList<>();
boolean canChangeInPlace;
int lastIndex = constantPool.size() - 1;
if (lastIndex <= ActionPush.MAX_CONSTANT_INDEX_TYPE8) {
//can change constant indices as ActionPush contains always 1 byte per constant
canChangeInPlace = true;
} else {
//variable number bytes per ActionPush constant,
//must generate again to make relative offsets in jumps work
canChangeInPlace = false;
}
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) {
//Do NOT change ci.index directly - it may be cloned from other location
ap.values.set(i, new ConstantIndex(orderedIndex));
//create ordered constant pool, update constantindices when we can changeinplace
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 = constantPool.get(ci.index);
int orderedIndex = orderedConstantPool.indexOf(cval);
if (orderedIndex == -1) {
orderedIndex = orderedConstantPool.size();
orderedConstantPool.add(cval);
}
if (canChangeInPlace) {
//Do NOT change ci.index directly - it may be cloned from other location
ap.values.set(i, new ConstantIndex(orderedIndex));
}
}
}
}
}
if (!canChangeInPlace) {
//generate again, as number of bytes per ActionPush can change
throw new NeedsGenerateAgainException(orderedConstantPool);
}
constantPool = orderedConstantPool;
}
if (!canChangeConstantIndices) {
//generate again, as number of bytes per ActionPush can change
srcList = generateActionList(tree, orderedConstantPool);
//FIXME!!!
}
for (GraphSourceItem s : srcList) {
if (s instanceof Action) {
ret.add((Action) s);
}
}
ret.add(0, new ActionConstantPool(orderedConstantPool));
ret.add(0, new ActionConstantPool(constantPool));
return ret;
}
public List<Action> actionsFromString(String s) throws ActionParseException, IOException, CompilationException {
List<String> constantPool = new ArrayList<>();
List<GraphTargetItem> tree = treeFromString(s, constantPool);
return actionsFromTree(tree, constantPool);
try {
List<String> constantPool = new ArrayList<>();
List<GraphTargetItem> tree = treeFromString(s, constantPool);
return actionsFromTree(tree, constantPool, true);
} catch (NeedsGenerateAgainException nga) {
//Can happen when constantpool needs reordering and number of constants > 256
try {
List<String> newConstantPool = nga.getNewConstantPool();
List<GraphTargetItem> tree = treeFromString(s, newConstantPool);
return actionsFromTree(tree, newConstantPool, false /*do not order again*/);
} catch (NeedsGenerateAgainException ex) {
//should not happen as doOrder parameter is set to false
return new ArrayList<>();
}
}
}
private void versionRequired(ParsedSymbol s, int min) throws ActionParseException {
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/NeedsGenerateAgainException.java
+37
View File
@@ -0,0 +1,37 @@
/*
* Copyright (C) 2010-2018 JPEXS, All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
*/
package com.jpexs.decompiler.flash.action.parser.script;
import java.util.List;
/**
*
* @author JPEXS
*/
public class NeedsGenerateAgainException extends Exception {
private List<String> newConstantPool;
public NeedsGenerateAgainException(List<String> newConstantPool) {
this.newConstantPool = newConstantPool;
}
public List<String> getNewConstantPool() {
return newConstantPool;
}
}