LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-04 09:05:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

AVM2 execution fixes

Browse Source
This commit is contained in:
honfika@gmail.com
2016-12-30 21:19:48 +01:00
parent f786c34910
commit cf58f71f10
11 changed files with 189 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
test/com/jpexs/decompiler/flash/gui/FlashPlayerTest.java
View File

@@ -16,6 +16,7 @@
*/
package com.jpexs.decompiler.flash.gui;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.abc.ABC;
import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
import com.jpexs.decompiler.flash.abc.avm2.AVM2Runtime;
@@ -25,6 +26,7 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instructions;
import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition;
import com.jpexs.decompiler.flash.abc.types.MethodBody;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.ActionLocalData;
import com.jpexs.decompiler.flash.action.LocalDataArea;
@@ -73,10 +75,15 @@ import com.jpexs.decompiler.flash.action.swf6.ActionStringGreater;
import com.jpexs.decompiler.flash.ecma.EcmaScript;
import com.jpexs.decompiler.flash.ecma.Null;
import com.jpexs.decompiler.flash.ecma.Undefined;
import com.jpexs.decompiler.flash.tags.ABCContainerTag;
import com.jpexs.decompiler.graph.Graph;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.TranslateStack;
import com.jpexs.helpers.Helper;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -94,7 +101,83 @@ public class FlashPlayerTest {
private final Random random = new Random();
private final AVM2RuntimeInfo adobeRuntime = new AVM2RuntimeInfo(AVM2Runtime.ADOBE_FLASH, 19, false);
private final AVM2RuntimeInfo adobeRuntime = new AVM2RuntimeInfo(AVM2Runtime.ADOBE_FLASH, 19, true);
//@Test
public void testAs3Files() throws IOException, InterruptedException {
List<String> files = new ArrayList<>();
File dir = new File("..\\swf");
if (dir.exists()) {
File[] fs = dir.listFiles(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
return name.toLowerCase().endsWith(".swf") && !name.toLowerCase().endsWith(".recompiled.swf");
}
});
for (File f : fs) {
files.add(dir.getAbsolutePath() + File.separator + f.getName());
}
}
for (String file : files) {
SWF swf = new SWF(new BufferedInputStream(new FileInputStream(file)), true);
List<ABCContainerTag> abcs = swf.getAbcList();
for (ABCContainerTag abcContainer : abcs) {
ABC abc = abcContainer.getABC();
for (MethodBody body : abc.bodies) {
if (body.method_info != 55) {
continue;
}
AVM2Code code = body.getCode();
AdobeFlashExecutor adobeExecutor = new AdobeFlashExecutor();
adobeExecutor.loadTestSwf();
ABC testAbc = adobeExecutor.as3TestSwfAbcTag.getABC();
testAbc.constants.ensureStringCapacity(1000000);
testAbc.constants.ensureMultinameCapacity(1000000);
List<AS3ExecuteTask> tasks = new ArrayList<>();
{
AS3ExecuteTask task = new AS3ExecuteTask();
task.description = swf.getFileTitle() + " " + body.method_info;
while (code.code.size() > 9) {
code.code.remove(code.code.size() - 1);
}
task.code = code;
tasks.add(task);
}
adobeExecutor.executeAvm2(tasks);
for (AS3ExecuteTask task : tasks) {
String ffdecExecuteResult;
try {
Object res = task.code.execute(new HashMap<>(), testAbc.constants, adobeRuntime);
ffdecExecuteResult = "Result:" + EcmaScript.toString(res) + " Type:" + EcmaScript.typeString(res);
} catch (AVM2ExecutionException ex) {
ffdecExecuteResult = "Error:" + ex.getMessage();
}
task.ffdecResult = ffdecExecuteResult;
}
for (AS3ExecuteTask task : tasks) {
System.out.println("Flash result (" + task.description + "): " + task.flashResult);
System.out.println("FFDec execte result: " + task.ffdecResult);
if (!task.ffdecResult.equals(task.flashResult)) {
System.out.println(code.toASMSource(testAbc.constants));
}
assertEquals(task.ffdecResult, task.flashResult);
}
}
}
}
}
//@Test
public void testAs3Pushes() throws IOException, InterruptedException {
@@ -119,20 +202,23 @@ public class FlashPlayerTest {
AS3ExecuteTask task = new AS3ExecuteTask();
task.description = p1 + ", " + pushes[p1].definition.instructionName;
task.code = ccode;
tasks.add(task);
}
adobeExecutor.executeAvm2(tasks);
for (AS3ExecuteTask task : tasks) {
String ffdecExecuteResult;
try {
Object res = ccode.execute(new HashMap<>(), abc.constants, adobeRuntime);
Object res = task.code.execute(new HashMap<>(), abc.constants, adobeRuntime);
ffdecExecuteResult = "Result:" + EcmaScript.toString(res) + " Type:" + EcmaScript.typeString(res);
} catch (AVM2ExecutionException ex) {
ffdecExecuteResult = "Error:" + ex.getMessage();
}
task.ffdecResult = ffdecExecuteResult;
tasks.add(task);
}
adobeExecutor.executeAvm2(tasks);
for (AS3ExecuteTask task : tasks) {
System.out.println("Flash result (" + task.description + "): " + task.flashResult);
System.out.println("FFDec execte result: " + task.ffdecResult);