[Lldb-commits] [lldb] r180989 - Pass down the architecture of the module we're trying to

[Jason Molenda]

Author: jmolenda
Date: Thu May  2 20:31:44 2013
New Revision: 180989

URL: http://llvm.org/viewvc/llvm-project?rev=180989&view=rev
Log:
Pass down the architecture of the module we're trying to
match when looking at kext on the local filesystem.
<rdar://problem/13785112> 

Modified:
    lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
    lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h

Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp?rev=180989&r1=180988&r2=180989&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp Thu May  2 20:31:44 2013
@@ -606,7 +606,7 @@ PlatformDarwinKernel::GetSharedModule (c
             {
                 if (it->first == kext_bundle_cs)
                 {
-                    error = ExamineKextForMatchingUUID (it->second, module_spec.GetUUID(), module_sp);
+                    error = ExamineKextForMatchingUUID (it->second, module_spec.GetUUID(), module_spec.GetArchitecture(), module_sp);
                     if (module_sp.get())
                     {
                         return error;
@@ -620,7 +620,7 @@ PlatformDarwinKernel::GetSharedModule (c
 }
 
 Error
-PlatformDarwinKernel::ExamineKextForMatchingUUID (const FileSpec &kext_bundle_path, const lldb_private::UUID &uuid, ModuleSP &exe_module_sp)
+PlatformDarwinKernel::ExamineKextForMatchingUUID (const FileSpec &kext_bundle_path, const lldb_private::UUID &uuid, const ArchSpec &arch, ModuleSP &exe_module_sp)
 {
     Error error;
     FileSpec exe_file = kext_bundle_path;
@@ -629,6 +629,7 @@ PlatformDarwinKernel::ExamineKextForMatc
     {
         ModuleSpec exe_spec (exe_file);
         exe_spec.GetUUID() = uuid;
+        exe_spec.GetArchitecture() = arch;
         error = ModuleList::GetSharedModule (exe_spec, exe_module_sp, NULL, NULL, NULL);
         if (exe_module_sp && exe_module_sp->GetObjectFile())
         {

Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h?rev=180989&r1=180988&r2=180989&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h Thu May  2 20:31:44 2013
@@ -166,7 +166,7 @@ protected:
     IndexKextsInDirectories (std::vector<lldb_private::FileSpec> kext_dirs);
 
     lldb_private::Error
-    ExamineKextForMatchingUUID (const lldb_private::FileSpec &kext_bundle_path, const lldb_private::UUID &uuid, lldb::ModuleSP &exe_module_sp);
+    ExamineKextForMatchingUUID (const lldb_private::FileSpec &kext_bundle_path, const lldb_private::UUID &uuid, const lldb_private::ArchSpec &arch, lldb::ModuleSP &exe_module_sp);
 
 private: