LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-21 16:45:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better line start detection

Browse Source 
Fixed debug info injection
This commit is contained in:
Jindra Petřík
2015-11-17 09:24:42 +01:00
parent 632e5156c8
commit 4a4e0e4898
547 changed files with 2058 additions and 1911 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/GraphSourceItemPosition.java
View File

@@ -30,5 +30,7 @@ public class GraphSourceItemPosition {
public int position;
public GraphSourceItem startLineItem;
public HighlightData data;
}

3
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/GraphTextWriter.java
View File

@@ -54,11 +54,12 @@ public abstract class GraphTextWriter {
* Highlights specified text as instruction
*
* @param src
* @param firstLineItem
* @param pos Offset of instruction
* @param data
* @return GraphTextWriter
*/
public GraphTextWriter startOffset(GraphSourceItem src, int pos, HighlightData data) {
public GraphTextWriter startOffset(GraphSourceItem src, GraphSourceItem startLineItem, int pos, HighlightData data) {
return this;
}

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/HighlightedTextWriter.java
View File

@@ -85,9 +85,10 @@ public class HighlightedTextWriter extends GraphTextWriter {
* @return HighlightedTextWriter
*/
@Override
public HighlightedTextWriter startOffset(GraphSourceItem src, int pos, HighlightData data) {
public HighlightedTextWriter startOffset(GraphSourceItem src, GraphSourceItem startLineItem, int pos, HighlightData data) {
GraphSourceItemPosition itemPos = new GraphSourceItemPosition();
itemPos.graphSourceItem = src;
itemPos.startLineItem = startLineItem;
itemPos.position = pos;
itemPos.data = data;
offsets.add(itemPos);
@@ -182,6 +183,9 @@ public class HighlightedTextWriter extends GraphTextWriter {
ndata.merge(itemPos.data);
ndata.merge(data);
ndata.offset = src.getOffset() + pos;
if (itemPos.startLineItem != null) {
ndata.firstLineOffset = itemPos.startLineItem.getOffset();
}
h = new Highlighting(sb.length() - newLineCount, ndata, HighlightType.OFFSET, str);
instructionHilights.add(h);
}

12
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/hilight/HighlightData.java
View File

@@ -39,10 +39,14 @@ public class HighlightData implements Cloneable, Serializable {
public long offset;
public long firstLineOffset = -1;
public int regIndex = -1;
public boolean isEmpty() {
return !declaration && declaredType == null && localName == null
&& subtype == null && specialValue == null
&& index == 0 && offset == 0;
&& index == 0 && offset == 0 && regIndex == -1 && firstLineOffset == -1;
}
public void merge(HighlightData data) {
@@ -70,6 +74,12 @@ public class HighlightData implements Cloneable, Serializable {
if (data.offset != 0) {
offset = data.offset;
}
if (data.regIndex != -1) {
regIndex = data.regIndex;
}
if (data.firstLineOffset != -1) {
firstLineOffset = data.firstLineOffset;
}
}
@Override