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

Fixed: Try..catch.finally vs loops

Browse Source
This commit is contained in:
Jindra Petřík
2021-02-08 20:15:19 +01:00
parent 8878940754
commit f6744eafb9
20 changed files with 866 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java
+3 -1
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.action;
import com.jpexs.decompiler.flash.AppResources;
@@ -867,6 +868,7 @@ public abstract class Action implements GraphSourceItem {
throw ex;
} catch (Exception | OutOfMemoryError | StackOverflowError ex) {
ex.printStackTrace();
convertException = ex;
Throwable cause = ex.getCause();
if (ex instanceof ExecutionException && cause instanceof Exception) {
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionGraph.java
+3 -3
View File
@@ -377,7 +377,7 @@ public class ActionGraph extends Graph {
*/
//must go backwards to hit case 2, not case 1
for (int i = caseBodyParts.size() - 1; i >= 0; i--) {
if (caseBodyParts.get(i).leadsTo(localData, this, code, defaultPart, loops)) {
if (caseBodyParts.get(i).leadsTo(localData, this, code, defaultPart, loops, false)) {
DefaultItem di = new DefaultItem();
caseValuesMap.add(i + 1, di);
caseBodyParts.add(i + 1, defaultPart);
@@ -398,7 +398,7 @@ public class ActionGraph extends Graph {
trace("2");
*/
for (int i = 0; i < caseBodyParts.size(); i++) {
if (defaultPart.leadsTo(localData, this, code, caseBodyParts.get(i), loops)) {
if (defaultPart.leadsTo(localData, this, code, caseBodyParts.get(i), loops, false)) {
DefaultItem di = new DefaultItem();
caseValuesMap.add(i, di);
caseBodyParts.add(i, defaultPart);
@@ -448,7 +448,7 @@ public class ActionGraph extends Graph {
GraphPart nextCase = next;
if (next != null) {
if (i < caseBodies.size() - 1) {
if (!caseBodies.get(i).leadsTo(localData, this, code, caseBodies.get(i + 1), loops)) {
if (!caseBodies.get(i).leadsTo(localData, this, code, caseBodies.get(i + 1), loops, false)) {
currentCaseCommands.add(new BreakItem(null, localData.lineStartInstruction, currentLoop.id));
} else {
nextCase = caseBodies.get(i + 1);
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java
+45 -33
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.action.swf7;
import com.jpexs.decompiler.flash.SWFInputStream;
@@ -35,6 +36,9 @@ import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemContainer;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.TranslateStack;
import com.jpexs.decompiler.graph.model.BreakItem;
import com.jpexs.decompiler.graph.model.ContinueItem;
import com.jpexs.decompiler.graph.model.ExitItem;
import com.jpexs.decompiler.graph.model.IfItem;
import com.jpexs.decompiler.graph.model.PopItem;
import com.jpexs.decompiler.graph.model.PushItem;
@@ -300,43 +304,51 @@ public class ActionTry extends Action implements GraphSourceItemContainer {
catchExceptionTypes.add(co.constructor);
if (body.get(pos + 1) instanceof IfItem) {
IfItem ifi = (IfItem) body.get(pos + 1);
if (!ifi.onTrue.isEmpty()) {
if (ifi.onTrue.get(0) instanceof DefineLocalActionItem) {
DefineLocalActionItem dl = (DefineLocalActionItem) ifi.onTrue.get(0);
catchExceptionNames.add(dl.name);
List<GraphTargetItem> catchBody = new ArrayList<>(ifi.onTrue);
catchBody.remove(0);
catchCommands.add(catchBody);
if (!ifi.onFalse.isEmpty()) {
if (ifi.onFalse.get(0) instanceof PopItem) {
pos = 1;
body = ifi.onFalse;
continue loopex;
} else {
break;
}
List<GraphTargetItem> onFalse = ifi.onFalse;
int onFalsePos = 0;
if (ifi.onFalse.isEmpty() && !ifi.onTrue.isEmpty() && ((ifi.onTrue.get(ifi.onTrue.size() - 1) instanceof ExitItem)
|| (ifi.onTrue.get(ifi.onTrue.size() - 1) instanceof BreakItem)
|| (ifi.onTrue.get(ifi.onTrue.size() - 1) instanceof ContinueItem))) {
onFalse = body;
onFalsePos = pos + 2;
}
if (!ifi.onTrue.isEmpty() && (ifi.onTrue.get(0) instanceof DefineLocalActionItem)) {
DefineLocalActionItem dl = (DefineLocalActionItem) ifi.onTrue.get(0);
catchExceptionNames.add(dl.name);
List<GraphTargetItem> catchBody = new ArrayList<>(ifi.onTrue);
catchBody.remove(0);
catchCommands.add(catchBody);
if (onFalse.size() > onFalsePos) {
if (onFalse.get(onFalsePos) instanceof PopItem) {
pos = onFalsePos + 1;
body = onFalse;
continue loopex;
} else {
break;
}
/*if (body.size() == pos + 4) {
if (body.get(pos + 2) instanceof PopItem) {
if (body.get(pos + 3) instanceof ThrowActionItem) {
ThrowActionItem ta = (ThrowActionItem) body.get(pos + 3);
if (ta.value instanceof DirectValueActionItem) {
if (((DirectValueActionItem) ta.value).value instanceof RegisterNumber) {
RegisterNumber rn2 = (RegisterNumber) ((DirectValueActionItem) ta.value).value;
if (rn2.number == catchRegister) {
break;
}
}
}
}
}
}else{
}*/
} else {
break;
}
} else if (onFalse.size() > onFalsePos && (onFalse.get(onFalsePos) instanceof DefineLocalActionItem)) {
DefineLocalActionItem dl = (DefineLocalActionItem) onFalse.get(onFalsePos);
catchExceptionNames.add(dl.name);
List<GraphTargetItem> catchBody = new ArrayList<>();
for (int i = onFalsePos; i < onFalse.size(); i++) {
catchBody.add(onFalse.get(i));
}
catchBody.remove(0);
catchCommands.add(catchBody);
if (!ifi.onTrue.isEmpty()) {
if (ifi.onTrue.get(0) instanceof PopItem) {
pos = 1;
body = ifi.onTrue;
continue loopex;
}
}
}
}
}
}