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

Fixed #1763 AS3 - initialization of activation object in some cases

Browse Source
This commit is contained in:
Jindra Petřík
2021-12-04 08:28:48 +01:00
parent 9e6548ceb0
commit 4197e4913b
11 changed files with 161 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/FinalProcessLocalData.java
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;
import com.jpexs.decompiler.graph.Loop;

21
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2FinalProcessLocalData.java Normal file
View File

@@ -0,0 +1,21 @@
package com.jpexs.decompiler.flash.abc.avm2;
import com.jpexs.decompiler.flash.FinalProcessLocalData;
import com.jpexs.decompiler.graph.Loop;
import java.util.HashMap;
import java.util.List;
/**
*
* @author JPEXS
*/
public class AVM2FinalProcessLocalData extends FinalProcessLocalData {
public HashMap<Integer, String> localRegNames;
public AVM2FinalProcessLocalData(List<Loop> loops, HashMap<Integer, String> localRegNames) {
super(loops);
this.localRegNames = localRegNames;
}
}

23
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java
View File

@@ -21,6 +21,7 @@ import com.jpexs.decompiler.flash.FinalProcessLocalData;
import com.jpexs.decompiler.flash.abc.ABC;
import com.jpexs.decompiler.flash.abc.AVM2LocalData;
import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
import com.jpexs.decompiler.flash.abc.avm2.AVM2FinalProcessLocalData;
import com.jpexs.decompiler.flash.abc.avm2.CodeStats;
import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition;
@@ -46,6 +47,7 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.stack.PushByteIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.stack.PushScopeIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.types.CoerceAIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.types.ConvertIIns;
import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.ConstructAVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.FilteredCheckAVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.model.FindPropertyAVM2Item;
@@ -114,6 +116,7 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
@@ -1966,6 +1969,24 @@ public class AVM2Graph extends Graph {
Map<Integer, String> localRegNames = body.getLocalRegNames(abc);
loopi:
for (int i = 0; i < list.size(); i++) {
if (list.get(i) instanceof SetPropertyAVM2Item) {
SetPropertyAVM2Item sp = (SetPropertyAVM2Item) list.get(i);
if (sp.object instanceof FindPropertyAVM2Item) {
if (sp.propertyName instanceof FullMultinameAVM2Item) {
FullMultinameAVM2Item propName = (FullMultinameAVM2Item) sp.propertyName;
if (sp.value instanceof LocalRegAVM2Item) {
LocalRegAVM2Item lr = (LocalRegAVM2Item) sp.value;
AVM2FinalProcessLocalData aLocalData = (AVM2FinalProcessLocalData) localData;
if (Objects.equals(propName.resolvedMultinameName, AVM2Item.localRegName(aLocalData.localRegNames, lr.regIndex))) {
list.remove(i);
i--;
continue loopi;
}
}
}
}
}
if (list.get(i) instanceof SetSlotAVM2Item) {
SetSlotAVM2Item sslot = (SetSlotAVM2Item) list.get(i);
if (sslot.slotObject instanceof NewActivationAVM2Item) {
@@ -2155,7 +2176,7 @@ public class AVM2Graph extends Graph {
@Override
protected FinalProcessLocalData getFinalData(BaseLocalData localData, List<Loop> loops, List<ThrowState> throwStates) {
FinalProcessLocalData finalProcess = super.getFinalData(localData, loops, throwStates);
FinalProcessLocalData finalProcess = new AVM2FinalProcessLocalData(loops, ((AVM2LocalData) localData).localRegNames);
finalProcess.registerUsage = ((AVM2LocalData) localData).setLocalPosToGetLocalPos;
return finalProcess;
}