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

Fixed: Graphviz Graph not showing AS3 exception end

Browse Source
This commit is contained in:
Jindra Petřík
2021-02-16 22:16:53 +01:00
parent ba5c298bbd
commit 5b6ec4ef75
2 changed files with 40 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/PcodeGraphVizExporter.java
View File

@@ -100,61 +100,51 @@ public class PcodeGraphVizExporter {
List<GraphException> exceptions = graph.getExceptions();
Set<Long> knownAddresses = graphSource.getImportantAddresses();
int h = 0;
List<Integer> exPassedStarts = new ArrayList<>();
List<Integer> exPassedEnds = new ArrayList<>();
StringBuilder ends = new StringBuilder();
loopheads:
for (GraphPart head : heads) {
String headName = "start";
if (heads.size() > 1 && head.start != 0) {
h++;
headName = "start" + h;
}
String headLabel = "";
List<String> headLabels = new ArrayList<>();
boolean isExEnd = false;
boolean isExTarget = false;
boolean isExStart = false;
for (int e = 0; e < exceptions.size(); e++) {
GraphException ex = exceptions.get(e);
if (head.start == ex.start && !exPassedStarts.contains(e)) {
headLabels.add("try " + e + " begin");
exPassedStarts.add(e);
isExStart = true;
Set<GraphPart> knownHeads = new HashSet<>();
for (int e = 0; e < exceptions.size(); e++) {
GraphException ex = exceptions.get(e);
GraphPart exStartPart = graph.searchPart(ex.start, allBlocks);
knownHeads.add(exStartPart);
writer.append("ex_" + e + "_begin [shape=\"circle\" label=\"try " + e + " begin\"];\r\n");
writer.append("ex_" + e + "_begin:se -> " + getBlockName(graphSource, exStartPart) + ":nw [style=dashed arrowhead=none];\r\n");
GraphPart exTargetPart = graph.searchPart(ex.target, allBlocks);
knownHeads.add(exTargetPart);
writer.append("ex_" + e + "_target [shape=\"circle\" label=\"try " + e + " target\"];\r\n");
writer.append("ex_" + e + "_target -> " + getBlockName(graphSource, exTargetPart) + "[style=dashed];\r\n");
int end = ex.end - 1;
GraphPart exEndPart = null;
while (end >= 0) {
exEndPart = graph.searchPart(end, allBlocks);
if (exEndPart != null) {
break;
}
if (head.start == ex.end && !exPassedEnds.contains(e)) {
headLabels.add("try " + e + " end");
exPassedEnds.add(e);
isExEnd = true;
break;
}
if (head.start == ex.target) {
headLabels.add("try " + e + " target");
isExTarget = true;
}
end--;
}
if (!headLabels.isEmpty()) {
headLabel = String.join("\\n", headLabels);
if (exEndPart != null) {
writer.append("ex_" + e + "_end [shape=\"circle\" label=\"try " + e + " end\"]\r\n");
writer.append(getBlockName(graphSource, exEndPart) + ":sw -> ex_" + e + "_end:ne [style=dashed dir=back arrowtail=none];\r\n");
}
String headDef = headName + " [shape=\"circle\"" + (headLabel.isEmpty() ? "" : " label=\"" + headLabel + "\"") + "]\r\n";
if (isExEnd) {
for (int i = head.start - 1; i >= 0; i--) {
GraphPart endPrev = graph.searchPart(i, allBlocks);
if (endPrev != null) {
ends.append(getBlockName(graphSource, endPrev) + ":se -> " + headName + ":nw[dir=back arrowtail=none style=dashed];\r\n");
ends.append(headDef);
continue loopheads;
}
}
}
writer.append(headDef);
writer.append(headName + ":" + (isExStart ? "se" : "s") + " -> " + getBlockName(graphSource, head) + ":" + (isExStart ? "nw[arrowhead=none style=dashed]" : "n") + ";\r\n");
}
int startPos = 0;
for (GraphPart startPart : heads) {
if (knownHeads.contains(startPart)) {
continue;
}
startPos++;
String headName = startPos > 1 ? "start" + startPos : "start";
writer.append(headName + " [shape=\"circle\"];\r\n");
writer.append(headName + ":s -> " + getBlockName(graphSource, startPart) + ";\r\n");
}
for (GraphPart part : allBlocks) {
StringBuilder blkCodeBuilder = new StringBuilder();
for (int j = part.start; j <= part.end; j++) {
@@ -197,7 +187,6 @@ public class PcodeGraphVizExporter {
writer.append(partBlockName + orientation + " -> " + nextBlockName + ":n" + (color != null ? "[color=\"" + color + "\"]" : "") + ";\r\n");
}
}
writer.append(ends.toString());
}
private static String hilight(AbstractLexer lexer, String code) {