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

fixed some NetBeanscode hints

Browse Source
This commit is contained in:
honfika
2014-07-20 00:42:57 +02:00
parent 203e816302
commit 1faee7eaa5
253 changed files with 19088 additions and 19091 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/SWF.java
+1 -1
View File
@@ -2148,7 +2148,7 @@ public final class SWF implements TreeItem, Timelined {
public static SerializableImage getFromCache(String key) { public static SerializableImage getFromCache(String key) {
if (frameCache.contains(key)) { if (frameCache.contains(key)) {
return (SerializableImage) SWF.frameCache.get(key); return SWF.frameCache.get(key);
} }
return null; return null;
} }
src/com/jpexs/decompiler/flash/SourceGeneratorLocalData.java
+2 -2
View File
@@ -39,7 +39,7 @@ public class SourceGeneratorLocalData implements Serializable {
//TODO: handle AVM2 separately //TODO: handle AVM2 separately
public List<ABCException> exceptions = new ArrayList<>(); public List<ABCException> exceptions = new ArrayList<>();
public List<Integer> finallyCatches = new ArrayList<Integer>(); public List<Integer> finallyCatches = new ArrayList<>();
public Map<Integer, Integer> finallyCounter = new HashMap<>(); public Map<Integer, Integer> finallyCounter = new HashMap<>();
public int finallyRegister = -1; public int finallyRegister = -1;
public String currentClass; public String currentClass;
@@ -47,7 +47,7 @@ public class SourceGeneratorLocalData implements Serializable {
public List<MethodBody> callStack = new ArrayList<>(); public List<MethodBody> callStack = new ArrayList<>();
public Map<MethodBody, List<Integer>> traitUsages = new HashMap<>(); public Map<MethodBody, List<Integer>> traitUsages = new HashMap<>();
public String pkg = ""; public String pkg = "";
public List<GraphTargetItem> scopeStack = new ArrayList<GraphTargetItem>(); public List<GraphTargetItem> scopeStack = new ArrayList<>();
public boolean documentClass; public boolean documentClass;
public ScriptInfo currentScript; public ScriptInfo currentScript;
src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
+6 -7
View File
@@ -1249,7 +1249,7 @@ public class AVM2Code implements Serializable {
return pos2adr(fixIPAfterDebugLine(adr2pos(addr))); return pos2adr(fixIPAfterDebugLine(adr2pos(addr)));
} }
public ConvertOutput toSourceOutput(String path, GraphPart part, boolean processJumps, boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ABC abc, ConstantPool constants, List<MethodInfo> method_info, MethodBody body, int start, int end, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, boolean[] visited, HashMap<Integer, Integer> localRegAssigmentIps, HashMap<Integer, List<Integer>> refs) throws ConvertException, InterruptedException { public ConvertOutput toSourceOutput(String path, GraphPart part, boolean processJumps, boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ABC abc, ConstantPool constants, List<MethodInfo> method_info, MethodBody body, int start, int end, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, boolean[] visited, HashMap<Integer, Integer> localRegAssigmentIps, HashMap<Integer, List<Integer>> refs) throws ConvertException, InterruptedException {
boolean debugMode = DEBUG_MODE; boolean debugMode = DEBUG_MODE;
if (debugMode) { if (debugMode) {
System.out.println("OPEN SubSource:" + start + "-" + end + " " + code.get(start).toString() + " to " + code.get(end).toString()); System.out.println("OPEN SubSource:" + start + "-" + end + " " + code.get(start).toString() + " to " + code.get(end).toString());
@@ -2699,7 +2699,7 @@ public class AVM2Code implements Serializable {
}*/ }*/
} }
if (((AVM2Instruction) ins).definition instanceof NewFunctionIns) { if (ins.definition instanceof NewFunctionIns) {
stack.push(new BooleanAVM2Item(null, true)); stack.push(new BooleanAVM2Item(null, true));
} else { } else {
localData.ip = ip; localData.ip = ip;
@@ -2724,8 +2724,8 @@ public class AVM2Code implements Serializable {
if (ins.isBranch() || ins.isJump()) { if (ins.isBranch() || ins.isJump()) {
List<Integer> branches = ins.getBranches(code); List<Integer> branches = ins.getBranches(code);
if (((AVM2Instruction) ins).definition instanceof IfTypeIns if (ins.definition instanceof IfTypeIns
&& (!(((AVM2Instruction) ins).definition instanceof JumpIns)) && (!(ins.definition instanceof JumpIns))
&& (!stack.isEmpty()) && (!stack.isEmpty())
&& (stack.peek().isCompileTime()) && (stack.peek().isCompileTime())
&& (!stack.peek().hasSideEffect())) { && (!stack.peek().hasSideEffect())) {
@@ -2858,11 +2858,10 @@ public class AVM2Code implements Serializable {
for (AVM2Instruction src : decisions.keySet()) { for (AVM2Instruction src : decisions.keySet()) {
Decision dec = decisions.get(src); Decision dec = decisions.get(src);
if (dec != null) { if (dec != null) {
if (((AVM2Instruction) src).definition instanceof LookupSwitchIns) { if (src.definition instanceof LookupSwitchIns) {
AVM2Instruction asrc = (AVM2Instruction) src;
if (dec.casesUsed.size() == 1) { if (dec.casesUsed.size() == 1) {
for (int c : dec.casesUsed) { for (int c : dec.casesUsed) {
asrc.setFixBranch(c); src.setFixBranch(c);
cnt++; cnt++;
} }
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/IfTypeIns.java
+2 -1
View File
@@ -17,9 +17,10 @@
package com.jpexs.decompiler.flash.abc.avm2.instructions; package com.jpexs.decompiler.flash.abc.avm2.instructions;
import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.GraphTargetItem;
import java.util.HashMap;
import java.util.Stack; import java.util.Stack;
public interface IfTypeIns { public interface IfTypeIns {
public abstract void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins); public abstract void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins);
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java
+3 -3
View File
@@ -80,17 +80,17 @@ public class InstructionDefinition implements Serializable {
throw new UnsupportedOperationException("Instruction " + instructionName + " not implemented"); throw new UnsupportedOperationException("Instruction " + instructionName + " not implemented");
} }
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) throws InterruptedException { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) throws InterruptedException {
} }
protected FullMultinameAVM2Item resolveMultiname(Stack<GraphTargetItem> stack, ConstantPool constants, int multinameIndex, AVM2Instruction ins) { protected FullMultinameAVM2Item resolveMultiname(Stack<GraphTargetItem> stack, ConstantPool constants, int multinameIndex, AVM2Instruction ins) {
GraphTargetItem ns = null; GraphTargetItem ns = null;
GraphTargetItem name = null; GraphTargetItem name = null;
if (constants.getMultiname(multinameIndex).needsName()) { if (constants.getMultiname(multinameIndex).needsName()) {
name = (GraphTargetItem) stack.pop(); name = stack.pop();
} }
if (constants.getMultiname(multinameIndex).needsNs()) { if (constants.getMultiname(multinameIndex).needsNs()) {
ns = (GraphTargetItem) stack.pop(); ns = stack.pop();
} }
return new FullMultinameAVM2Item(ins, multinameIndex, name, ns); return new FullMultinameAVM2Item(ins, multinameIndex, name, ns);
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIIns.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class AddIIns extends AddIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new AddAVM2Item(ins, v1, v2)); stack.push(new AddAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java
+3 -3
View File
@@ -59,9 +59,9 @@ public class AddIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new AddAVM2Item(ins, v1, v2)); stack.push(new AddAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java
+2 -2
View File
@@ -55,8 +55,8 @@ public class DecrementIIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
stack.push(new DecrementAVM2Item(ins, (GraphTargetItem) stack.pop())); stack.push(new DecrementAVM2Item(ins, stack.pop()));
} }
@Override @Override
src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java
+2 -2
View File
@@ -55,8 +55,8 @@ public class DecrementIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
stack.push(new DecrementAVM2Item(ins, (GraphTargetItem) stack.pop())); stack.push(new DecrementAVM2Item(ins, stack.pop()));
} }
@Override @Override
src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java
+3 -3
View File
@@ -58,9 +58,9 @@ public class DivideIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new DivideAVM2Item(ins, v1, v2)); stack.push(new DivideAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIIns.java
+2 -2
View File
@@ -36,8 +36,8 @@ public class IncrementIIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
stack.push(new IncrementAVM2Item(ins, (GraphTargetItem) stack.pop())); stack.push(new IncrementAVM2Item(ins, stack.pop()));
} }
@Override @Override
src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIns.java
+2 -2
View File
@@ -36,8 +36,8 @@ public class IncrementIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
stack.push(new IncrementAVM2Item(ins, (GraphTargetItem) stack.pop())); stack.push(new IncrementAVM2Item(ins, stack.pop()));
} }
@Override @Override
src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java
+3 -3
View File
@@ -50,9 +50,9 @@ public class ModuloIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new ModuloAVM2Item(ins, v1, v2)); stack.push(new ModuloAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIIns.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class MultiplyIIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new MultiplyAVM2Item(ins, v1, v2)); stack.push(new MultiplyAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java
+3 -3
View File
@@ -58,9 +58,9 @@ public class MultiplyIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new MultiplyAVM2Item(ins, v1, v2)); stack.push(new MultiplyAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIIns.java
+2 -2
View File
@@ -36,8 +36,8 @@ public class NegateIIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v = (GraphTargetItem) stack.pop(); GraphTargetItem v = stack.pop();
stack.push(new NegAVM2Item(ins, v)); stack.push(new NegAVM2Item(ins, v));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIns.java
+2 -2
View File
@@ -36,8 +36,8 @@ public class NegateIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v = (GraphTargetItem) stack.pop(); GraphTargetItem v = stack.pop();
stack.push(new NegAVM2Item(ins, v)); stack.push(new NegAVM2Item(ins, v));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NotIns.java
+2 -2
View File
@@ -36,8 +36,8 @@ public class NotIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v = (GraphTargetItem) stack.pop(); GraphTargetItem v = stack.pop();
stack.push(new NotItem(ins, v)); stack.push(new NotItem(ins, v));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIIns.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class SubtractIIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new SubtractAVM2Item(ins, v1, v2)); stack.push(new SubtractAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIns.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class SubtractIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new SubtractAVM2Item(ins, v1, v2)); stack.push(new SubtractAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java
+3 -3
View File
@@ -45,9 +45,9 @@ public class BitAndIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new BitAndAVM2Item(ins, v1, v2)); stack.push(new BitAndAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java
+2 -2
View File
@@ -44,8 +44,8 @@ public class BitNotIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v = (GraphTargetItem) stack.pop(); GraphTargetItem v = stack.pop();
stack.push(new BitNotAVM2Item(ins, v)); stack.push(new BitNotAVM2Item(ins, v));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java
+3 -3
View File
@@ -45,9 +45,9 @@ public class BitOrIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new BitOrAVM2Item(ins, v1, v2)); stack.push(new BitOrAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java
+3 -3
View File
@@ -45,9 +45,9 @@ public class BitXorIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new BitXorAVM2Item(ins, v1, v2)); stack.push(new BitXorAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/LShiftIns.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class LShiftIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new LShiftAVM2Item(ins, v1, v2)); stack.push(new LShiftAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/RShiftIns.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class RShiftIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new RShiftAVM2Item(ins, v1, v2)); stack.push(new RShiftAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/URShiftIns.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class URShiftIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new URShiftAVM2Item(ins, v1, v2)); stack.push(new URShiftAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/EqualsIns.java
+3 -3
View File
@@ -45,9 +45,9 @@ public class EqualsIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new EqAVM2Item(ins, v1, v2)); stack.push(new EqAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/GreaterEqualsIns.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class GreaterEqualsIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new GeAVM2Item(ins, v1, v2)); stack.push(new GeAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/GreaterThanIns.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class GreaterThanIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new GtAVM2Item(ins, v1, v2)); stack.push(new GtAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/LessEqualsIns.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class LessEqualsIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new LeAVM2Item(ins, v1, v2)); stack.push(new LeAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/LessThanIns.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class LessThanIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new LtAVM2Item(ins, v1, v2)); stack.push(new LtAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/StrictEqualsIns.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class StrictEqualsIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new StrictEqAVM2Item(ins, v1, v2)); stack.push(new StrictEqAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java
+3 -3
View File
@@ -75,13 +75,13 @@ public class ConstructIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) throws InterruptedException { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) throws InterruptedException {
int argCount = ins.operands[0]; int argCount = ins.operands[0];
List<GraphTargetItem> args = new ArrayList<>(); List<GraphTargetItem> args = new ArrayList<>();
for (int a = 0; a < argCount; a++) { for (int a = 0; a < argCount; a++) {
args.add(0, (GraphTargetItem) stack.pop()); args.add(0, stack.pop());
} }
GraphTargetItem obj = (GraphTargetItem) stack.pop(); GraphTargetItem obj = stack.pop();
FullMultinameAVM2Item xmlMult = null; FullMultinameAVM2Item xmlMult = null;
boolean isXML = false; boolean isXML = false;
src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java
+3 -3
View File
@@ -55,15 +55,15 @@ public class ConstructPropIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) throws InterruptedException { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) throws InterruptedException {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
int argCount = ins.operands[1]; int argCount = ins.operands[1];
List<GraphTargetItem> args = new ArrayList<>(); List<GraphTargetItem> args = new ArrayList<>();
for (int a = 0; a < argCount; a++) { for (int a = 0; a < argCount; a++) {
args.add(0, (GraphTargetItem) stack.pop()); args.add(0, stack.pop());
} }
FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins);
GraphTargetItem obj = (GraphTargetItem) stack.pop(); GraphTargetItem obj = stack.pop();
if (multiname.isXML(constants, localRegNames, fullyQualifiedNames)) { if (multiname.isXML(constants, localRegNames, fullyQualifiedNames)) {
if (args.size() == 1) { if (args.size() == 1) {
src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java
+3 -3
View File
@@ -51,13 +51,13 @@ public class ConstructSuperIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int argCount = ins.operands[0]; int argCount = ins.operands[0];
List<GraphTargetItem> args = new ArrayList<>(); List<GraphTargetItem> args = new ArrayList<>();
for (int a = 0; a < argCount; a++) { for (int a = 0; a < argCount; a++) {
args.add(0, (GraphTargetItem) stack.pop()); args.add(0, stack.pop());
} }
GraphTargetItem obj = (GraphTargetItem) stack.pop(); GraphTargetItem obj = stack.pop();
output.add(new ConstructSuperAVM2Item(ins, obj, args)); output.add(new ConstructSuperAVM2Item(ins, obj, args));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewActivationIns.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class NewActivationIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
stack.push(new NewActivationAVM2Item(ins)); stack.push(new NewActivationAVM2Item(ins));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewArrayIns.java
+2 -2
View File
@@ -37,11 +37,11 @@ public class NewArrayIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int argCount = ins.operands[0]; int argCount = ins.operands[0];
List<GraphTargetItem> args = new ArrayList<>(); List<GraphTargetItem> args = new ArrayList<>();
for (int a = 0; a < argCount; a++) { for (int a = 0; a < argCount; a++) {
args.add(0, (GraphTargetItem) stack.pop()); args.add(0, stack.pop());
} }
stack.push(new NewArrayAVM2Item(ins, args)); stack.push(new NewArrayAVM2Item(ins, args));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewCatchIns.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class NewCatchIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int exInfo = ins.operands[0]; int exInfo = ins.operands[0];
stack.push(new ExceptionAVM2Item(body.exceptions[exInfo])); stack.push(new ExceptionAVM2Item(body.exceptions[exInfo]));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class NewClassIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) throws InterruptedException { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) throws InterruptedException {
int clsIndex = ins.operands[0]; int clsIndex = ins.operands[0];
HilightedTextWriter writer = new HilightedTextWriter(Configuration.getCodeFormatting(), false); HilightedTextWriter writer = new HilightedTextWriter(Configuration.getCodeFormatting(), false);
stack.pop().toString(writer, LocalData.create(constants, localRegNames, fullyQualifiedNames)); stack.pop().toString(writer, LocalData.create(constants, localRegNames, fullyQualifiedNames));
src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewFunctionIns.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class NewFunctionIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int methodIndex = ins.operands[0]; int methodIndex = ins.operands[0];
NewFunctionAVM2Item function = new NewFunctionAVM2Item(ins, "", path, isStatic, scriptIndex, classIndex, abc, fullyQualifiedNames, constants, method_info, methodIndex); NewFunctionAVM2Item function = new NewFunctionAVM2Item(ins, "", path, isStatic, scriptIndex, classIndex, abc, fullyQualifiedNames, constants, method_info, methodIndex);
stack.push(function); stack.push(function);
src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewObjectIns.java
+3 -3
View File
@@ -38,12 +38,12 @@ public class NewObjectIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int argCount = ins.operands[0]; int argCount = ins.operands[0];
List<NameValuePair> args = new ArrayList<>(); List<NameValuePair> args = new ArrayList<>();
for (int a = 0; a < argCount; a++) { for (int a = 0; a < argCount; a++) {
GraphTargetItem value = (GraphTargetItem) stack.pop(); GraphTargetItem value = stack.pop();
GraphTargetItem name = (GraphTargetItem) stack.pop(); GraphTargetItem name = stack.pop();
args.add(0, new NameValuePair(name, value)); args.add(0, new NameValuePair(name, value));
} }
stack.push(new NewObjectAVM2Item(ins, args)); stack.push(new NewObjectAVM2Item(ins, args));
src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java
+4 -4
View File
@@ -51,14 +51,14 @@ public class CallIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int argCount = ins.operands[0]; int argCount = ins.operands[0];
List<GraphTargetItem> args = new ArrayList<>(); List<GraphTargetItem> args = new ArrayList<>();
for (int a = 0; a < argCount; a++) { for (int a = 0; a < argCount; a++) {
args.add(0, (GraphTargetItem) stack.pop()); args.add(0, stack.pop());
} }
GraphTargetItem receiver = (GraphTargetItem) stack.pop(); GraphTargetItem receiver = stack.pop();
GraphTargetItem function = (GraphTargetItem) stack.pop(); GraphTargetItem function = stack.pop();
stack.push(new CallAVM2Item(ins, receiver, function, args)); stack.push(new CallAVM2Item(ins, receiver, function, args));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java
+3 -3
View File
@@ -51,14 +51,14 @@ public class CallMethodIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int methodIndex = ins.operands[0]; int methodIndex = ins.operands[0];
int argCount = ins.operands[1]; int argCount = ins.operands[1];
List<GraphTargetItem> args = new ArrayList<>(); List<GraphTargetItem> args = new ArrayList<>();
for (int a = 0; a < argCount; a++) { for (int a = 0; a < argCount; a++) {
args.add(0, (GraphTargetItem) stack.pop()); args.add(0, stack.pop());
} }
GraphTargetItem receiver = (GraphTargetItem) stack.pop(); GraphTargetItem receiver = stack.pop();
String methodName = method_info.get(methodIndex).getName(constants); String methodName = method_info.get(methodIndex).getName(constants);
stack.push(new CallMethodAVM2Item(ins, receiver, methodName, args)); stack.push(new CallMethodAVM2Item(ins, receiver, methodName, args));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropLexIns.java
+3 -3
View File
@@ -38,15 +38,15 @@ public class CallPropLexIns extends CallPropertyIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
int argCount = ins.operands[1]; int argCount = ins.operands[1];
List<GraphTargetItem> args = new ArrayList<>(); List<GraphTargetItem> args = new ArrayList<>();
for (int a = 0; a < argCount; a++) { for (int a = 0; a < argCount; a++) {
args.add(0, (GraphTargetItem) stack.pop()); args.add(0, stack.pop());
} }
FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins);
GraphTargetItem receiver = (GraphTargetItem) stack.pop(); GraphTargetItem receiver = stack.pop();
stack.push(new CallPropertyAVM2Item(ins, false, receiver, multiname, args)); stack.push(new CallPropertyAVM2Item(ins, false, receiver, multiname, args));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java
+3 -3
View File
@@ -56,16 +56,16 @@ public class CallPropVoidIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
int argCount = ins.operands[1]; int argCount = ins.operands[1];
List<GraphTargetItem> args = new ArrayList<>(); List<GraphTargetItem> args = new ArrayList<>();
for (int a = 0; a < argCount; a++) { for (int a = 0; a < argCount; a++) {
args.add(0, (GraphTargetItem) stack.pop()); args.add(0, stack.pop());
} }
FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins);
GraphTargetItem receiver = (GraphTargetItem) stack.pop(); GraphTargetItem receiver = stack.pop();
output.add(new CallPropertyAVM2Item(ins, true, receiver, multiname, args)); output.add(new CallPropertyAVM2Item(ins, true, receiver, multiname, args));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java
+3 -3
View File
@@ -54,16 +54,16 @@ public class CallPropertyIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
int argCount = ins.operands[1]; int argCount = ins.operands[1];
List<GraphTargetItem> args = new ArrayList<>(); List<GraphTargetItem> args = new ArrayList<>();
for (int a = 0; a < argCount; a++) { for (int a = 0; a < argCount; a++) {
args.add(0, (GraphTargetItem) stack.pop()); args.add(0, stack.pop());
} }
FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins);
GraphTargetItem receiver = (GraphTargetItem) stack.pop(); GraphTargetItem receiver = stack.pop();
stack.push(new CallPropertyAVM2Item(ins, false, receiver, multiname, args)); stack.push(new CallPropertyAVM2Item(ins, false, receiver, multiname, args));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java
+3 -3
View File
@@ -51,14 +51,14 @@ public class CallStaticIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int methodIndex = ins.operands[0]; int methodIndex = ins.operands[0];
int argCount = ins.operands[1]; int argCount = ins.operands[1];
List<GraphTargetItem> args = new ArrayList<>(); List<GraphTargetItem> args = new ArrayList<>();
for (int a = 0; a < argCount; a++) { for (int a = 0; a < argCount; a++) {
args.add(0, (GraphTargetItem) stack.pop()); args.add(0, stack.pop());
} }
GraphTargetItem receiver = (GraphTargetItem) stack.pop(); GraphTargetItem receiver = stack.pop();
String methodName = method_info.get(methodIndex).getName(constants); String methodName = method_info.get(methodIndex).getName(constants);
stack.push(new CallStaticAVM2Item(ins, receiver, methodName, args)); stack.push(new CallStaticAVM2Item(ins, receiver, methodName, args));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java
+3 -3
View File
@@ -54,15 +54,15 @@ public class CallSuperIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
int argCount = ins.operands[1]; int argCount = ins.operands[1];
List<GraphTargetItem> args = new ArrayList<>(); List<GraphTargetItem> args = new ArrayList<>();
for (int a = 0; a < argCount; a++) { for (int a = 0; a < argCount; a++) {
args.add(0, (GraphTargetItem) stack.pop()); args.add(0, stack.pop());
} }
FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins);
GraphTargetItem receiver = (GraphTargetItem) stack.pop(); GraphTargetItem receiver = stack.pop();
stack.push(new CallSuperAVM2Item(ins, false, receiver, multiname, args)); stack.push(new CallSuperAVM2Item(ins, false, receiver, multiname, args));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java
+3 -3
View File
@@ -54,15 +54,15 @@ public class CallSuperVoidIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
int argCount = ins.operands[1]; int argCount = ins.operands[1];
List<GraphTargetItem> args = new ArrayList<>(); List<GraphTargetItem> args = new ArrayList<>();
for (int a = 0; a < argCount; a++) { for (int a = 0; a < argCount; a++) {
args.add(0, (GraphTargetItem) stack.pop()); args.add(0, stack.pop());
} }
FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins);
GraphTargetItem receiver = (GraphTargetItem) stack.pop(); GraphTargetItem receiver = stack.pop();
output.add(new CallSuperAVM2Item(ins, true, receiver, multiname, args)); output.add(new CallSuperAVM2Item(ins, true, receiver, multiname, args));
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfEqIns.java
+6 -6
View File
@@ -38,16 +38,16 @@ public class IfEqIns extends InstructionDefinition implements IfTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new EqAVM2Item(ins, v1, v2)); stack.push(new EqAVM2Item(ins, v1, v2));
} }
@Override @Override
public void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) { public void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new NeqAVM2Item(ins, v1, v2)); stack.push(new NeqAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfFalseIns.java
+3 -3
View File
@@ -37,13 +37,13 @@ public class IfFalseIns extends InstructionDefinition implements IfTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new NotItem(ins, v1)); stack.push(new NotItem(ins, v1));
} }
@Override @Override
public void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) { public void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) {
//String v1 = stack.pop().toString(); //String v1 = stack.pop().toString();
//stack.push("(" + v1 + ")"); //stack.push("(" + v1 + ")");
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGeIns.java
+6 -6
View File
@@ -38,16 +38,16 @@ public class IfGeIns extends InstructionDefinition implements IfTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new GeAVM2Item(ins, v1, v2)); stack.push(new GeAVM2Item(ins, v1, v2));
} }
@Override @Override
public void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) { public void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new LtAVM2Item(ins, v1, v2)); stack.push(new LtAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGtIns.java
+6 -6
View File
@@ -38,16 +38,16 @@ public class IfGtIns extends InstructionDefinition implements IfTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new GtAVM2Item(ins, v1, v2)); stack.push(new GtAVM2Item(ins, v1, v2));
} }
@Override @Override
public void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) { public void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new LeAVM2Item(ins, v1, v2)); stack.push(new LeAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLeIns.java
+6 -6
View File
@@ -38,16 +38,16 @@ public class IfLeIns extends InstructionDefinition implements IfTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new LeAVM2Item(ins, v1, v2)); stack.push(new LeAVM2Item(ins, v1, v2));
} }
@Override @Override
public void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) { public void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new GtAVM2Item(ins, v1, v2)); stack.push(new GtAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLtIns.java
+6 -6
View File
@@ -38,16 +38,16 @@ public class IfLtIns extends InstructionDefinition implements IfTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new LtAVM2Item(ins, v1, v2)); stack.push(new LtAVM2Item(ins, v1, v2));
} }
@Override @Override
public void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) { public void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new GeAVM2Item(ins, v1, v2)); stack.push(new GeAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGeIns.java
+6 -6
View File
@@ -38,16 +38,16 @@ public class IfNGeIns extends InstructionDefinition implements IfTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new LtAVM2Item(ins, v1, v2)); stack.push(new LtAVM2Item(ins, v1, v2));
} }
@Override @Override
public void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) { public void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new GeAVM2Item(ins, v1, v2)); stack.push(new GeAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGtIns.java
+6 -6
View File
@@ -38,16 +38,16 @@ public class IfNGtIns extends InstructionDefinition implements IfTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new LeAVM2Item(ins, v1, v2)); stack.push(new LeAVM2Item(ins, v1, v2));
} }
@Override @Override
public void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) { public void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new GtAVM2Item(ins, v1, v2)); stack.push(new GtAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLeIns.java
+6 -6
View File
@@ -38,16 +38,16 @@ public class IfNLeIns extends InstructionDefinition implements IfTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new GtAVM2Item(ins, v1, v2)); stack.push(new GtAVM2Item(ins, v1, v2));
} }
@Override @Override
public void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) { public void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new LeAVM2Item(ins, v1, v2)); stack.push(new LeAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLtIns.java
+6 -6
View File
@@ -38,16 +38,16 @@ public class IfNLtIns extends InstructionDefinition implements IfTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new GeAVM2Item(ins, v1, v2)); stack.push(new GeAVM2Item(ins, v1, v2));
} }
@Override @Override
public void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) { public void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new LtAVM2Item(ins, v1, v2)); stack.push(new LtAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNeIns.java
+6 -6
View File
@@ -38,16 +38,16 @@ public class IfNeIns extends InstructionDefinition implements IfTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new NeqAVM2Item(ins, v1, v2)); stack.push(new NeqAVM2Item(ins, v1, v2));
} }
@Override @Override
public void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) { public void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new EqAVM2Item(ins, v1, v2)); stack.push(new EqAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictEqIns.java
+6 -6
View File
@@ -38,16 +38,16 @@ public class IfStrictEqIns extends InstructionDefinition implements IfTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new StrictEqAVM2Item(ins, v1, v2)); stack.push(new StrictEqAVM2Item(ins, v1, v2));
} }
@Override @Override
public void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) { public void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new StrictNeqAVM2Item(ins, v1, v2)); stack.push(new StrictNeqAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictNeIns.java
+6 -6
View File
@@ -38,16 +38,16 @@ public class IfStrictNeIns extends InstructionDefinition implements IfTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new StrictNeqAVM2Item(ins, v1, v2)); stack.push(new StrictNeqAVM2Item(ins, v1, v2));
} }
@Override @Override
public void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) { public void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) {
GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v2 = stack.pop();
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new StrictEqAVM2Item(ins, v1, v2)); stack.push(new StrictEqAVM2Item(ins, v1, v2));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfTrueIns.java
+3 -3
View File
@@ -37,14 +37,14 @@ public class IfTrueIns extends InstructionDefinition implements IfTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
//String v1 = stack.pop().toString(); //String v1 = stack.pop().toString();
//stack.push("(" + v1 + ")"); //stack.push("(" + v1 + ")");
} }
@Override @Override
public void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) { public void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) {
GraphTargetItem v1 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = stack.pop();
stack.push(new NotItem(ins, v1)); stack.push(new NotItem(ins, v1));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/JumpIns.java
+2 -2
View File
@@ -36,11 +36,11 @@ public class JumpIns extends InstructionDefinition implements IfTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
//stack.push(new BooleanAVM2Item(ins, Boolean.TRUE));// + ins.operands[0]); //stack.push(new BooleanAVM2Item(ins, Boolean.TRUE));// + ins.operands[0]);
} }
@Override @Override
public void translateInverted(java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) { public void translateInverted(HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, AVM2Instruction ins) {
} }
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/LookupSwitchIns.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class LookupSwitchIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
//int defaultOffset = ins.operands[0]; //int defaultOffset = ins.operands[0];
//int caseCount = ins.operands[1]; //int caseCount = ins.operands[1];
//stack.push("switch(...)"); //stack.push("switch(...)");
src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class DecLocalIIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> regAssignCount, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> regAssignCount, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int regId = ins.operands[0]; int regId = ins.operands[0];
output.add(new DecLocalAVM2Item(ins, regId)); output.add(new DecLocalAVM2Item(ins, regId));
if (localRegs.containsKey(regId)) { if (localRegs.containsKey(regId)) {
src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class DecLocalIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> regAssignCount, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> regAssignCount, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int regId = ins.operands[0]; int regId = ins.operands[0];
output.add(new DecLocalAVM2Item(ins, regId)); output.add(new DecLocalAVM2Item(ins, regId));
if (localRegs.containsKey(regId)) { if (localRegs.containsKey(regId)) {
src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class GetLocal0Ins extends GetLocalTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
if ((classIndex >= abc.instance_info.size()) || classIndex < 0) { if ((classIndex >= abc.instance_info.size()) || classIndex < 0) {
stack.push(new ScriptAVM2Item(scriptIndex)); stack.push(new ScriptAVM2Item(scriptIndex));
return; return;
src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java
+1 -1
View File
@@ -37,7 +37,7 @@ public abstract class GetLocalTypeIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> regAssignCount, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> regAssignCount, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int regId = getRegisterId(ins); int regId = getRegisterId(ins);
GraphTargetItem computedValue = localRegs.get(regId); GraphTargetItem computedValue = localRegs.get(regId);
int assignCount = 0; int assignCount = 0;
src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIIns.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class IncLocalIIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> regAssignCount, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> regAssignCount, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int regId = ins.operands[0]; int regId = ins.operands[0];
output.add(new IncLocalAVM2Item(ins, regId)); output.add(new IncLocalAVM2Item(ins, regId));
if (localRegs.containsKey(regId)) { if (localRegs.containsKey(regId)) {
src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIns.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class IncLocalIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> regAssignCount, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> regAssignCount, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int regId = ins.operands[0]; int regId = ins.operands[0];
output.add(new IncLocalAVM2Item(ins, regId)); output.add(new IncLocalAVM2Item(ins, regId));
if (localRegs.containsKey(regId)) { if (localRegs.containsKey(regId)) {
src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/KillIns.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class KillIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
//kill local register //kill local register
} }
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java
+2 -2
View File
@@ -47,9 +47,9 @@ public abstract class SetLocalTypeIns extends InstructionDefinition implements S
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> regAssignCount, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> regAssignCount, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int regId = getRegisterId(ins); int regId = getRegisterId(ins);
GraphTargetItem value = (GraphTargetItem) stack.pop(); GraphTargetItem value = stack.pop();
/*if (localRegs.containsKey(regId)) { /*if (localRegs.containsKey(regId)) {
localRegs.put(regId, new NotCompileTimeAVM2Item(ins, value)); localRegs.put(regId, new NotCompileTimeAVM2Item(ins, value));
} else { } else {
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java
+2 -2
View File
@@ -50,10 +50,10 @@ public class DeletePropertyIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins);
GraphTargetItem obj = (GraphTargetItem) stack.pop(); GraphTargetItem obj = stack.pop();
stack.add(new BooleanAVM2Item(ins, Boolean.TRUE));//property successfully deleted stack.add(new BooleanAVM2Item(ins, Boolean.TRUE));//property successfully deleted
output.add(new DeletePropertyAVM2Item(ins, obj, multiname)); output.add(new DeletePropertyAVM2Item(ins, obj, multiname));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindDefIns.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class FindDefIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
Multiname multiname = constants.getMultiname(multinameIndex); Multiname multiname = constants.getMultiname(multinameIndex);
stack.push(new FindDefAVM2Item(ins, multiname)); stack.push(new FindDefAVM2Item(ins, multiname));
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class FindPropertyIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins);
stack.push(new FindPropertyAVM2Item(ins, multiname)); //resolve right object stack.push(new FindPropertyAVM2Item(ins, multiname)); //resolve right object
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class FindPropertyStrictIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins);
stack.push(new FindPropertyAVM2Item(ins, multiname)); stack.push(new FindPropertyAVM2Item(ins, multiname));
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java
+2 -2
View File
@@ -47,10 +47,10 @@ public class GetDescendantsIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins);
GraphTargetItem obj = (GraphTargetItem) stack.pop(); GraphTargetItem obj = stack.pop();
stack.push(new GetDescendantsAVM2Item(ins, obj, multiname)); stack.push(new GetDescendantsAVM2Item(ins, obj, multiname));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class GetGlobalScopeIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
if (scopeStack.isEmpty()) { if (scopeStack.isEmpty()) {
if (classIndex == -1) { if (classIndex == -1) {
stack.push(new ScriptAVM2Item(scriptIndex)); stack.push(new ScriptAVM2Item(scriptIndex));
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalSlotIns.java
+2 -2
View File
@@ -39,9 +39,9 @@ public class GetGlobalSlotIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int slotIndex = ins.operands[0]; int slotIndex = ins.operands[0];
GraphTargetItem obj = (GraphTargetItem) scopeStack.get(0); //scope GraphTargetItem obj = scopeStack.get(0); //scope
Multiname slotname = null; Multiname slotname = null;
if (obj instanceof ExceptionAVM2Item) { if (obj instanceof ExceptionAVM2Item) {
slotname = constants.getMultiname(((ExceptionAVM2Item) obj).exception.name_index); slotname = constants.getMultiname(((ExceptionAVM2Item) obj).exception.name_index);
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetLexIns.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class GetLexIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
Multiname multiname = constants.getMultiname(multinameIndex); Multiname multiname = constants.getMultiname(multinameIndex);
stack.push(new GetLexAVM2Item(ins, multiname)); stack.push(new GetLexAVM2Item(ins, multiname));
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetPropertyIns.java
+2 -2
View File
@@ -37,10 +37,10 @@ public class GetPropertyIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins);
GraphTargetItem obj = (GraphTargetItem) stack.pop(); GraphTargetItem obj = stack.pop();
stack.push(new GetPropertyAVM2Item(ins, obj, multiname)); stack.push(new GetPropertyAVM2Item(ins, obj, multiname));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetScopeObjectIns.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class GetScopeObjectIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int index = ins.operands[0]; int index = ins.operands[0];
stack.push(scopeStack.get(index)); stack.push(scopeStack.get(index));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSlotIns.java
+2 -2
View File
@@ -44,9 +44,9 @@ public class GetSlotIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int slotIndex = ins.operands[0]; int slotIndex = ins.operands[0];
GraphTargetItem obj = (GraphTargetItem) stack.pop(); //scope GraphTargetItem obj = stack.pop(); //scope
obj = obj.getThroughRegister(); obj = obj.getThroughRegister();
Multiname slotname = null; Multiname slotname = null;
if (obj instanceof ExceptionAVM2Item) { if (obj instanceof ExceptionAVM2Item) {
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSuperIns.java
+2 -2
View File
@@ -37,10 +37,10 @@ public class GetSuperIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins);
GraphTargetItem obj = (GraphTargetItem) stack.pop(); GraphTargetItem obj = stack.pop();
stack.push(new GetSuperAVM2Item(ins, obj, multiname)); stack.push(new GetSuperAVM2Item(ins, obj, multiname));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNext2Ins.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class HasNext2Ins extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int objectReg = ins.operands[0]; int objectReg = ins.operands[0];
int indexReg = ins.operands[1]; int indexReg = ins.operands[1];
//stack.push("_loc_" + objectReg + ".hasNext(cnt=_loc_" + indexReg + ")"); //stack.push("_loc_" + objectReg + ".hasNext(cnt=_loc_" + indexReg + ")");
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNextIns.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class HasNextIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem curIndex = (GraphTargetItem) stack.pop(); GraphTargetItem curIndex = stack.pop();
GraphTargetItem obj = (GraphTargetItem) stack.pop(); GraphTargetItem obj = stack.pop();
stack.push(new HasNextAVM2Item(ins, curIndex, obj)); stack.push(new HasNextAVM2Item(ins, curIndex, obj));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InIns.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class InIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem obj = (GraphTargetItem) stack.pop(); GraphTargetItem obj = stack.pop();
GraphTargetItem name = (GraphTargetItem) stack.pop(); GraphTargetItem name = stack.pop();
stack.push(new InAVM2Item(ins, name, obj)); stack.push(new InAVM2Item(ins, name, obj));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InitPropertyIns.java
+3 -3
View File
@@ -37,12 +37,12 @@ public class InitPropertyIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
GraphTargetItem val = (GraphTargetItem) stack.pop(); GraphTargetItem val = stack.pop();
FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins);
GraphTargetItem obj = (GraphTargetItem) stack.pop(); GraphTargetItem obj = stack.pop();
output.add(new InitPropertyAVM2Item(ins, obj, multiname, val)); output.add(new InitPropertyAVM2Item(ins, obj, multiname, val));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextNameIns.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class NextNameIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem index = stack.pop(); GraphTargetItem index = stack.pop();
GraphTargetItem obj = stack.pop(); GraphTargetItem obj = stack.pop();
stack.push(new NextNameAVM2Item(ins, index, obj)); stack.push(new NextNameAVM2Item(ins, index, obj));
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextValueIns.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class NextValueIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem index = stack.pop(); GraphTargetItem index = stack.pop();
GraphTargetItem obj = stack.pop(); GraphTargetItem obj = stack.pop();
stack.push(new NextValueAVM2Item(ins, index, obj)); stack.push(new NextValueAVM2Item(ins, index, obj));
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnValueIns.java
+2 -2
View File
@@ -36,8 +36,8 @@ public class ReturnValueIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
output.add(new ReturnValueAVM2Item(ins, (GraphTargetItem) stack.pop())); output.add(new ReturnValueAVM2Item(ins, stack.pop()));
} }
@Override @Override
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnVoidIns.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class ReturnVoidIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
output.add(new ReturnVoidAVM2Item(ins)); output.add(new ReturnVoidAVM2Item(ins));
} }
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java
+2 -2
View File
@@ -38,8 +38,8 @@ public class SetGlobalSlotIns extends InstructionDefinition implements SetTypeIn
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
output.add(new SetGlobalSlotAVM2Item(ins, ins.operands[0], (GraphTargetItem) stack.pop())); output.add(new SetGlobalSlotAVM2Item(ins, ins.operands[0], stack.pop()));
} }
@Override @Override
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java
+3 -3
View File
@@ -51,11 +51,11 @@ public class SetPropertyIns extends InstructionDefinition implements SetTypeIns
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
GraphTargetItem value = (GraphTargetItem) stack.pop(); GraphTargetItem value = stack.pop();
FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins);
GraphTargetItem obj = (GraphTargetItem) stack.pop(); GraphTargetItem obj = stack.pop();
if (value.getThroughDuplicate().getThroughRegister().getThroughDuplicate() instanceof IncrementAVM2Item) { if (value.getThroughDuplicate().getThroughRegister().getThroughDuplicate() instanceof IncrementAVM2Item) {
GraphTargetItem inside = ((IncrementAVM2Item) value.getThroughDuplicate().getThroughRegister().getThroughDuplicate()).value.getThroughRegister().getNotCoerced().getThroughDuplicate(); GraphTargetItem inside = ((IncrementAVM2Item) value.getThroughDuplicate().getThroughRegister().getThroughDuplicate()).value.getThroughRegister().getNotCoerced().getThroughDuplicate();
if (inside instanceof GetPropertyAVM2Item) { if (inside instanceof GetPropertyAVM2Item) {
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java
+3 -3
View File
@@ -55,10 +55,10 @@ public class SetSlotIns extends InstructionDefinition implements SetTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int slotIndex = ins.operands[0]; int slotIndex = ins.operands[0];
GraphTargetItem value = (GraphTargetItem) stack.pop(); GraphTargetItem value = stack.pop();
GraphTargetItem obj = (GraphTargetItem) stack.pop(); //scopeId GraphTargetItem obj = stack.pop(); //scopeId
GraphTargetItem objnoreg = obj; GraphTargetItem objnoreg = obj;
obj = obj.getThroughRegister(); obj = obj.getThroughRegister();
Multiname slotname = null; Multiname slotname = null;
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java
+3 -3
View File
@@ -42,12 +42,12 @@ public class SetSuperIns extends InstructionDefinition implements SetTypeIns {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
int multinameIndex = ins.operands[0]; int multinameIndex = ins.operands[0];
GraphTargetItem value = (GraphTargetItem) stack.pop(); GraphTargetItem value = stack.pop();
FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins);
GraphTargetItem obj = (GraphTargetItem) stack.pop(); GraphTargetItem obj = stack.pop();
output.add(new SetSuperAVM2Item(ins, value, obj, multiname)); output.add(new SetSuperAVM2Item(ins, value, obj, multiname));
} }
src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ThrowIns.java
+2 -2
View File
@@ -36,8 +36,8 @@ public class ThrowIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
output.add(new ThrowAVM2Item(ins, (GraphTargetItem) stack.pop())); output.add(new ThrowAVM2Item(ins, stack.pop()));
} }
@Override @Override
src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class DupIns extends InstructionDefinition {
} }
@Override @Override
public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, java.util.Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap<Integer, GraphTargetItem> localRegs, Stack<GraphTargetItem> stack, Stack<GraphTargetItem> scopeStack, ConstantPool constants, AVM2Instruction ins, List<MethodInfo> method_info, List<GraphTargetItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames, String path, HashMap<Integer, Integer> localRegsAssignmentIps, int ip, HashMap<Integer, List<Integer>> refs, AVM2Code code) {
GraphTargetItem v = stack.pop(); GraphTargetItem v = stack.pop();
stack.push(v); stack.push(v);
stack.push(new DuplicateItem(ins, v)); stack.push(new DuplicateItem(ins, v));

Some files were not shown because too many files have changed in this diff Show More