From 1e4a0716f4ecd17403f40b77baef2e15b285961f Mon Sep 17 00:00:00 2001
From: "JesusFreke@JesusFreke.com"
 <JesusFreke@JesusFreke.com@55b6fa8a-2a1e-11de-a435-ffa8d773f76a>
Date: Wed, 5 Aug 2009 04:07:48 +0000
Subject: [PATCH] Use the bytecode address, not the start offset within the
 encoded debug info

git-svn-id: https://smali.googlecode.com/svn/trunk@359 55b6fa8a-2a1e-11de-a435-ffa8d773f76a
---
 .../dexlib/Debug/DebugInstructionIterator.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstructionIterator.java b/dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstructionIterator.java
index fe75bddb..36116d80 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstructionIterator.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstructionIterator.java
@@ -171,7 +171,7 @@ public class DebugInstructionIterator {
                     StringIdItem name = dexFile.StringIdsSection.getItemByIndex(in.readUnsignedLeb128() - 1);
                     TypeIdItem type = dexFile.TypeIdsSection.getItemByIndex(in.readUnsignedLeb128() - 1);
                     locals[registerNum] = new Local(registerNum, name, type, null);
-                    processDecodedDebugInstruction.ProcessStartLocal(startOffset, in.getCursor() - startOffset, registerNum,
+                    processDecodedDebugInstruction.ProcessStartLocal(address, in.getCursor() - startOffset, registerNum,
                             name, type);
                     break;
                 }
@@ -182,7 +182,7 @@ public class DebugInstructionIterator {
                     TypeIdItem type = dexFile.TypeIdsSection.getItemByIndex(in.readUnsignedLeb128() - 1);
                     StringIdItem signature = dexFile.StringIdsSection.getItemByIndex(in.readUnsignedLeb128() - 1);
                     locals[registerNum] = new Local(registerNum, name, type, signature);
-                    processDecodedDebugInstruction.ProcessStartLocalExtended(startOffset, in.getCursor() - startOffset,
+                    processDecodedDebugInstruction.ProcessStartLocalExtended(address, in.getCursor() - startOffset,
                             registerNum, name, type, signature);
                     break;
                 }
@@ -191,10 +191,10 @@ public class DebugInstructionIterator {
                     int registerNum = in.readUnsignedLeb128();
                     Local local = locals[registerNum];
                     if (local == null) {
-                        processDecodedDebugInstruction.ProcessEndLocal(startOffset, in.getCursor() - startOffset, registerNum,
+                        processDecodedDebugInstruction.ProcessEndLocal(address, in.getCursor() - startOffset, registerNum,
                                 null, null, null);
                     } else {
-                        processDecodedDebugInstruction.ProcessEndLocal(startOffset, in.getCursor() - startOffset, registerNum,
+                        processDecodedDebugInstruction.ProcessEndLocal(address, in.getCursor() - startOffset, registerNum,
                                 local.name, local.type, local.signature);
                     }
                     break;
@@ -204,10 +204,10 @@ public class DebugInstructionIterator {
                     int registerNum = in.readUnsignedLeb128();
                     Local local = locals[registerNum];
                     if (local == null) {
-                        processDecodedDebugInstruction.ProcessRestartLocal(startOffset, in.getCursor() - startOffset,
+                        processDecodedDebugInstruction.ProcessRestartLocal(address, in.getCursor() - startOffset,
                                 registerNum, null, null, null);
                     } else {
-                        processDecodedDebugInstruction.ProcessRestartLocal(startOffset, in.getCursor() - startOffset,
+                        processDecodedDebugInstruction.ProcessRestartLocal(address, in.getCursor() - startOffset,
                                 registerNum, local.name, local.type, local.signature);
                     }
 
@@ -215,18 +215,18 @@ public class DebugInstructionIterator {
                 }
                 case 0x07:
                 {
-                    processDecodedDebugInstruction.ProcessSetPrologueEnd(startOffset);
+                    processDecodedDebugInstruction.ProcessSetPrologueEnd(address);
                     break;
                 }
                 case 0x08:
                 {
-                    processDecodedDebugInstruction.ProcessSetEpilogueBegin(startOffset);
+                    processDecodedDebugInstruction.ProcessSetEpilogueBegin(address);
                     break;
                 }
                 case 0x09:
                 {
                     StringIdItem name = dexFile.StringIdsSection.getItemByIndex(in.readUnsignedLeb128() - 1);
-                    processDecodedDebugInstruction.ProcessSetFile(startOffset, in.getCursor() - startOffset, name);
+                    processDecodedDebugInstruction.ProcessSetFile(address, in.getCursor() - startOffset, name);
                     break;
                 }
                 default: