The kernel loading code is now isolated in the DynamicLoaderDarwinKernel;

remove the duplicates of this code in ProcessGDBRemote and ProcessKDP.
These two Process plugins will hardcode their DynamicLoader name to be
the DynamicLoaderDarwinKernel so the correct DynamicLoader is picked,
and return the kernel load address as the ImageInfosAddress.
<rdar://problem/12417038> 

llvm-svn: 165080

1 files changed, 6 insertions, 4 deletions

diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
index 4732fc3a3fc..82f840d69ff 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
@@ -295,10 +295,7 @@ protected:
     }
 
     void
-    RelocateOrLoadKernel (lldb_private::Stream *strm);
-
-    void
-    LoadKernel (lldb_private::Stream *strm, lldb_private::UUID kernel_uuid, lldb::addr_t kernel_load_addr);
+    CheckForKernel (lldb_private::Stream *strm);
 
     //------------------------------------------------------------------
     /// Broadcaster event bits definitions.
@@ -332,6 +329,8 @@ protected:
     lldb::BreakpointSP m_thread_create_bp_sp;
     bool m_waiting_for_attach;
     bool m_destroy_tried_resuming;
+    std::string m_dyld_plugin_name;
+    lldb::addr_t m_kernel_load_addr;
     
     bool
     StartAsyncThread ();
@@ -380,6 +379,9 @@ protected:
                         bool catch_stop_event, 
                         lldb::EventSP &stop_event_sp);
 
+    lldb_private::DynamicLoader *
+    GetDynamicLoader ();
+
 private:
     //------------------------------------------------------------------
     // For ProcessGDBRemote only