LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-08 04:59:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

performance fixes

Browse Source
This commit is contained in:
honfika@gmail.com
2015-03-20 14:39:00 +01:00
parent 72b30e17e8
commit d5fb45fd54
8 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
View File

@@ -1162,7 +1162,7 @@ public final class SWF implements SWFContainerItem, Timelined {
public List<ScriptPack> getAS3Packs() {
List<ScriptPack> packs = new ArrayList<>();
for (ABCContainerTag abcTag : getAbcList()) {
packs.addAll(abcTag.getABC().getScriptPacks());
packs.addAll(abcTag.getABC().getScriptPacks(null));
}
return uniqueAS3Packs(packs);
}

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
View File

@@ -866,10 +866,10 @@ public class ABC {
}
}
public List<ScriptPack> getScriptPacks() {
public List<ScriptPack> getScriptPacks(String packagePrefix) {
List<ScriptPack> ret = new ArrayList<>();
for (int i = 0; i < script_info.size(); i++) {
ret.addAll(script_info.get(i).getPacks(this, i));
ret.addAll(script_info.get(i).getPacks(this, i, packagePrefix));
}
return ret;
}
@@ -1045,7 +1045,7 @@ public class ABC {
public List<ScriptPack> findScriptPacksByPath(String name) {
List<ScriptPack> ret = new ArrayList<>();
List<ScriptPack> allPacks = getScriptPacks();
List<ScriptPack> allPacks = getScriptPacks(null); // todo: honfika: use filter parameter
if (name.endsWith(".**") || name.equals("**") || name.endsWith(".++") || name.equals("++")) {
name = name.substring(0, name.length() - 2);
@@ -1076,7 +1076,7 @@ public class ABC {
}
public ScriptPack findScriptPackByPath(String name) {
List<ScriptPack> packs = getScriptPacks();
List<ScriptPack> packs = getScriptPacks(null);
for (ScriptPack en : packs) {
if (en.getClassPath().toString().equals(name)) {
return en;

11
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/ScriptInfo.java
View File

@@ -40,7 +40,7 @@ public class ScriptInfo {
this.traits = traits;
}
public List<ScriptPack> getPacks(ABC abc, int scriptIndex) {
public List<ScriptPack> getPacks(ABC abc, int scriptIndex, String packagePrefix) {
List<ScriptPack> ret = new ArrayList<>();
List<Integer> otherTraits = new ArrayList<>();
@@ -66,10 +66,13 @@ public class ScriptInfo {
traitIndices.add(j);
if (!otherTraits.isEmpty()) {
traitIndices.addAll(otherTraits);
otherTraits.clear();
}
if (packagePrefix == null || packageName.startsWith(packagePrefix)) {
ClassPath cp = new ClassPath(packageName, objectName);
ret.add(new ScriptPack(cp, abc, scriptIndex, traitIndices));
}
otherTraits = new ArrayList<>();
ClassPath cp = new ClassPath(packageName, objectName);
ret.add(new ScriptPack(cp, abc, scriptIndex, traitIndices));
}
}
return ret;

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
View File

@@ -17,6 +17,7 @@
package com.jpexs.decompiler.flash.abc.types.traits;
import com.jpexs.decompiler.flash.abc.ABC;
import com.jpexs.decompiler.flash.abc.ClassPath;
import com.jpexs.decompiler.flash.abc.types.Multiname;
import com.jpexs.decompiler.flash.abc.types.Namespace;
import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
@@ -189,11 +190,11 @@ public abstract class Trait implements Serializable {
public abstract int removeTraps(int scriptIndex, int classIndex, boolean isStatic, ABC abc, String path) throws InterruptedException;
public String getPath(ABC abc) {
public ClassPath getPath(ABC abc) {
Multiname name = getName(abc);
Namespace ns = name.getNamespace(abc.constants);
String packageName = ns.getName(abc.constants, false);
String objectName = name.getName(abc.constants, new ArrayList<String>(), false);
return packageName + "." + objectName; //assume not null name
return new ClassPath(packageName, objectName); //assume not null name
}
}

13
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
View File

@@ -17,6 +17,7 @@
package com.jpexs.decompiler.flash.abc.types.traits;
import com.jpexs.decompiler.flash.abc.ABC;
import com.jpexs.decompiler.flash.abc.ClassPath;
import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
import com.jpexs.decompiler.flash.abc.avm2.instructions.construction.NewFunctionIns;
@@ -366,18 +367,12 @@ public class TraitClass extends Trait implements TraitWithSlot {
for (ABCContainerTag tag : abc.getAbcTags()) {
for (ScriptInfo si : tag.getABC().script_info) {
for (Trait t : si.traits.traits) {
String spath = t.getPath(tag.getABC());
String pkg = "";
String name = spath;
if (spath.contains(".")) {
pkg = spath.substring(0, spath.lastIndexOf('.'));
name = spath.substring(spath.lastIndexOf('.') + 1);
}
ClassPath classPath = t.getPath(tag.getABC());
String pkg = classPath.packageStr == null ? "" : classPath.packageStr;
if (pkg.equals(packageName)) {
namesInThisPackage.add(name);
namesInThisPackage.add(classPath.className);
}
}
}
}

2
src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
View File

@@ -804,7 +804,7 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener, Se
try {
String oldSp = null;
List<ScriptPack> packs = abc.script_info.get(oldIndex).getPacks(abc, oldIndex);
List<ScriptPack> packs = abc.script_info.get(oldIndex).getPacks(abc, oldIndex, null);
if (!packs.isEmpty()) {
oldSp = packs.get(0).getClassPath().toString();
}

3
src/com/jpexs/decompiler/flash/gui/abc/ClassesListTreeModel.java
View File

@@ -81,7 +81,8 @@ public class ClassesListTreeModel extends AS3ClassTreeItem implements TreeModel
}
}
AS3Package pkg = ensurePackage(item.getClassPath().packageStr);
String packageStr = item.getClassPath().packageStr;
AS3Package pkg = ensurePackage(packageStr);
pkg.addScriptPack(item);
}
}

9
src/com/jpexs/decompiler/flash/gui/debugger/DebuggerTools.java
View File

@@ -47,7 +47,7 @@ public class DebuggerTools {
private static ScriptPack getDebuggerScriptPack(SWF swf) {
for (ABCContainerTag ac : swf.getAbcList()) {
ABC a = ac.getABC();
for (ScriptPack m : a.getScriptPacks()) {
for (ScriptPack m : a.getScriptPacks(DEBUGGER_PACKAGE)) {
if (isDebuggerClass(m.getClassPath().packageStr, null)) {
return m;
}
@@ -64,11 +64,18 @@ public class DebuggerTools {
if (tested == null) {
return false;
}
// fast check, because dynamic regex compile and match is expensive
if (!tested.startsWith(DEBUGGER_PACKAGE)) {
return false;
}
if (cls == null) {
cls = "";
} else {
cls = "\\." + Pattern.quote(cls);
}
return tested.matches(Pattern.quote(DEBUGGER_PACKAGE) + "(\\.pkg[a-f0-9]+)?" + cls);
}