maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Remove LLDB_DISABLE_PYTHON ifndef around FormatManager::LoadObjCFormatters() prototype, 

it is unconditionally present now.

ObjectContainerBSDArchive::CreateInstance %z8.8x is not a valid printf arg specifier, %8.8zx would work
for size_t arg but this arg is addr_t.  use %8.8llx and cast up to uint64_t.

ObjectFile::FindPlugin ditto.

DynamicRegisterInfo::SetRegisterInfo ifdef this function out if LLDB_DISABLE_PYTHON.

llvm-svn: 163599
This commit is contained in:
Jason Molenda 2012-09-11 06:35:15 +00:00
parent 3d05040cc1
commit 521d32dd96
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/include/lldb/Core/FormatManager.h
View File

@ -767,10 +767,8 @@ private:
void
LoadSystemFormatters();
#ifndef LLDB_DISABLE_PYTHON
void
LoadObjCFormatters();
#endif
};
} // namespace lldb_private

4
lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
View File

@ -273,10 +273,10 @@ ObjectContainerBSDArchive::CreateInstance
if (file && data_sp && ObjectContainerBSDArchive::MagicBytesMatch(data))
{
Timer scoped_timer (__PRETTY_FUNCTION__,
"ObjectContainerBSDArchive::CreateInstance (module = %s/%s, file = %p, file_offset = 0x%z8.8x, file_size = 0x%z8.8x)",
"ObjectContainerBSDArchive::CreateInstance (module = %s/%s, file = %p, file_offset = 0x%8.8llx, file_size = 0x%8.8llx)",
module_sp->GetFileSpec().GetDirectory().AsCString(),
module_sp->GetFileSpec().GetFilename().AsCString(),
file, offset, length);
file, (uint64_t) offset, (uint64_t) length);
Archive::shared_ptr archive_sp (Archive::FindCachedArchive (*file, module_sp->GetArchitecture(), module_sp->GetModificationTime()));

5
lldb/source/Plugins/Process/Utility/DynamicRegisterInfo.cpp
View File

@ -14,7 +14,10 @@
// Other libraries and framework includes
// Project includes
#include "lldb/Interpreter/Args.h"
#ifndef LLDB_DISABLE_PYTHON
#include "lldb/Interpreter/PythonDataObjects.h"
#endif
using namespace lldb;
using namespace lldb_private;
@ -46,6 +49,7 @@ DynamicRegisterInfo::~DynamicRegisterInfo ()
size_t
DynamicRegisterInfo::SetRegisterInfo (const lldb_private::PythonDataDictionary &dict)
{
#ifndef LLDB_DISABLE_PYTHON
PythonDataArray sets (dict.GetItemForKey("sets").GetArrayObject());
if (sets)
{
@ -159,6 +163,7 @@ DynamicRegisterInfo::SetRegisterInfo (const lldb_private::PythonDataDictionary &
}
Finalize ();
}
#endif
return 0;
}

4
lldb/source/Symbol/ObjectFile.cpp
View File

@ -34,10 +34,10 @@ ObjectFile::FindPlugin (const lldb::ModuleSP &module_sp, const FileSpec* file, a
if (module_sp)
{
Timer scoped_timer (__PRETTY_FUNCTION__,
"ObjectFile::FindPlugin (module = %s/%s, file = %p, file_offset = 0x%z8.8x, file_size = 0x%z8.8x)",
"ObjectFile::FindPlugin (module = %s/%s, file = %p, file_offset = 0x%8.8llx, file_size = 0x%8.8llx)",
module_sp->GetFileSpec().GetDirectory().AsCString(),
module_sp->GetFileSpec().GetFilename().AsCString(),
file, file_offset, file_size);
file, (uint64_t) file_offset, (uint64_t) file_size);
if (file)
{
// Memory map the entire file contents