LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-29 18:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

newclass fix

Browse Source
This commit is contained in:
Jindra Petřík
2025-08-31 17:12:54 +02:00
parent 76c291929c
commit d57e2cae31
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java
View File

@@ -27,7 +27,9 @@ import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
import com.jpexs.decompiler.flash.helpers.HighlightedTextWriter;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.TranslateStack;
import com.jpexs.decompiler.graph.model.DuplicateSourceItem;
import com.jpexs.decompiler.graph.model.LocalData;
import com.jpexs.decompiler.graph.model.SetTemporaryItem;
import java.util.HashSet;
import java.util.List;
@@ -49,7 +51,19 @@ public class NewClassIns extends InstructionDefinition {
public void translate(AVM2LocalData localData, TranslateStack stack, AVM2Instruction ins, List<GraphTargetItem> output, String path) throws InterruptedException {
int clsIndex = ins.operands[0];
HighlightedTextWriter writer = new HighlightedTextWriter(Configuration.getCodeFormatting(), false);
stack.pop().toString(writer, LocalData.create(localData.callStack /*??*/, localData.abcIndex, localData.abc, localData.localRegNames, localData.fullyQualifiedNames, new HashSet<>(), ScriptExportMode.AS, localData.swfVersion, localData.usedDeobfuscations));
GraphTargetItem obj = stack.pop();
if (obj instanceof DuplicateSourceItem) {
DuplicateSourceItem ds = (DuplicateSourceItem) obj;
if (!output.isEmpty() && output.get(output.size() - 1) instanceof SetTemporaryItem) {
SetTemporaryItem st = (SetTemporaryItem) output.get(output.size() - 1);
if (ds.tempIndex == st.tempIndex) {
output.remove(output.size() - 1);
stack.moveToStack(output);
}
}
}
obj.toString(writer, LocalData.create(localData.callStack /*??*/, localData.abcIndex, localData.abc, localData.localRegNames, localData.fullyQualifiedNames, new HashSet<>(), ScriptExportMode.AS, localData.swfVersion, localData.usedDeobfuscations));
writer.finishHilights();
String baseType = writer.toString();
ABC abc = localData.abc;

3
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/TranslateStack.java
View File

@@ -347,6 +347,9 @@ public class TranslateStack extends Stack<GraphTargetItem> {
}
public void finishBlock(List<GraphTargetItem> output) {
if (connectedOutput == null) {
return;
}
/*int pos = output.size();
for (int i = size() - 1; i >= 0; i--) {