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

not inlining setlocal..getlocal, better increment/decrement property support

Browse Source
This commit is contained in:
Jindra Petřík
2021-02-08 20:15:19 +01:00
parent e7e3ed3e5c
commit 866c32be83
12 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
+1
View File
@@ -694,6 +694,7 @@ public class ABC {
SWFDecompilerPlugin.fireMethodBodyParsed(this, mb, swf);
}
//this will read all method body codes. TODO: make this ondemand
refreshMultinameNamespaceSuffixes();
getMethodIndexing();
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
+3 -2
View File
@@ -1577,7 +1577,7 @@ public class AVM2Code implements Cloneable {
}
}
}
if ((ins.definition instanceof SetLocalTypeIns) && (ip + 1 <= end)) { // set_local_x,get_local_x.. no other local_x get
/*if ((ins.definition instanceof SetLocalTypeIns) && (ip + 1 <= end)) { // set_local_x,get_local_x.. no other local_x get
AVM2Instruction insAfter = code.get(ip + 1);
Set<Integer> usages = setLocalPosToGetLocalPos.containsKey(ip) ? setLocalPosToGetLocalPos.get(ip) : new HashSet<>();
@@ -1590,7 +1590,8 @@ public class AVM2Code implements Cloneable {
ip++;
continue iploop;
}
} else if (ins.definition instanceof DupIns) {
} else*/
if (ins.definition instanceof DupIns) {
int nextPos;
do {
AVM2Instruction insAfter = ip + 1 < code.size() ? code.get(ip + 1) : null;
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java
+3 -3
View File
@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.␍ */
* License along with this library.
*/
package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs;
import com.jpexs.decompiler.flash.abc.ABC;
@@ -136,8 +137,7 @@ public abstract class SetLocalTypeIns extends InstructionDefinition implements S
}
@Override
public int getStackPopCount(AVM2Instruction ins, ABC abc
) {
public int getStackPopCount(AVM2Instruction ins, ABC abc) {
return 1;
}
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java
+18 -17
View File
@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.␍ */
* License along with this library.
*/
package com.jpexs.decompiler.flash.abc.avm2.instructions.other;
import com.jpexs.decompiler.flash.abc.ABC;
@@ -24,6 +25,7 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns;
import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.ApplyTypeAVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.ConstructAVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.ConvertAVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.DecrementAVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.GetLexAVM2Item;
@@ -63,8 +65,10 @@ public class SetPropertyIns extends InstructionDefinition implements SetTypeIns
SetLocalAVM2Item valueSetLocalReg = (SetLocalAVM2Item) item;
if ((valueSetLocalReg.value instanceof IncrementAVM2Item) || (valueSetLocalReg.value instanceof DecrementAVM2Item)) {
boolean isIncrement = (valueSetLocalReg.value instanceof IncrementAVM2Item);
if (valueSetLocalReg.value.value instanceof GetPropertyAVM2Item) {
GetPropertyAVM2Item getProperty = (GetPropertyAVM2Item) valueSetLocalReg.value.value;
boolean hasConvert = valueSetLocalReg.value.value instanceof ConvertAVM2Item; //in air there is convert added when postincrement
if (valueSetLocalReg.value.value.getNotCoercedNoDup() instanceof GetPropertyAVM2Item) {
GetPropertyAVM2Item getProperty = (GetPropertyAVM2Item) valueSetLocalReg.value.value.getNotCoercedNoDup();
FullMultinameAVM2Item propertyName = ((FullMultinameAVM2Item) getProperty.propertyName);
SetLocalAVM2Item nameSetLocalReg = null;
if (propertyName.name instanceof SetLocalAVM2Item) {
@@ -82,18 +86,16 @@ public class SetPropertyIns extends InstructionDefinition implements SetTypeIns
}
getProperty.object = objSetLocalReg.value;
if (standalone) {
if (isIncrement) {
if (isIncrement) {
if (hasConvert && standalone) {
return new PostIncrementAVM2Item(ins, localData.lineStartInstruction, getProperty);
} else {
}
return new PreIncrementAVM2Item(ins, localData.lineStartInstruction, getProperty);
} else {
if (hasConvert && standalone) {
return new PostDecrementAVM2Item(ins, localData.lineStartInstruction, getProperty);
}
} else {
if (isIncrement) {
return new PreIncrementAVM2Item(ins, localData.lineStartInstruction, getProperty);
} else {
return new PreDecrementAVM2Item(ins, localData.lineStartInstruction, getProperty);
}
return new PreDecrementAVM2Item(ins, localData.lineStartInstruction, getProperty);
}
}
}
@@ -169,9 +171,9 @@ public class SetPropertyIns extends InstructionDefinition implements SetTypeIns
if (getProp.object.value == obj) {
getProp.object = obj;
if (isIncrement) {
output.add(new PostIncrementAVM2Item(ins, localData.lineStartInstruction, getProp));
output.add(new PreIncrementAVM2Item(ins, localData.lineStartInstruction, getProp));
} else {
output.add(new PostDecrementAVM2Item(ins, localData.lineStartInstruction, getProp));
output.add(new PreDecrementAVM2Item(ins, localData.lineStartInstruction, getProp));
}
return;
}
@@ -188,7 +190,7 @@ public class SetPropertyIns extends InstructionDefinition implements SetTypeIns
if (obj instanceof LocalRegAVM2Item) {
LocalRegAVM2Item objLocalReg = (LocalRegAVM2Item) obj;
if (!output.isEmpty() && !stack.isEmpty()) {
if (!output.isEmpty()) {
if (output.get(output.size() - 1) instanceof SetLocalAVM2Item) {
SetLocalAVM2Item valueSetLocalReg = (SetLocalAVM2Item) output.get(output.size() - 1);
if ((valueSetLocalReg.value instanceof IncrementAVM2Item)
@@ -196,7 +198,7 @@ public class SetPropertyIns extends InstructionDefinition implements SetTypeIns
boolean isIncrement = (valueSetLocalReg.value instanceof IncrementAVM2Item);
if (valueSetLocalReg.value.value instanceof DuplicateItem) {
GraphTargetItem duplicated = valueSetLocalReg.value.value.value;
if (stack.peek() == duplicated) {
if (!stack.isEmpty() && stack.peek() == duplicated) {
GraphTargetItem notCoerced = duplicated.getNotCoerced();
if (notCoerced instanceof GetPropertyAVM2Item) {
GetPropertyAVM2Item getProperty = (GetPropertyAVM2Item) notCoerced;
@@ -249,7 +251,6 @@ public class SetPropertyIns extends InstructionDefinition implements SetTypeIns
return;
}
}
}
}
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java
+5
View File
@@ -22,6 +22,7 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool;
import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea;
import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition;
import com.jpexs.decompiler.flash.abc.avm2.model.FindPropertyAVM2Item;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.MarkItem;
import com.jpexs.decompiler.graph.TranslateStack;
@@ -54,6 +55,10 @@ public class PopIns extends InstructionDefinition {
return;
}
if (top instanceof FindPropertyAVM2Item) {
return;
}
output.add(top);
}