diff options
Diffstat (limited to 'lldb/source/Plugins/DynamicLoader')
5 files changed, 32 insertions, 32 deletions
diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp index 0cb04468fbb..5aa8869091f 100644 --- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp +++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp @@ -612,7 +612,7 @@ DynamicLoaderDarwinKernel::ReadKextSummaryHeader () const size_t bytes_read = m_process->GetTarget().ReadMemory (m_kext_summary_header_addr, prefer_file_cache, buf, count, error); if (bytes_read == count) { - uint32_t offset = 0; + lldb::offset_t offset = 0; m_kext_summary_header.version = data.GetU32(&offset); if (m_kext_summary_header.version >= 2) { @@ -723,7 +723,7 @@ DynamicLoaderDarwinKernel::ReadKextSummaries (const Address &kext_summary_addr, i < image_infos.size() && extractor.ValidOffsetForDataOfSize(kext_summary_offset, m_kext_summary_header.entry_size); ++i, kext_summary_offset += m_kext_summary_header.entry_size) { - uint32_t offset = kext_summary_offset; + lldb::offset_t offset = kext_summary_offset; const void *name_data = extractor.GetData(&offset, KERNEL_MODULE_MAX_NAME); if (name_data == NULL) break; diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp index 22cc1d56d86..dd34da370db 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp @@ -279,7 +279,7 @@ DynamicLoaderMacOSXDYLD::LocateDYLD() Error error; if (m_process->ReadMemory (shlib_addr, buf, 4, error) == 4) { - uint32_t offset = 0; + lldb::offset_t offset = 0; uint32_t magic = data.GetU32 (&offset); switch (magic) { @@ -449,8 +449,8 @@ DynamicLoaderMacOSXDYLD::UpdateCommPageLoadAddress(Module *module) SectionList *section_list = image_object_file->GetSectionList (); if (section_list) { - uint32_t num_sections = section_list->GetSize(); - for (uint32_t i=0; i<num_sections; ++i) + const size_t num_sections = section_list->GetSize(); + for (size_t i=0; i<num_sections; ++i) { SectionSP section_sp (section_list->GetSectionAtIndex (i)); if (section_sp) @@ -490,8 +490,8 @@ DynamicLoaderMacOSXDYLD::UpdateImageLoadAddress (Module *module, DYLDImageInfo& std::vector<uint32_t> inaccessible_segment_indexes; // We now know the slide amount, so go through all sections // and update the load addresses with the correct values. - uint32_t num_segments = info.segments.size(); - for (uint32_t i=0; i<num_segments; ++i) + const size_t num_segments = info.segments.size(); + for (size_t i=0; i<num_segments; ++i) { // Only load a segment if it has protections. Things like // __PAGEZERO don't have any protections, and they shouldn't @@ -585,8 +585,8 @@ DynamicLoaderMacOSXDYLD::UnloadImageLoadAddress (Module *module, DYLDImageInfo& SectionList *section_list = image_object_file->GetSectionList (); if (section_list) { - uint32_t num_segments = info.segments.size(); - for (uint32_t i=0; i<num_segments; ++i) + const size_t num_segments = info.segments.size(); + for (size_t i=0; i<num_segments; ++i) { SectionSP section_sp(section_list->FindSectionByName(info.segments[i].name)); if (section_sp) @@ -715,7 +715,7 @@ DynamicLoaderMacOSXDYLD::ReadAllImageInfosStructure () uint8_t buf[256]; DataExtractor data (buf, sizeof(buf), byte_order, addr_size); - uint32_t offset = 0; + lldb::offset_t offset = 0; const size_t count_v2 = sizeof (uint32_t) + // version sizeof (uint32_t) + // infoArrayCount @@ -740,7 +740,6 @@ DynamicLoaderMacOSXDYLD::ReadAllImageInfosStructure () addr_size; // errorSymbol assert (sizeof (buf) >= count_v11); - int count; Error error; if (m_process->ReadMemory (m_dyld_all_image_infos_addr, buf, 4, error) == 4) { @@ -767,10 +766,7 @@ DynamicLoaderMacOSXDYLD::ReadAllImageInfosStructure () return false; } - if (m_dyld_all_image_infos.version >= 11) - count = count_v11; - else - count = count_v2; + const size_t count = (m_dyld_all_image_infos.version >= 11) ? count_v11 : count_v2; const size_t bytes_read = m_process->ReadMemory (m_dyld_all_image_infos_addr, buf, count, error); if (bytes_read == count) @@ -1049,7 +1045,7 @@ DynamicLoaderMacOSXDYLD::ReadImageInfos (lldb::addr_t image_infos_addr, error); if (bytes_read == count) { - uint32_t info_data_offset = 0; + lldb::offset_t info_data_offset = 0; DataExtractor info_data_ref(info_data.GetBytes(), info_data.GetByteSize(), endian, addr_size); for (int i = 0; i < image_infos.size() && info_data_ref.ValidOffset(info_data_offset); i++) { @@ -1167,7 +1163,7 @@ DynamicLoaderMacOSXDYLD::ReadMachHeader (lldb::addr_t addr, llvm::MachO::mach_he error); if (bytes_read == sizeof(llvm::MachO::mach_header)) { - uint32_t offset = 0; + lldb::offset_t offset = 0; ::memset (header, 0, sizeof(llvm::MachO::mach_header)); // Get the magic byte unswapped so we can figure out what we are dealing with @@ -1229,7 +1225,7 @@ DynamicLoaderMacOSXDYLD::ReadMachHeader (lldb::addr_t addr, llvm::MachO::mach_he uint32_t DynamicLoaderMacOSXDYLD::ParseLoadCommands (const DataExtractor& data, DYLDImageInfo& dylib_info, FileSpec *lc_id_dylinker) { - uint32_t offset = 0; + lldb::offset_t offset = 0; uint32_t cmd_idx; Segment segment; dylib_info.Clear (true); @@ -1242,7 +1238,7 @@ DynamicLoaderMacOSXDYLD::ParseLoadCommands (const DataExtractor& data, DYLDImage if (data.ValidOffsetForDataOfSize (offset, sizeof(llvm::MachO::load_command))) { llvm::MachO::load_command load_cmd; - uint32_t load_cmd_offset = offset; + lldb::offset_t load_cmd_offset = offset; load_cmd.cmd = data.GetU32 (&offset); load_cmd.cmdsize = data.GetU32 (&offset); switch (load_cmd.cmd) @@ -1276,7 +1272,7 @@ DynamicLoaderMacOSXDYLD::ParseLoadCommands (const DataExtractor& data, DYLDImage case llvm::MachO::LoadCommandDynamicLinkerIdent: if (lc_id_dylinker) { - uint32_t name_offset = load_cmd_offset + data.GetU32 (&offset); + const lldb::offset_t name_offset = load_cmd_offset + data.GetU32 (&offset); const char *path = data.PeekCStr (name_offset); lc_id_dylinker->SetFile (path, true); } diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp index 17d9da054ca..de4d1e77b88 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp @@ -26,21 +26,25 @@ using namespace lldb_private; static bool GetMaxU64(DataExtractor &data, - uint32_t *offset, uint64_t *value, unsigned int byte_size) + lldb::offset_t *offset_ptr, + uint64_t *value, + unsigned int byte_size) { - uint32_t saved_offset = *offset; - *value = data.GetMaxU64(offset, byte_size); - return *offset != saved_offset; + lldb::offset_t saved_offset = *offset_ptr; + *value = data.GetMaxU64(offset_ptr, byte_size); + return *offset_ptr != saved_offset; } static bool -ParseAuxvEntry(DataExtractor &data, AuxVector::Entry &entry, - uint32_t *offset, unsigned int byte_size) +ParseAuxvEntry(DataExtractor &data, + AuxVector::Entry &entry, + lldb::offset_t *offset_ptr, + unsigned int byte_size) { - if (!GetMaxU64(data, offset, &entry.type, byte_size)) + if (!GetMaxU64(data, offset_ptr, &entry.type, byte_size)) return false; - if (!GetMaxU64(data, offset, &entry.value, byte_size)) + if (!GetMaxU64(data, offset_ptr, &entry.value, byte_size)) return false; return true; @@ -57,7 +61,7 @@ void AuxVector::ParseAuxv(DataExtractor &data) { const unsigned int byte_size = m_process->GetAddressByteSize(); - uint32_t offset = 0; + lldb::offset_t offset = 0; for (;;) { diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp index 6b9b8d6baa2..b57f2c5b0b3 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp @@ -304,7 +304,7 @@ DYLDRendezvous::DumpToLog(LogSP log) const log->PutCString("DYLDRendezvous:"); log->Printf(" Address: %" PRIx64, GetRendezvousAddress()); - log->Printf(" Version: %d", GetVersion()); + log->Printf(" Version: %" PRIu64, GetVersion()); log->Printf(" Link : %" PRIx64, GetLinkMapAddress()); log->Printf(" Break : %" PRIx64, GetBreakAddress()); log->Printf(" LDBase : %" PRIx64, GetLDBase()); diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.h b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.h index 3402a72ce91..81cb74f153b 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.h +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.h @@ -73,7 +73,7 @@ public: GetRendezvousAddress() const { return m_rendezvous_addr; } /// @returns the version of the rendezvous protocol being used. - int + uint64_t GetVersion() const { return m_current.version; } /// @returns address in the inferiors address space containing the linked @@ -92,7 +92,7 @@ public: GetBreakAddress() const { return m_current.brk; } /// Returns the current state of the rendezvous structure. - int + uint64_t GetState() const { return m_current.state; } /// @returns the base address of the runtime linker in the inferiors address |
