LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-10 16:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/master

Browse Source
This commit is contained in:
Jindra Petřík
2015-10-24 19:14:02 +02:00
parent b9c289464d 16835439cf
commit 1cc9095acd
12 changed files with 177 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java
View File

@@ -698,6 +698,11 @@ public abstract class Action implements GraphSourceItem {
return toString();
}
public boolean execute(LocalDataArea lda) {
//throw new UnsupportedOperationException("Action " + toString() + " not implemented");
return false;
}
/**
* Translates this function to stack and output.
*

50
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/LocalDataArea.java Normal file
View File

@@ -0,0 +1,50 @@
/*
* Copyright (C) 2010-2015 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;
import com.jpexs.decompiler.flash.ecma.EcmaScript;
import java.util.HashMap;
import java.util.Stack;
public class LocalDataArea {
public Stack<Object> stack = new Stack<>();
public HashMap<String, Object> localVariables = new HashMap<>();
public Long jump;
public Object returnValue;
public String executionException;
public void clear() {
stack.clear();
localVariables.clear();
jump = null;
returnValue = null;
executionException = null;
}
public Object pop() {
return stack.pop();
}
public Double popAsNumber() {
return EcmaScript.toNumber(stack.pop());
}
}

7
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java
View File

@@ -51,12 +51,7 @@ public class AsciiToCharActionItem extends ActionItem {
@Override
public Object getResult() {
int res = (int) (double) (value.getResultAsNumber());
if (res == 0) {
return "";
}
return ((Character) (char) res).toString();
return ActionAsciiToChar.getResult(value.getResultAsNumber());
}
@Override

21
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java
View File

@@ -18,8 +18,6 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
import com.jpexs.decompiler.flash.action.swf5.ActionTypeOf;
import com.jpexs.decompiler.flash.ecma.EcmaScript;
import com.jpexs.decompiler.flash.ecma.EcmaType;
import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
import com.jpexs.decompiler.graph.CompilationException;
import com.jpexs.decompiler.graph.GraphSourceItem;
@@ -53,24 +51,7 @@ public class TypeOfActionItem extends ActionItem {
@Override
public Object getResult() {
Object res = value.getResult();
EcmaType type = EcmaScript.type(res);
switch (type) {
case STRING:
return "string";
case BOOLEAN:
return "boolean";
case NUMBER:
return "number";
case OBJECT:
return "object";
case UNDEFINED:
return "undefined";
case NULL:
return "null";
}
//TODO: function,movieclip
return "object";
return ActionTypeOf.getResult(value.getResult());
}
@Override

3
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/operations/StringAddActionItem.java
View File

@@ -18,7 +18,6 @@ package com.jpexs.decompiler.flash.action.model.operations;
import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
import com.jpexs.decompiler.flash.action.swf4.ActionStringAdd;
import com.jpexs.decompiler.flash.ecma.EcmaScript;
import com.jpexs.decompiler.graph.CompilationException;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphTargetItem;
@@ -41,7 +40,7 @@ public class StringAddActionItem extends BinaryOpItem {
@Override
public Object getResult() {
return EcmaScript.toString(leftSide.getResult()) + EcmaScript.toString(rightSide.getResult());
return ActionStringAdd.getResult(leftSide.getResult(), rightSide.getResult());
}
@Override

20
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionAsciiToChar.java
View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.swf4;
import com.jpexs.decompiler.flash.BaseLocalData;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.LocalDataArea;
import com.jpexs.decompiler.flash.action.model.AsciiToCharActionItem;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.TranslateStack;
@@ -35,6 +36,25 @@ public class ActionAsciiToChar extends Action {
return "AsciiToChar";
}
@Override
public boolean execute(LocalDataArea lda) {
if (lda.stack.size() == 0) {
return false;
}
lda.stack.push(getResult(lda.popAsNumber()));
return true;
}
public static String getResult(Double ascii) {
int res = (int) (double) ascii;
if (res == 0) {
return "";
}
return ((Character) (char) res).toString();
}
@Override
public void translate(TranslateStack stack, List<GraphTargetItem> output, HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, int staticOperation, String path) {
GraphTargetItem a = stack.pop();

10
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java
View File

@@ -22,6 +22,7 @@ import com.jpexs.decompiler.flash.SWFInputStream;
import com.jpexs.decompiler.flash.SWFOutputStream;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.ActionList;
import com.jpexs.decompiler.flash.action.LocalDataArea;
import com.jpexs.decompiler.flash.action.model.DirectValueActionItem;
import com.jpexs.decompiler.flash.action.model.TemporaryRegister;
import com.jpexs.decompiler.flash.action.parser.ActionParseException;
@@ -373,6 +374,15 @@ public class ActionPush extends Action {
return writer;
}
@Override
public boolean execute(LocalDataArea lda) {
for (Object value : values) {
lda.stack.push(value);
}
return true;
}
@Override
public void translate(TranslateStack stack, List<GraphTargetItem> output, HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, int staticOperation, String path) {
int pos = 0;

16
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionStringAdd.java
View File

@@ -18,7 +18,9 @@ package com.jpexs.decompiler.flash.action.swf4;
import com.jpexs.decompiler.flash.BaseLocalData;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.LocalDataArea;
import com.jpexs.decompiler.flash.action.model.operations.StringAddActionItem;
import com.jpexs.decompiler.flash.ecma.EcmaScript;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.TranslateStack;
import java.util.HashMap;
@@ -35,6 +37,20 @@ public class ActionStringAdd extends Action {
return "StringAdd";
}
@Override
public boolean execute(LocalDataArea lda) {
if (lda.stack.size() < 2) {
return false;
}
lda.stack.push(getResult(lda.pop(), lda.pop()));
return true;
}
public static String getResult(Object obj1, Object obj2) {
return EcmaScript.toString(obj1) + EcmaScript.toString(obj2);
}
@Override
public void translate(TranslateStack stack, List<GraphTargetItem> output, HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, int staticOperation, String path) {
GraphTargetItem a = stack.pop();

11
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionPushDuplicate.java
View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.swf5;
import com.jpexs.decompiler.flash.BaseLocalData;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.LocalDataArea;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.TranslateStack;
@@ -36,6 +37,16 @@ public class ActionPushDuplicate extends Action {
return "PushDuplicate";
}
@Override
public boolean execute(LocalDataArea lda) {
if (lda.stack.size() == 0) {
return false;
}
lda.stack.push(lda.stack.peek());
return true;
}
@Override
public void translate(TranslateStack stack, List<GraphTargetItem> output, HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, int staticOperation, String path) {
GraphTargetItem value = stack.peek();

14
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionStackSwap.java
View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.swf5;
import com.jpexs.decompiler.flash.BaseLocalData;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.LocalDataArea;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.TranslateStack;
@@ -35,6 +36,19 @@ public class ActionStackSwap extends Action {
return "StackSwap";
}
@Override
public boolean execute(LocalDataArea lda) {
if (lda.stack.size() < 2) {
return false;
}
Object obj1 = lda.stack.pop();
Object obj2 = lda.stack.pop();
lda.stack.push(obj1);
lda.stack.push(obj2);
return true;
}
@Override
public void translate(TranslateStack stack, List<GraphTargetItem> output, HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, int staticOperation, String path) {
GraphTargetItem a = stack.pop();

34
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionTypeOf.java
View File

@@ -18,7 +18,10 @@ package com.jpexs.decompiler.flash.action.swf5;
import com.jpexs.decompiler.flash.BaseLocalData;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.LocalDataArea;
import com.jpexs.decompiler.flash.action.model.TypeOfActionItem;
import com.jpexs.decompiler.flash.ecma.EcmaScript;
import com.jpexs.decompiler.flash.ecma.EcmaType;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.TranslateStack;
import java.util.HashMap;
@@ -35,6 +38,37 @@ public class ActionTypeOf extends Action {
return "TypeOf";
}
@Override
public boolean execute(LocalDataArea lda) {
if (lda.stack.size() == 0) {
return false;
}
lda.stack.push(getResult(lda.pop()));
return true;
}
public static String getResult(Object obj) {
Object res = obj;
EcmaType type = EcmaScript.type(res);
switch (type) {
case STRING:
return "string";
case BOOLEAN:
return "boolean";
case NUMBER:
return "number";
case OBJECT:
return "object";
case UNDEFINED:
return "undefined";
case NULL:
return "null";
}
//TODO: function,movieclip
return "object";
}
@Override
public void translate(TranslateStack stack, List<GraphTargetItem> output, HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, int staticOperation, String path) {
GraphTargetItem object = stack.pop();