commit d07986fad0d08cdf05505cf9230714a2cf0dd9ae
author Elliott Hughes <enh@google.com> Tue Dec 06 18:27:45 2011 -0800
committer Elliott Hughes <enh@google.com> Wed Dec 07 09:16:24 2011 -0800
tree 731b6abf2c2e0a5e51453a80029e1a9073b12354
parent 7fe2c691866ad643b9e21dd2c9d36fa79ec454c3

Implement JDWP InvokeMethod and breakpoints on exception throwing.

Change-Id: I1142bee843104f0850fd7270752104d5d73a44f0

src/monitor_android.cc

diff --git a/src/monitor_android.cc b/src/monitor_android.cc
index 39dc524..f80d248 100644
--- a/src/monitor_android.cc
+++ b/src/monitor_android.cc
@@ -76,9 +76,11 @@
   cp = EventLogWriteInt(cp, wait_ms);
 
   // Emit the source code file name, <= 37 bytes.
+  uintptr_t pc;
+  Method* m = self->GetCurrentMethod(&pc);
   const char* filename;
   uint32_t line_number;
-  TranslateLocation(self->GetCurrentMethod(), self->GetCurrentReturnPc(), filename, line_number);
+  TranslateLocation(m, pc, filename, line_number);
   cp = EventLogWriteString(cp, filename, strlen(filename));
 
   // Emit the source code line number, 5 bytes.