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

assembled TestIncrement/2 fix

Browse Source
This commit is contained in:
Jindra Petřík
2025-08-31 18:52:55 +02:00
parent 46b05de1b3
commit e9a16ece18
2 changed files with 46 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java
View File

@@ -567,54 +567,6 @@ public abstract class InstructionDefinition implements Serializable {
/*
//assembled/TestIncrement
if ((value instanceof IncrementAVM2Item) || (value instanceof DecrementAVM2Item)) {
boolean isIncrement = (value instanceof IncrementAVM2Item);
if (value.value instanceof DuplicateItem) {
GraphTargetItem duplicated = value.value.value.getThroughDuplicate();
stack.moveToStack(output);
if (!stack.isEmpty()) {
if (stack.peek().getThroughDuplicate() == duplicated) {
GraphTargetItem notCoerced = duplicated.getNotCoerced();
if (notCoerced instanceof GetLexAVM2Item) {
GetLexAVM2Item getLex = (GetLexAVM2Item) notCoerced;
if (localData.abc.constants.getMultiname(multinameIndex).equals(getLex.propertyName)
&& (obj instanceof FindPropertyAVM2Item)) {
stack.pop();
if (isIncrement) {
stack.push(new PostIncrementAVM2Item(ins, localData.lineStartInstruction, getLex));
} else {
stack.push(new PostDecrementAVM2Item(ins, localData.lineStartInstruction, getLex));
}
return;
}
}
if (notCoerced instanceof GetPropertyAVM2Item) {
GetPropertyAVM2Item getProp = (GetPropertyAVM2Item) notCoerced;
if (((FullMultinameAVM2Item) getProp.propertyName).compareSame(multiname)) {
if ((getProp.object instanceof DuplicateItem) || (getProp.object instanceof DuplicateSourceItem)) { //assembled/TestIncrement3
if (getProp.object.value == obj.getThroughDuplicate()) {
getProp.object = obj.getThroughDuplicate();
}
}
if (Objects.equals(obj, getProp.object)) {
stack.pop();
if (isIncrement) {
stack.push(new PostIncrementAVM2Item(ins, localData.lineStartInstruction, getProp));
} else {
stack.push(new PostDecrementAVM2Item(ins, localData.lineStartInstruction, getProp));
}
return;
}
}
}
}
}
}
}
if ((value instanceof IncrementAVM2Item) || (value instanceof DecrementAVM2Item)) {
boolean isIncrement = (value instanceof IncrementAVM2Item);
@@ -668,45 +620,7 @@ public abstract class InstructionDefinition implements Serializable {
}
}
}
//assembled/TestIncrement2
if (value instanceof DuplicateItem) {
GraphTargetItem duplicated = value.value;
if ((duplicated instanceof IncrementAVM2Item) || (duplicated instanceof DecrementAVM2Item)) {
boolean isIncrement = (duplicated instanceof IncrementAVM2Item);
stack.moveToStack(output);
if (!stack.isEmpty()) {
if (stack.peek().getThroughDuplicate() == duplicated.getThroughDuplicate()) {
GraphTargetItem incrementedProp = duplicated.value;
if (incrementedProp instanceof GetLexAVM2Item) {
GetLexAVM2Item getLex = (GetLexAVM2Item) incrementedProp;
if (localData.abc.constants.getMultiname(multinameIndex).equals(getLex.propertyName)
&& (obj instanceof FindPropertyAVM2Item)) {
stack.pop();
if (isIncrement) {
stack.push(new PreIncrementAVM2Item(ins, localData.lineStartInstruction, getLex));
} else {
stack.push(new PreDecrementAVM2Item(ins, localData.lineStartInstruction, getLex));
}
return;
}
}
if (incrementedProp instanceof GetPropertyAVM2Item) {
GetPropertyAVM2Item getProp = (GetPropertyAVM2Item) incrementedProp;
if (((FullMultinameAVM2Item) getProp.propertyName).compareSame(multiname)
&& (Objects.equals(getProp.object, obj))) {
stack.pop();
if (isIncrement) {
stack.push(new PreIncrementAVM2Item(ins, localData.lineStartInstruction, getProp));
} else {
stack.push(new PreDecrementAVM2Item(ins, localData.lineStartInstruction, getProp));
}
return;
}
}
}
}
}
}
if (value instanceof LocalRegAVM2Item) {
LocalRegAVM2Item valueLocalReg = (LocalRegAVM2Item) value;
LocalRegAVM2Item nameLocalReg = null;
@@ -1274,23 +1188,34 @@ public abstract class InstructionDefinition implements Serializable {
if (st.value instanceof IncrementAVM2Item
|| st.value instanceof DecrementAVM2Item) {
boolean isIncrement = st.value instanceof IncrementAVM2Item;
if (st.value.value instanceof GetPropertyAVM2Item) {
boolean ok = false;
//assembled.TestIncrement2
if (st.value.value instanceof GetLexAVM2Item) {
GetLexAVM2Item getLex = (GetLexAVM2Item) st.value.value;
if (localData.abc.constants.getMultiname(multinameIndex).equals(getLex.propertyName)) {
ok = true;
}
} else if (st.value.value instanceof GetPropertyAVM2Item) {
GetPropertyAVM2Item getProp = (GetPropertyAVM2Item) st.value.value;
if (getProp.propertyName instanceof FullMultinameAVM2Item) {
FullMultinameAVM2Item fm = (FullMultinameAVM2Item) getProp.propertyName;
if (fm.compareSame(multiname)) {
output.remove(output.size() - 1);
stack.pop();
stack.moveToStack(output);
if (isIncrement) {
stack.push(new PreIncrementAVM2Item(st.value.getSrc(), st.value.getLineStartItem(), getProp));
} else {
stack.push(new PreDecrementAVM2Item(st.value.getSrc(), st.value.getLineStartItem(), getProp));
}
return;
ok = true;
}
}
}
if (ok) {
output.remove(output.size() - 1);
stack.pop();
stack.moveToStack(output);
if (isIncrement) {
stack.push(new PreIncrementAVM2Item(st.value.getSrc(), st.value.getLineStartItem(), st.value.value));
} else {
stack.push(new PreDecrementAVM2Item(st.value.getSrc(), st.value.getLineStartItem(), st.value.value));
}
return;
}
}
}
}
@@ -1340,23 +1265,34 @@ public abstract class InstructionDefinition implements Serializable {
SetTemporaryItem st = (SetTemporaryItem) output.get(output.size() - 2);
if (st.tempIndex == d.tempIndex) {
if (st.value instanceof ConvertAVM2Item) {
if (st.value.value instanceof GetPropertyAVM2Item) {
boolean ok = false;
//assembled.TestIncrement
if (st.value.value instanceof GetLexAVM2Item) {
GetLexAVM2Item getLex = (GetLexAVM2Item) st.value.value;
if (localData.abc.constants.getMultiname(multinameIndex).equals(getLex.propertyName)) {
ok = true;
}
} else if (st.value.value instanceof GetPropertyAVM2Item) {
GetPropertyAVM2Item getProp = (GetPropertyAVM2Item) st.value.value;
if (getProp.propertyName instanceof FullMultinameAVM2Item) {
FullMultinameAVM2Item fm = (FullMultinameAVM2Item) getProp.propertyName;
if (fm.compareSame(multiname)) {
output.remove(output.size() - 1);
output.remove(output.size() - 1);
stack.moveToStack(output);
if (isIncrement) {
stack.push(new PostIncrementAVM2Item(value.getSrc(), value.getLineStartItem(), getProp));
} else {
stack.push(new PostDecrementAVM2Item(value.getSrc(), value.getLineStartItem(), getProp));
}
return;
ok = true;
}
}
}
if (ok) {
output.remove(output.size() - 1);
output.remove(output.size() - 1);
stack.moveToStack(output);
if (isIncrement) {
stack.push(new PostIncrementAVM2Item(value.getSrc(), value.getLineStartItem(), st.value.value));
} else {
stack.push(new PostDecrementAVM2Item(value.getSrc(), value.getLineStartItem(), st.value.value));
}
return;
}
}
}
}

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

@@ -107,6 +107,9 @@ public class TranslateStack extends Stack<GraphTargetItem> {
}
private boolean isDupsOnly() {
if (true) {
return false;
}
for (GraphTargetItem item : this) {
if (item instanceof DuplicateItem) {
continue;