By having a Mac(*) to fire up, you are already a better man than I... Jim
* really non-primary platform system, but that's less euphonious... > On Sep 1, 2015, at 4:00 PM, Zachary Turner <ztur...@google.com> wrote: > > Ahh thanks, you beat me to it. I was just firing up my Mac to fix this. > > On Tue, Sep 1, 2015 at 3:58 PM Jim Ingham via lldb-commits > <lldb-commits@lists.llvm.org> wrote: > Author: jingham > Date: Tue Sep 1 17:56:59 2015 > New Revision: 246601 > > URL: http://llvm.org/viewvc/llvm-project?rev=246601&view=rev > Log: > Fix ProcessKDP.cpp for the change in r246578. > > Modified: > lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp > lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h > > Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp?rev=246601&r1=246600&r2=246601&view=diff > ============================================================================== > --- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp (original) > +++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp Tue Sep 1 > 17:56:59 2015 > @@ -131,27 +131,27 @@ ProcessKDP::Terminate() > > > lldb::ProcessSP > -ProcessKDP::CreateInstance (Target &target, > +ProcessKDP::CreateInstance (TargetSP target_sp, > Listener &listener, > const FileSpec *crash_file_path) > { > lldb::ProcessSP process_sp; > if (crash_file_path == NULL) > - process_sp.reset(new ProcessKDP (target, listener)); > + process_sp.reset(new ProcessKDP (target_sp, listener)); > return process_sp; > } > > bool > -ProcessKDP::CanDebug(Target &target, bool plugin_specified_by_name) > +ProcessKDP::CanDebug(TargetSP target_sp, bool plugin_specified_by_name) > { > if (plugin_specified_by_name) > return true; > > // For now we are just making sure the file exists for a given module > - Module *exe_module = target.GetExecutableModulePointer(); > + Module *exe_module = target_sp->GetExecutableModulePointer(); > if (exe_module) > { > - const llvm::Triple &triple_ref = > target.GetArchitecture().GetTriple(); > + const llvm::Triple &triple_ref = > target_sp->GetArchitecture().GetTriple(); > switch (triple_ref.getOS()) > { > case llvm::Triple::Darwin: // Should use "macosx" for desktop > and "ios" for iOS, but accept darwin just in case > @@ -176,8 +176,8 @@ ProcessKDP::CanDebug(Target &target, boo > //---------------------------------------------------------------------- > // ProcessKDP constructor > //---------------------------------------------------------------------- > -ProcessKDP::ProcessKDP(Target& target, Listener &listener) : > - Process (target, listener), > +ProcessKDP::ProcessKDP(TargetSP target_sp, Listener &listener) : > + Process (target_sp, listener), > m_comm("lldb.process.kdp-remote.communication"), > m_async_broadcaster (NULL, "lldb.process.kdp-remote.async-broadcaster"), > m_dyld_plugin_name (), > @@ -292,7 +292,9 @@ ProcessKDP::DoConnectRemote (Stream *str > uint32_t sub = m_comm.GetCPUSubtype(); > ArchSpec kernel_arch; > kernel_arch.SetArchitecture(eArchTypeMachO, cpu, sub); > - m_target.SetArchitecture(kernel_arch); > + Target &target = GetTarget(); > + > + target.SetArchitecture(kernel_arch); > > /* Get the kernel's UUID and load address via > KDP_KERNELVERSION packet. */ > /* An EFI kdp session has neither UUID nor load address. > */ > @@ -314,7 +316,7 @@ ProcessKDP::DoConnectRemote (Stream *str > // from the dSYM, that can load all of the > symbols. > ModuleSpec module_spec; > module_spec.GetUUID() = kernel_uuid; > - module_spec.GetArchitecture() = > m_target.GetArchitecture(); > + module_spec.GetArchitecture() = > target.GetArchitecture(); > > // Lookup UUID locally, before attempting > dsymForUUID like action > module_spec.GetSymbolFileSpec() = > Symbols::LocateExecutableSymbolFile(module_spec); > @@ -325,15 +327,15 @@ ProcessKDP::DoConnectRemote (Stream *str > > if (module_spec.GetFileSpec().Exists()) > { > - ModuleSP module_sp(new Module > (module_spec.GetFileSpec(), m_target.GetArchitecture())); > + ModuleSP module_sp(new Module > (module_spec.GetFileSpec(), target.GetArchitecture())); > if (module_sp.get() && > module_sp->MatchesModuleSpec (module_spec)) > { > // Get the current target executable > - ModuleSP exe_module_sp > (m_target.GetExecutableModule ()); > + ModuleSP exe_module_sp > (target.GetExecutableModule ()); > > // Make sure you don't already have the > right module loaded and they will be uniqued > if (exe_module_sp.get() != > module_sp.get()) > - m_target.SetExecutableModule > (module_sp, false); > + target.SetExecutableModule > (module_sp, false); > } > } > } > @@ -352,7 +354,7 @@ ProcessKDP::DoConnectRemote (Stream *str > SetID (1); > GetThreadList (); > SetPrivateState (eStateStopped); > - StreamSP > async_strm_sp(m_target.GetDebugger().GetAsyncOutputStream()); > + StreamSP > async_strm_sp(target.GetDebugger().GetAsyncOutputStream()); > if (async_strm_sp) > { > const char *cstr; > > Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h?rev=246601&r1=246600&r2=246601&view=diff > ============================================================================== > --- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h (original) > +++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h Tue Sep 1 > 17:56:59 2015 > @@ -39,7 +39,7 @@ public: > // Constructors and Destructors > //------------------------------------------------------------------ > static lldb::ProcessSP > - CreateInstance (lldb_private::Target& target, > + CreateInstance (lldb::TargetSP target_sp, > lldb_private::Listener &listener, > const lldb_private::FileSpec *crash_file_path); > > @@ -61,7 +61,7 @@ public: > //------------------------------------------------------------------ > // Constructors and Destructors > //------------------------------------------------------------------ > - ProcessKDP(lldb_private::Target& target, lldb_private::Listener > &listener); > + ProcessKDP(lldb::TargetSP target_sp, lldb_private::Listener &listener); > > virtual > ~ProcessKDP(); > @@ -70,7 +70,7 @@ public: > // Check if a given Process > //------------------------------------------------------------------ > virtual bool > - CanDebug (lldb_private::Target &target, > + CanDebug (lldb::TargetSP target_sp, > bool plugin_specified_by_name); > > virtual lldb_private::CommandObject * > > > _______________________________________________ > lldb-commits mailing list > lldb-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
