LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-30 16:47:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Comma expression improvements. WIP

Browse Source 
However, tests fail :-(
This commit is contained in:
Jindra Petřík
2025-08-02 12:01:16 +02:00
parent a436ddd65c
commit 95b7abb9bc
12 changed files with 65 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -493,6 +493,12 @@ public abstract class InstructionDefinition implements Serializable {
* @return Slot multiname or null if not found
*/
private static Multiname searchSlotName(int slotIndex, AVM2LocalData localData, GraphTargetItem obj, int multiNameIndex, Reference<GraphTargetItem> realObj) {
if (obj instanceof CommaExpressionItem) {
CommaExpressionItem ce = (CommaExpressionItem) obj;
if (!ce.commands.isEmpty()) {
obj = ce.commands.get(ce.commands.size() - 1);
}
}
if ((obj instanceof ExceptionAVM2Item) && (multiNameIndex == -1 || ((ExceptionAVM2Item) obj).exception.name_index == multiNameIndex)) {
return localData.getConstants().getMultiname(((ExceptionAVM2Item) obj).exception.name_index);
}

10
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java
View File

@@ -35,6 +35,7 @@ import com.jpexs.decompiler.flash.abc.avm2.model.operations.PreDecrementAVM2Item
import com.jpexs.decompiler.flash.abc.avm2.model.operations.PreIncrementAVM2Item;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.TranslateStack;
import com.jpexs.decompiler.graph.model.CommaExpressionItem;
import com.jpexs.decompiler.graph.model.CompoundableBinaryOp;
import com.jpexs.decompiler.graph.model.DuplicateItem;
import com.jpexs.decompiler.graph.model.PopItem;
@@ -74,8 +75,13 @@ public abstract class SetLocalTypeIns extends InstructionDefinition implements S
} else {
localRegs.put(regId, value);
}*/
if (!(value instanceof PopItem)) {
localData.localRegs.put(regId, value);
if (value instanceof CommaExpressionItem) {
CommaExpressionItem ce = (CommaExpressionItem) value;
if (!ce.commands.isEmpty()) {
localData.localRegs.put(regId, ce.commands.get(ce.commands.size() - 1));
}
} else if (!(value instanceof PopItem)) {
localData.localRegs.put(regId, value);
}
if (!localData.localRegAssignmentIps.containsKey(regId)) {
localData.localRegAssignmentIps.put(regId, 0);

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java
View File

@@ -238,7 +238,13 @@ public class CallAVM2Item extends AVM2Item {
if (a > 0) {
writer.allowWrapHere().append(",");
}
if (arguments.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append("(");
}
arguments.get(a).toString(writer, localData);
if (arguments.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append(")");
}
}
return writer.append(")");
}

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallMethodAVM2Item.java
View File

@@ -85,7 +85,13 @@ public class CallMethodAVM2Item extends AVM2Item {
if (a > 0) {
writer.allowWrapHere().append(",");
}
if (arguments.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append("(");
}
arguments.get(a).toString(writer, localData);
if (arguments.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append(")");
}
}
return writer.append(")");
}

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallPropertyAVM2Item.java
View File

@@ -104,7 +104,13 @@ public class CallPropertyAVM2Item extends AVM2Item {
if (a > 0) {
writer.allowWrapHere().append(",");
}
if (arguments.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append("(");
}
arguments.get(a).toString(writer, localData);
if (arguments.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append(")");
}
}
return writer.append(")");
}

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallStaticAVM2Item.java
View File

@@ -86,7 +86,13 @@ public class CallStaticAVM2Item extends AVM2Item {
if (a > 0) {
writer.append(",");
}
if (arguments.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append("(");
}
arguments.get(a).toString(writer, localData);
if (arguments.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append(")");
}
}
return writer.append(")");
}

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/CallSuperAVM2Item.java
View File

@@ -91,7 +91,13 @@ public class CallSuperAVM2Item extends AVM2Item {
if (a > 0) {
writer.append(",");
}
if (arguments.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append("(");
}
arguments.get(a).toString(writer, localData);
if (arguments.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append(")");
}
}
return writer.append(")");
}

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructAVM2Item.java
View File

@@ -127,7 +127,13 @@ public class ConstructAVM2Item extends AVM2Item {
if (a > 0) {
writer.allowWrapHere().append(",");
}
if (args.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append("(");
}
args.get(a).toString(writer, localData);
if (args.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append(")");
}
}
return writer.append(")");
}

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructPropAVM2Item.java
View File

@@ -125,7 +125,13 @@ public class ConstructPropAVM2Item extends AVM2Item {
if (a > 0) {
writer.allowWrapHere().append(",");
}
if (args.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append("(");
}
args.get(a).toString(writer, localData);
if (args.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append(")");
}
}
return writer.append(")");
}

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java
View File

@@ -79,7 +79,13 @@ public class ConstructSuperAVM2Item extends AVM2Item {
if (a > 0) {
writer.allowWrapHere().append(",");
}
if (args.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append("(");
}
args.get(a).toString(writer, localData);
if (args.get(a).getPrecedence() >= PRECEDENCE_COMMA) {
writer.append(")");
}
}
return writer.append(")");
}

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

@@ -3367,8 +3367,9 @@ public class Graph {
}
}
if (code.size() <= part.start) {
if (code.size() <= part.start) {
if (!(!ret.isEmpty() && ret.get(ret.size() - 1) instanceof ExitItem)) {
stack.setConnectedOutput(0, ret);
stack.addToOutput(new ScriptEndItem(dialect));
}
return ret;

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/CommaExpressionItem.java
View File

@@ -65,7 +65,7 @@ public class CommaExpressionItem extends GraphTargetItem {
continue;
}
if (!first) {
writer.append(", ");
writer.allowWrapHere().append(",");
}
t.toString(writer, localData);
first = false;