diff options
Diffstat (limited to 'lldb/source/Plugins/DynamicLoader/POSIX-DYLD')
3 files changed, 16 insertions, 12 deletions
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 |
