jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix setting variable name from debug info

Browse Source
This commit is contained in:
Skylot
2013-04-27 21:03:01 +04:00
parent a55f4c59ce
commit 484e07df8d
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/jadx/dex/nodes/parser/DebugInfoParser.java
+17 -5
View File
@@ -78,8 +78,7 @@ public class DebugInfoParser {
int nameId = section.readUleb128() - 1;
int type = section.readUleb128() - 1;
LocalVarInfo var = new LocalVarInfo(dex, regNum, nameId, type, DexNode.NO_INDEX);
var.start(addr, line);
locals[regNum] = var;
startVar(var, locals, insnByOffset, addr, line);
break;
}
case DBG_START_LOCAL_EXTENDED: {
@@ -88,15 +87,17 @@ public class DebugInfoParser {
int type = section.readUleb128() - 1;
int sign = section.readUleb128() - 1;
LocalVarInfo var = new LocalVarInfo(dex, regNum, nameId, type, sign);
var.start(addr, line);
locals[regNum] = var;
startVar(var, locals, insnByOffset, addr, line);
break;
}
case DBG_RESTART_LOCAL: {
int regNum = section.readUleb128();
LocalVarInfo var = locals[regNum];
if (var != null)
if (var != null) {
var.end(addr, line);
setVar(var, insnByOffset);
var.start(addr, line);
}
break;
}
case DBG_END_LOCAL: {
@@ -141,6 +142,17 @@ public class DebugInfoParser {
}
}
private void startVar(LocalVarInfo var, LocalVarInfo[] locals, InsnNode[] insnByOffset, int addr, int line) {
int regNum = var.getRegNum();
LocalVarInfo prev = locals[regNum];
if (prev != null && !prev.isEnd()) {
prev.end(addr, line);
setVar(prev, insnByOffset);
}
var.start(addr, line);
locals[regNum] = var;
}
private void setVar(LocalVarInfo var, InsnNode[] insnByOffset) {
int start = var.getStartAddr();
int end = var.getEndAddr();