[Lldb-commits] [lldb] r140002 - in /lldb/trunk: include/lldb/ include/lldb/Core/ include/lldb/Symbol/ source/API/ source/Core/ source/Plugins/ObjectContainer/BSD-Archive/ source/Plugins/ObjectContainer/Universal-Mach-O/ source/Plugins/SymbolFile/DWARF/ source/Plugins/SymbolVendor/MacOSX/ source/Symbol/ source/Target/
Greg Clayton
gclayton at apple.com
Sun Sep 18 11:59:15 PDT 2011
Author: gclayton
Date: Sun Sep 18 13:59:15 2011
New Revision: 140002
URL: http://llvm.org/viewvc/llvm-project?rev=140002&view=rev
Log:
Don't put modules for .o files into the global shared module list. We
used to do this because we needed to find the shared pointer for a .o
file when the .o file's module was needed in a SymbolContext since the
module in a symbol context was a shared pointer. Now that we are using
intrusive pointers we don't have this limitation anymore since any
instrusive shared pointer can be made from a pointer to an object
all on its own.
Also switched over to having the Module and SymbolVendor use shared
pointers to their object files as had a leak on MacOSX when the
SymbolVendor's object file wasn't the same as the Module's (debug info
in a stand along file (dSYM file)). Now everything will correctly clean
itself up when the module goes away after an executable gets rebuilt.
Now we correctly get rid of .o files that are used with the DWARF with
debug map executables on subsequent runs since the only shared pointer
to the object files in from the DWARF symbol file debug map parser, and
when the module gets replaced, it destroys to old one along with all .o
files.
Also added a small optimization when using BSD archives where we will
remove old BSD containers from the shared list when they are outdated.
Modified:
lldb/trunk/include/lldb/Core/Module.h
lldb/trunk/include/lldb/Symbol/ObjectContainer.h
lldb/trunk/include/lldb/Symbol/ObjectFile.h
lldb/trunk/include/lldb/Symbol/SymbolVendor.h
lldb/trunk/include/lldb/lldb-forward-rtti.h
lldb/trunk/source/API/SBThread.cpp
lldb/trunk/source/Core/Disassembler.cpp
lldb/trunk/source/Core/Module.cpp
lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h
lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
lldb/trunk/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
lldb/trunk/source/Symbol/ObjectFile.cpp
lldb/trunk/source/Symbol/SymbolVendor.cpp
lldb/trunk/source/Target/Process.cpp
Modified: lldb/trunk/include/lldb/Core/Module.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Module.h?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Module.h (original)
+++ lldb/trunk/include/lldb/Core/Module.h Sun Sep 18 13:59:15 2011
@@ -654,7 +654,7 @@
FileSpec m_platform_file;///< The path to the module on the platform on which it is being debugged
ConstString m_object_name; ///< The name an object within this module that is selected, or empty of the module is represented by \a m_file.
uint64_t m_object_offset;
- std::auto_ptr<ObjectFile> m_objfile_ap; ///< A pointer to the object file parser for this module.
+ lldb::ObjectFileSP m_objfile_sp; ///< A shared pointer to the object file parser for this module as it may or may not be shared with the SymbolFile
std::auto_ptr<SymbolVendor> m_symfile_ap; ///< A pointer to the symbol vendor for this module.
ClangASTContext m_ast; ///< The AST context for this module.
bool m_did_load_objfile:1,
Modified: lldb/trunk/include/lldb/Symbol/ObjectContainer.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ObjectContainer.h?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ObjectContainer.h (original)
+++ lldb/trunk/include/lldb/Symbol/ObjectContainer.h Sun Sep 18 13:59:15 2011
@@ -188,7 +188,7 @@
/// arch and optional \a name. Returns NULL of no such object
/// file exists in the container.
//------------------------------------------------------------------
- virtual ObjectFile *
+ virtual lldb::ObjectFileSP
GetObjectFile (const FileSpec *file) = 0;
virtual bool
Modified: lldb/trunk/include/lldb/Symbol/ObjectFile.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ObjectFile.h?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ObjectFile.h (original)
+++ lldb/trunk/include/lldb/Symbol/ObjectFile.h Sun Sep 18 13:59:15 2011
@@ -50,6 +50,7 @@
/// this abstract class.
//----------------------------------------------------------------------
class ObjectFile:
+ public ReferenceCountedBaseVirtual<ObjectFile>,
public PluginInterface,
public ModuleChild
{
@@ -84,19 +85,11 @@
/// supplied upon construction. The at an offset within a file for
/// objects that contain more than one architecture or object.
//------------------------------------------------------------------
- ObjectFile (Module* module, const FileSpec *file_spec_ptr, lldb::addr_t offset, lldb::addr_t length, lldb::DataBufferSP& headerDataSP) :
- ModuleChild (module),
- m_file (), // This file could be different from the original module's file
- m_type (eTypeInvalid),
- m_strata (eStrataInvalid),
- m_offset (offset),
- m_length (length),
- m_data (headerDataSP, lldb::endian::InlHostByteOrder(), 4),
- m_unwind_table (*this)
- {
- if (file_spec_ptr)
- m_file = *file_spec_ptr;
- }
+ ObjectFile (Module* module,
+ const FileSpec *file_spec_ptr,
+ lldb::addr_t offset,
+ lldb::addr_t length,
+ lldb::DataBufferSP& headerDataSP);
//------------------------------------------------------------------
/// Destructor.
@@ -105,9 +98,10 @@
/// inherited from by the plug-in instance.
//------------------------------------------------------------------
virtual
- ~ObjectFile()
- {
- }
+ ~ObjectFile();
+
+ lldb::ObjectFileSP
+ GetSP ();
//------------------------------------------------------------------
/// Dump a description of this object to a Stream.
@@ -148,7 +142,7 @@
///
/// @see ObjectFile::ParseHeader()
//------------------------------------------------------------------
- static ObjectFile*
+ static lldb::ObjectFileSP
FindPlugin (Module* module,
const FileSpec* file_spec,
lldb::addr_t file_offset,
Modified: lldb/trunk/include/lldb/Symbol/SymbolVendor.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/SymbolVendor.h?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/SymbolVendor.h (original)
+++ lldb/trunk/include/lldb/Symbol/SymbolVendor.h Sun Sep 18 13:59:15 2011
@@ -58,7 +58,7 @@
~SymbolVendor();
void
- AddSymbolFileRepresendation(ObjectFile *obj_file);
+ AddSymbolFileRepresendation(const lldb::ObjectFileSP &objfile_sp);
virtual void
Dump(Stream *s);
@@ -182,6 +182,7 @@
mutable Mutex m_mutex;
TypeList m_type_list; // Uniqued types for all parsers owned by this module
CompileUnits m_compile_units; // The current compile units
+ lldb::ObjectFileSP m_objfile_sp; // Keep a reference to the object file in case it isn't the same as the module object file (debug symbols in a separate file)
std::auto_ptr<SymbolFile> m_sym_file_ap; // A single symbol file. Suclasses can add more of these if needed.
private:
Modified: lldb/trunk/include/lldb/lldb-forward-rtti.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-forward-rtti.h?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/include/lldb/lldb-forward-rtti.h (original)
+++ lldb/trunk/include/lldb/lldb-forward-rtti.h Sun Sep 18 13:59:15 2011
@@ -51,6 +51,7 @@
typedef SharedPtr<lldb_private::Log>::Type LogSP;
typedef SharedPtr<lldb_private::LogChannel>::Type LogChannelSP;
typedef IntrusiveSharedPtr<lldb_private::Module>::Type ModuleSP;
+ typedef IntrusiveSharedPtr<lldb_private::ObjectFile>::Type ObjectFileSP;
typedef SharedPtr<lldb_private::OptionValue>::Type OptionValueSP;
typedef SharedPtr<lldb_private::Platform>::Type PlatformSP;
typedef SharedPtr<lldb_private::Process>::Type ProcessSP;
Modified: lldb/trunk/source/API/SBThread.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBThread.cpp?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/source/API/SBThread.cpp (original)
+++ lldb/trunk/source/API/SBThread.cpp Sun Sep 18 13:59:15 2011
@@ -79,7 +79,7 @@
bool
SBThread::IsValid() const
{
- return m_opaque_sp != NULL;
+ return m_opaque_sp;
}
void
Modified: lldb/trunk/source/Core/Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Disassembler.cpp?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/source/Core/Disassembler.cpp (original)
+++ lldb/trunk/source/Core/Disassembler.cpp Sun Sep 18 13:59:15 2011
@@ -512,7 +512,7 @@
{
if (!fgets (buffer, 1023, in_file))
{
- out_stream->Printf ("Instruction::ReadArray: Erroe reading file (fgets).\n");
+ out_stream->Printf ("Instruction::ReadArray: Error reading file (fgets).\n");
option_value_sp.reset ();
return option_value_sp;
}
Modified: lldb/trunk/source/Core/Module.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Module.cpp?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/source/Core/Module.cpp (original)
+++ lldb/trunk/source/Core/Module.cpp Sun Sep 18 13:59:15 2011
@@ -68,7 +68,7 @@
m_platform_file(),
m_object_name (),
m_object_offset (object_offset),
- m_objfile_ap (),
+ m_objfile_sp (),
m_symfile_ap (),
m_ast (),
m_did_load_objfile (false),
@@ -124,7 +124,7 @@
// here because symbol files can require the module object file. So we tear
// down the symbol file first, then the object file.
m_symfile_ap.reset();
- m_objfile_ap.reset();
+ m_objfile_sp.reset();
}
@@ -636,9 +636,9 @@
m_did_load_objfile = true;
Timer scoped_timer(__PRETTY_FUNCTION__,
"Module::GetObjectFile () module = %s", GetFileSpec().GetFilename().AsCString(""));
- m_objfile_ap.reset(ObjectFile::FindPlugin(this, &m_file, m_object_offset, m_file.GetByteSize()));
+ m_objfile_sp = ObjectFile::FindPlugin(this, &m_file, m_object_offset, m_file.GetByteSize());
}
- return m_objfile_ap.get();
+ return m_objfile_sp.get();
}
Modified: lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp Sun Sep 18 13:59:15 2011
@@ -160,14 +160,33 @@
Mutex::Locker locker(Archive::GetArchiveCacheMutex ());
shared_ptr archive_sp;
Archive::Map &archive_map = Archive::GetArchiveCache ();
- Archive::Map::iterator pos;
- for (pos = archive_map.find (file); pos != archive_map.end() && pos->first == file; ++pos)
+ Archive::Map::iterator pos = archive_map.find (file);
+ // Don't cache a value for "archive_map.end()" below since we might
+ // delete an archive entry...
+ while (pos != archive_map.end() && pos->first == file)
{
- if (pos->second->GetArchitecture() == arch &&
- pos->second->GetModificationTime() == time)
+ if (pos->second->GetArchitecture() == arch)
{
- archive_sp = pos->second;
+ if (pos->second->GetModificationTime() == time)
+ {
+ return pos->second;
+ }
+ else
+ {
+ // We have a file at the same path with the same architecture
+ // whose modification time doesn't match. It doesn't make sense
+ // for us to continue to use this BSD archive since we cache only
+ // the object info which consists of file time info and also the
+ // file offset and file size of any contianed objects. Since
+ // this information is now out of date, we won't get the correct
+ // information if we go and extract the file data, so we should
+ // remove the old and outdated entry.
+ archive_map.erase (pos);
+ pos = archive_map.find (file);
+ continue;
+ }
}
+ ++pos;
}
return archive_sp;
}
@@ -266,7 +285,7 @@
// Read everything since we need that in order to index all the
// objects in the archive
- data_sp = file->ReadFileContents(offset, length);
+ data_sp = file->MemoryMapFileContents (offset, length);
std::auto_ptr<ObjectContainerBSDArchive> container_ap(new ObjectContainerBSDArchive (module, data_sp, file, offset, length));
if (container_ap->ParseHeader())
@@ -363,7 +382,7 @@
s->EOL();
}
-ObjectFile *
+ObjectFileSP
ObjectContainerBSDArchive::GetObjectFile (const FileSpec *file)
{
if (m_module->GetObjectName() && m_archive_sp)
@@ -372,7 +391,7 @@
if (object)
return ObjectFile::FindPlugin (m_module, file, m_offset + object->ar_file_offset, object->ar_file_size);
}
- return NULL;
+ return ObjectFileSP();
}
Modified: lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h (original)
+++ lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h Sun Sep 18 13:59:15 2011
@@ -63,10 +63,17 @@
virtual bool
ParseHeader ();
+ virtual size_t
+ GetNumObjects () const
+ {
+ if (m_archive_sp)
+ return m_archive_sp->GetNumObjects();
+ return 0;
+ }
virtual void
Dump (lldb_private::Stream *s) const;
- virtual lldb_private::ObjectFile *
+ virtual lldb::ObjectFileSP
GetObjectFile (const lldb_private::FileSpec *file);
//------------------------------------------------------------------
@@ -101,6 +108,7 @@
uint32_t ar_size; // size in bytes
uint32_t ar_file_offset; // file offset in bytes from the beginning of the file of the object data
uint32_t ar_file_size; // length of the object data
+ lldb::ObjectFileSP object_file_sp;
typedef std::vector<Object> collection;
typedef collection::iterator iterator;
@@ -136,6 +144,12 @@
~Archive ();
size_t
+ GetNumObjects () const
+ {
+ return m_objects.size();
+ }
+
+ size_t
ParseObjects (lldb_private::DataExtractor &data);
Object *
@@ -152,6 +166,9 @@
{
return m_arch;
}
+
+ bool
+ HasNoExternalReferences() const;
protected:
Modified: lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp Sun Sep 18 13:59:15 2011
@@ -196,7 +196,7 @@
return false;
}
-ObjectFile *
+ObjectFileSP
ObjectContainerUniversalMachO::GetObjectFile (const FileSpec *file)
{
uint32_t arch_idx = 0;
@@ -219,11 +219,14 @@
{
if (arch == curr_arch)
{
- return ObjectFile::FindPlugin (m_module, file, m_offset + m_fat_archs[arch_idx].offset, m_fat_archs[arch_idx].size);
+ return ObjectFile::FindPlugin (m_module,
+ file,
+ m_offset + m_fat_archs[arch_idx].offset,
+ m_fat_archs[arch_idx].size);
}
}
}
- return NULL;
+ return ObjectFileSP();
}
Modified: lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h (original)
+++ lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h Sun Sep 18 13:59:15 2011
@@ -68,7 +68,7 @@
virtual bool
GetArchitectureAtIndex (uint32_t cpu_idx, lldb_private::ArchSpec& arch) const;
- virtual lldb_private::ObjectFile *
+ virtual lldb::ObjectFileSP
GetObjectFile (const lldb_private::FileSpec *file);
//------------------------------------------------------------------
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp Sun Sep 18 13:59:15 2011
@@ -166,19 +166,14 @@
if (oso_symbol)
{
FileSpec oso_file_spec(oso_symbol->GetMangled().GetName().AsCString(), true);
- // Don't allow cached .o files since we dress up each .o file with
- // new sections. We want them to be in the module list so we can
- // always find a shared pointer to the module but just don't share them.
- const bool always_create = true;
- ModuleList::GetSharedModule (oso_file_spec,
- m_obj_file->GetModule()->GetArchitecture(),
- NULL, // lldb_private::UUID pointer
- NULL, // object name
- 0, // object offset
- comp_unit_info->oso_module_sp,
- NULL,
- NULL,
- always_create);
+ // Always create a new module for .o files. Why? Because we
+ // use the debug map, to add new sections to each .o file and
+ // even though a .o file might not have changed, the sections
+ // that get added to the .o file can change.
+ comp_unit_info->oso_module_sp = new Module (oso_file_spec,
+ m_obj_file->GetModule()->GetArchitecture(),
+ NULL,
+ 0);
}
}
return comp_unit_info->oso_module_sp.get();
Modified: lldb/trunk/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp Sun Sep 18 13:59:15 2011
@@ -50,132 +50,6 @@
return false;
}
-
-//ObjectFile *
-//LocateDSYMMachFileInDSYMBundle (Module* module, FileSpec& dsym_fspec)
-//{
-// ObjectFile *dsym_objfile = NULL;
-//
-// char path[PATH_MAX];
-//
-// if (dsym_fspec.GetPath(path, sizeof(path)))
-// {
-// size_t path_len = strlen(path);
-// const char *bundle_subpath = "/Contents/Resources/DWARF/";
-// if (path_len > 0)
-// {
-// if (path[path_len-1] == '/')
-// ::strncat (path, bundle_subpath + 1, sizeof(path));
-// else
-// ::strncat (path, bundle_subpath, sizeof(path));
-// ::strncat (path, dsym_fspec.GetFilename().AsCString(), sizeof(path));
-//
-// path_len = strlen(path);
-//
-// if (::strcasecmp (&path[path_len - strlen(".dSYM")], ".dSYM") == 0)
-// {
-// path[path_len - ::strlen(".dSYM")] = '\0';
-// dsym_fspec.SetFile(path);
-// dsym_objfile = ObjectFile::FindPlugin(module, &dsym_fspec, 0);
-// }
-// }
-// }
-// return dsym_objfile;
-//}
-//
-//CFURLRef DBGCopyFullDSYMURLForUUID (CFUUIDRef uuid, CFURLRef exec_url) __attribute__((weak_import));
-
-
-//ObjectFile *
-//FindDSYMUsingDebugSymbols (Module* module, FileSpec& dsym_fspec)
-//{
-// Timer scoped_locate("FindDSYMUsingDebugSymbols");
-// dsym_fspec.Clear();
-// ObjectFile *dsym_objfile = NULL;
-// if (module->GetUUID().IsValid())
-// {
-// // Try and locate the dSYM file using DebugSymbols first
-// const UInt8 *module_uuid = (const UInt8 *)module->GetUUID().GetBytes();
-// if (module_uuid != NULL)
-// {
-// CFUUIDRef module_uuid_ref;
-// module_uuid_ref = ::CFUUIDCreateWithBytes ( NULL,
-// module_uuid[0],
-// module_uuid[1],
-// module_uuid[2],
-// module_uuid[3],
-// module_uuid[4],
-// module_uuid[5],
-// module_uuid[6],
-// module_uuid[7],
-// module_uuid[8],
-// module_uuid[9],
-// module_uuid[10],
-// module_uuid[11],
-// module_uuid[12],
-// module_uuid[13],
-// module_uuid[14],
-// module_uuid[15]);
-//
-// if (module_uuid_ref)
-// {
-// CFURLRef dsym_url = NULL;
-// CFURLRef exec_url = NULL;
-//
-// // if (DBGCopyFullDSYMURLForUUID)
-// {
-// char exec_path[PATH_MAX];
-// if (module->GetFileSpec().GetPath(exec_path, sizeof(exec_path)))
-// {
-// exec_url = CFURLCreateFromFileSystemRepresentation ( NULL,
-// (const UInt8 *)exec_path,
-// strlen(exec_path),
-// FALSE);
-// }
-//
-// dsym_url = DBGCopyFullDSYMURLForUUID(module_uuid_ref, exec_url);
-// }
-// // else
-// // {
-// // dsym_url = DBGCopyDSYMURLForUUID(module_uuid_ref);
-// // }
-//
-// if (exec_url)
-// {
-// ::CFRelease (exec_url);
-// exec_url = NULL;
-// }
-//
-// ::CFRelease(module_uuid_ref);
-// module_uuid_ref = NULL;
-//
-// if (dsym_url)
-// {
-// char dsym_path[PATH_MAX];
-// Boolean success = CFURLGetFileSystemRepresentation (dsym_url, true, (UInt8*)dsym_path, sizeof(dsym_path)-1);
-//
-// ::CFRelease(dsym_url), dsym_url = NULL;
-//
-// if (success)
-// {
-// dsym_fspec.SetFile(dsym_path);
-//
-// // Some newer versions of DebugSymbols will return a full path into a dSYM bundle
-// // that points to the correct mach file within the dSYM bundle (MH_DSYM mach file
-// // type).
-// dsym_objfile = ObjectFile::FindPlugin(module, &dsym_fspec, 0);
-//
-// // Olders versions of DebugSymbols will return a path to a dSYM bundle.
-// if (dsym_objfile == NULL)
-// dsym_objfile = LocateDSYMMachFileInDSYMBundle (module, dsym_fspec);
-// }
-// }
-// }
-// }
-// }
-// return dsym_objfile;
-//}
-
static void
ReplaceDSYMSectionsWithExecutableSections (ObjectFile *exec_objfile, ObjectFile *dsym_objfile)
{
@@ -266,7 +140,7 @@
module->GetFileSpec().GetFilename().AsCString());
FileSpec dsym_fspec;
- std::auto_ptr<ObjectFile> dsym_objfile_ap;
+ ObjectFileSP dsym_objfile_sp;
const FileSpec &file_spec = obj_file->GetFileSpec();
if (file_spec)
{
@@ -274,20 +148,20 @@
if (dsym_fspec)
{
- dsym_objfile_ap.reset(ObjectFile::FindPlugin(module, &dsym_fspec, 0, dsym_fspec.GetByteSize()));
- if (UUIDsMatch(module, dsym_objfile_ap.get()))
+ dsym_objfile_sp = ObjectFile::FindPlugin(module, &dsym_fspec, 0, dsym_fspec.GetByteSize());
+ if (UUIDsMatch(module, dsym_objfile_sp.get()))
{
- ReplaceDSYMSectionsWithExecutableSections (obj_file, dsym_objfile_ap.get());
- symbol_vendor->AddSymbolFileRepresendation(dsym_objfile_ap.release());
+ ReplaceDSYMSectionsWithExecutableSections (obj_file, dsym_objfile_sp.get());
+ symbol_vendor->AddSymbolFileRepresendation(dsym_objfile_sp);
return symbol_vendor;
}
}
}
// Just create our symbol vendor using the current objfile as this is either
- // an executable with no dSYM (that we could locate), and executable with
- // a dSYM that has a UUID that doesn't match, or it is a dSYM file itself.
- symbol_vendor->AddSymbolFileRepresendation(obj_file);
+ // an executable with no dSYM (that we could locate), an executable with
+ // a dSYM that has a UUID that doesn't match.
+ symbol_vendor->AddSymbolFileRepresendation(obj_file->GetSP());
}
}
return symbol_vendor;
Modified: lldb/trunk/source/Symbol/ObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ObjectFile.cpp?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ObjectFile.cpp (original)
+++ lldb/trunk/source/Symbol/ObjectFile.cpp Sun Sep 18 13:59:15 2011
@@ -8,6 +8,8 @@
//===----------------------------------------------------------------------===//
#include "lldb/lldb-private.h"
+#include "lldb/lldb-private-log.h"
+#include "lldb/Core/Log.h"
#include "lldb/Core/Module.h"
#include "lldb/Core/PluginManager.h"
#include "lldb/Core/RegularExpression.h"
@@ -19,15 +21,15 @@
using namespace lldb;
using namespace lldb_private;
-ObjectFile*
-ObjectFile::FindPlugin (Module* module, const FileSpec* file, lldb::addr_t file_offset, lldb::addr_t file_size)
+ObjectFileSP
+ObjectFile::FindPlugin (Module* module, const FileSpec* file, addr_t file_offset, addr_t file_size)
{
Timer scoped_timer (__PRETTY_FUNCTION__,
"ObjectFile::FindPlugin (module = %s/%s, file = %p, file_offset = 0x%z8.8x, file_size = 0x%z8.8x)",
module->GetFileSpec().GetDirectory().AsCString(),
module->GetFileSpec().GetFilename().AsCString(),
file, file_offset, file_size);
- std::auto_ptr<ObjectFile> object_file_ap;
+ ObjectFileSP object_file_sp;
if (module != NULL)
{
@@ -72,9 +74,9 @@
ObjectFileCreateInstance create_object_file_callback;
for (idx = 0; (create_object_file_callback = PluginManager::GetObjectFileCreateCallbackAtIndex(idx)) != NULL; ++idx)
{
- object_file_ap.reset (create_object_file_callback(module, file_header_data_sp, file, file_offset, file_size));
- if (object_file_ap.get())
- return object_file_ap.release();
+ object_file_sp.reset (create_object_file_callback(module, file_header_data_sp, file, file_offset, file_size));
+ if (object_file_sp.get())
+ return object_file_sp;
}
// Check if this is a object container by iterating through
@@ -86,14 +88,87 @@
std::auto_ptr<ObjectContainer> object_container_ap(create_object_container_callback(module, file_header_data_sp, file, file_offset, file_size));
if (object_container_ap.get())
- object_file_ap.reset (object_container_ap->GetObjectFile(file));
+ object_file_sp = object_container_ap->GetObjectFile(file);
- if (object_file_ap.get())
- return object_file_ap.release();
+ if (object_file_sp.get())
+ return object_file_sp;
}
}
}
- return NULL;
+ // We didn't find it, so clear our shared pointer in case it
+ // contains anything and return an empty shared pointer
+ object_file_sp.reset();
+ return object_file_sp;
+}
+
+ObjectFile::ObjectFile (Module* module,
+ const FileSpec *file_spec_ptr,
+ addr_t offset,
+ addr_t length,
+ DataBufferSP& headerDataSP) :
+ ModuleChild (module),
+ m_file (), // This file could be different from the original module's file
+ m_type (eTypeInvalid),
+ m_strata (eStrataInvalid),
+ m_offset (offset),
+ m_length (length),
+ m_data (headerDataSP, endian::InlHostByteOrder(), 4),
+ m_unwind_table (*this)
+{
+ if (file_spec_ptr)
+ m_file = *file_spec_ptr;
+ LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT));
+ if (log)
+ {
+ if (m_file)
+ {
+ log->Printf ("%p ObjectFile::ObjectFile () module = %s/%s, file = %s/%s, offset = 0x%8.8llx, size = %llu\n",
+ this,
+ m_module->GetFileSpec().GetDirectory().AsCString(),
+ m_module->GetFileSpec().GetFilename().AsCString(),
+ m_file.GetDirectory().AsCString(),
+ m_file.GetFilename().AsCString(),
+ m_offset,
+ m_length);
+ }
+ else
+ {
+ log->Printf ("%p ObjectFile::ObjectFile () module = %s/%s, file = <NULL>, offset = 0x%8.8llx, size = %llu\n",
+ this,
+ m_module->GetFileSpec().GetDirectory().AsCString(),
+ m_module->GetFileSpec().GetFilename().AsCString(),
+ m_offset,
+ m_length);
+ }
+ }
+}
+
+ObjectFile::~ObjectFile()
+{
+ LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT));
+ if (log)
+ {
+ if (m_file)
+ {
+ log->Printf ("%p ObjectFile::~ObjectFile () module = %s/%s, file = %s/%s, offset = 0x%8.8llx, size = %llu\n",
+ this,
+ m_module->GetFileSpec().GetDirectory().AsCString(),
+ m_module->GetFileSpec().GetFilename().AsCString(),
+ m_file.GetDirectory().AsCString(),
+ m_file.GetFilename().AsCString(),
+ m_offset,
+ m_length);
+ }
+ else
+ {
+ log->Printf ("%p ObjectFile::~ObjectFile () module = %s/%s, file = <NULL>, offset = 0x%8.8llx, size = %llu\n",
+ this,
+ m_module->GetFileSpec().GetDirectory().AsCString(),
+ m_module->GetFileSpec().GetFilename().AsCString(),
+ m_offset,
+ m_length);
+ }
+ }
}
bool
@@ -103,7 +178,7 @@
}
AddressClass
-ObjectFile::GetAddressClass (lldb::addr_t file_addr)
+ObjectFile::GetAddressClass (addr_t file_addr)
{
Symtab *symtab = GetSymtab();
if (symtab)
@@ -188,4 +263,12 @@
return eAddressClassUnknown;
}
+ObjectFileSP
+ObjectFile::GetSP ()
+{
+ // This object contains an instrusive ref count base class so we can
+ // easily make a shared pointer to this object
+ return ObjectFileSP (this);
+}
+
Modified: lldb/trunk/source/Symbol/SymbolVendor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/SymbolVendor.cpp?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/SymbolVendor.cpp (original)
+++ lldb/trunk/source/Symbol/SymbolVendor.cpp Sun Sep 18 13:59:15 2011
@@ -55,7 +55,11 @@
// file representation for the module.
instance_ap.reset(new SymbolVendor(module));
if (instance_ap.get())
- instance_ap->AddSymbolFileRepresendation(module->GetObjectFile());
+ {
+ ObjectFile *objfile = module->GetObjectFile();
+ if (objfile)
+ instance_ap->AddSymbolFileRepresendation(objfile->GetSP());
+ }
return instance_ap.release();
}
@@ -82,11 +86,14 @@
// Add a represantion given an object file.
//----------------------------------------------------------------------
void
-SymbolVendor::AddSymbolFileRepresendation(ObjectFile *obj_file)
+SymbolVendor::AddSymbolFileRepresendation(const ObjectFileSP &objfile_sp)
{
Mutex::Locker locker(m_mutex);
- if (obj_file != NULL)
- m_sym_file_ap.reset(SymbolFile::FindPlugin(obj_file));
+ if (objfile_sp)
+ {
+ m_objfile_sp = objfile_sp;
+ m_sym_file_ap.reset(SymbolFile::FindPlugin(objfile_sp.get()));
+ }
}
bool
Modified: lldb/trunk/source/Target/Process.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?rev=140002&r1=140001&r2=140002&view=diff
==============================================================================
--- lldb/trunk/source/Target/Process.cpp (original)
+++ lldb/trunk/source/Target/Process.cpp Sun Sep 18 13:59:15 2011
@@ -3381,7 +3381,7 @@
uint32_t selected_tid;
StackID selected_stack_id;
- if (selected_thread_sp != NULL)
+ if (selected_thread_sp)
{
selected_tid = selected_thread_sp->GetIndexID();
selected_stack_id = selected_thread_sp->GetSelectedFrame()->GetStackID();
More information about the lldb-commits
mailing list