commit 98265568b11f2ca55dcdeca62f3d6fb4899346a3
author Stephen Hines <srhines@google.com> Thu Mar 22 08:57:52 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Thu Mar 22 08:57:53 2012 -0700
tree a960ae7f093cb45ce194c3b400e4f015dcb7b43f
parent d3ceda685bae5cdacfcc24866c625f4c28951a2a
parent 76a57eaef13489b981364a2891c894b6e9610ecd

Merge "Fix (GDB) debugging of code loaded from cache"

lib/ExecutionEngine/MCCacheReader.cpp

diff --git a/lib/ExecutionEngine/MCCacheReader.cpp b/lib/ExecutionEngine/MCCacheReader.cpp
index a88d4d4..c3d132e 100644
--- a/lib/ExecutionEngine/MCCacheReader.cpp
+++ b/lib/ExecutionEngine/MCCacheReader.cpp
@@ -443,6 +443,13 @@
                      mpResult->mCachedELFExecutable.size(),
                      &resolveSymbolAdapter, this);
 
+  // Point ELF section headers to location of executable code, otherwise
+  // execution through GDB stops unexpectedly as GDB translates breakpoints
+  // in JITted code incorrectly (and complains about being unable to insert
+  // breakpoint at an invalid address)
+  rsloaderUpdateSectionHeaders(mpResult->mRSExecutable,
+    (unsigned char*) mpResult->mCachedELFExecutable.begin());
+
   return true;
 }