caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux: Remove a local ObjectFileELF version of GetArchitecture.

Browse Source 
Also fix a bug where we were not lazily parsing the ELF header and thus
returning an ArchSpec with invalid cpu type components.  Initialize the cpu
subtype as LLDB_INVALID_CPUTYPE for compatibility with the new ArchSpec
implementation.

llvm-svn: 126405
This commit is contained in:
Stephen Wilson
2011-02-24 19:16:15 +00:00
parent bd58871d96
commit 3f4200fd9d
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
View File

@@ -74,8 +74,9 @@ ObjectFileELF::CreateInstance(Module *module,
{
std::auto_ptr<ObjectFileELF> objfile_ap(
new ObjectFileELF(module, data_sp, file, offset, length));
ArchSpec spec = objfile_ap->GetArchitecture();
if (spec.IsValid() && objfile_ap->SetModulesArchitecture(spec))
ArchSpec spec;
if (objfile_ap->GetArchitecture(spec) &&
objfile_ap->SetModulesArchitecture(spec))
return objfile_ap.release();
}
}
@@ -83,14 +84,6 @@ ObjectFileELF::CreateInstance(Module *module,
return NULL;
}
ArchSpec
ObjectFileELF::GetArchitecture()
{
if (!ParseHeader())
return ArchSpec();
return ArchSpec(eArchTypeELF, m_header.e_machine, m_header.e_flags);
}
//------------------------------------------------------------------
// PluginInterface protocol
@@ -1046,7 +1039,10 @@ ObjectFileELF::DumpDependentModules(lldb_private::Stream *s)
bool
ObjectFileELF::GetArchitecture (ArchSpec &arch)
{
arch.SetArchitecture (lldb::eArchTypeELF, m_header.e_machine, m_header.e_flags);
if (!ParseHeader())
return false;
arch.SetArchitecture (lldb::eArchTypeELF, m_header.e_machine, LLDB_INVALID_CPUTYPE);
arch.GetTriple().setOSName (Host::GetOSString().GetCString());
arch.GetTriple().setVendorName(Host::GetVendorString().GetCString());
return true;