diff options
Diffstat (limited to 'lldb/source/Plugins/LanguageRuntime')
4 files changed, 31 insertions, 31 deletions
diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp index 2cd340980c1..494cf92bc37 100644 --- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp @@ -90,10 +90,10 @@ ItaniumABILanguageRuntime::GetDynamicTypeAndAddress (ValueObject &in_value, return false; } - uint32_t offset_ptr = 0; - lldb::addr_t vtable_address_point = data.GetAddress (&offset_ptr); + lldb::offset_t offset = 0; + lldb::addr_t vtable_address_point = data.GetAddress (&offset); - if (offset_ptr == 0) + if (offset == 0) return false; // Now find the symbol that contains this address: @@ -255,8 +255,8 @@ ItaniumABILanguageRuntime::GetDynamicTypeAndAddress (ValueObject &in_value, return false; } - offset_ptr = 0; - int64_t offset_to_top = data.GetMaxS64(&offset_ptr, process->GetAddressByteSize()); + offset = 0; + int64_t offset_to_top = data.GetMaxS64(&offset, process->GetAddressByteSize()); // So the dynamic type is a value that starts at offset_to_top // above the original address. diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp index 545a8cae624..782b74a43fe 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp @@ -385,7 +385,7 @@ AppleObjCRuntimeV1::UpdateISAToDescriptorMapIfNeeded() const uint32_t addr_size = m_process->GetAddressByteSize(); const ByteOrder byte_order = m_process->GetByteOrder(); DataExtractor data (buffer.GetBytes(), buffer.GetByteSize(), byte_order, addr_size); - uint32_t offset = addr_size; // Skip prototype + lldb::offset_t offset = addr_size; // Skip prototype const uint32_t count = data.GetU32(&offset); const uint32_t num_buckets = data.GetU32(&offset); const addr_t buckets_ptr = data.GetPointer(&offset); diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp index cfe7d13c697..6c4223784cd 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp @@ -1256,7 +1256,7 @@ private: DataExtractor extractor(objc_class_buf.GetBytes(), objc_class_size, process->GetByteOrder(), process->GetAddressByteSize()); - uint32_t cursor = 0; + lldb::offset_t cursor = 0; m_isa = extractor.GetAddress_unchecked(&cursor); // uintptr_t isa; m_superclass = extractor.GetAddress_unchecked(&cursor); // Class superclass; @@ -1315,7 +1315,7 @@ private: DataExtractor extractor(buffer.GetBytes(), size, process->GetByteOrder(), process->GetAddressByteSize()); - uint32_t cursor = 0; + lldb::offset_t cursor = 0; m_flags = extractor.GetU32_unchecked(&cursor); m_instanceStart = extractor.GetU32_unchecked(&cursor); @@ -1386,13 +1386,13 @@ private: DataExtractor extractor(buffer.GetBytes(), size, process->GetByteOrder(), process->GetAddressByteSize()); - uint32_t cursor = 0; + lldb::offset_t cursor = 0; m_flags = extractor.GetU32_unchecked(&cursor); m_version = extractor.GetU32_unchecked(&cursor); - m_ro_ptr = extractor.GetAddress_unchecked(&cursor); - m_method_list_ptr = extractor.GetAddress_unchecked(&cursor); - m_properties_ptr = extractor.GetAddress_unchecked(&cursor); + m_ro_ptr = extractor.GetAddress_unchecked(&cursor); + m_method_list_ptr = extractor.GetAddress_unchecked(&cursor); + m_properties_ptr = extractor.GetAddress_unchecked(&cursor); m_firstSubclass = extractor.GetAddress_unchecked(&cursor); m_nextSiblingClass = extractor.GetAddress_unchecked(&cursor); @@ -1422,7 +1422,7 @@ private: DataExtractor extractor(buffer.GetBytes(), size, process->GetByteOrder(), process->GetAddressByteSize()); - uint32_t cursor = 0; + lldb::offset_t cursor = 0; m_entsize = extractor.GetU32_unchecked(&cursor) & ~(uint32_t)3; m_count = extractor.GetU32_unchecked(&cursor); @@ -1465,7 +1465,7 @@ private: DataExtractor extractor(buffer.GetBytes(), size, process->GetByteOrder(), process->GetAddressByteSize()); - uint32_t cursor = 0; + lldb::offset_t cursor = 0; m_name_ptr = extractor.GetAddress_unchecked(&cursor); m_types_ptr = extractor.GetAddress_unchecked(&cursor); @@ -1508,7 +1508,7 @@ private: DataExtractor extractor(buffer.GetBytes(), size, process->GetByteOrder(), process->GetAddressByteSize()); - uint32_t cursor = 0; + lldb::offset_t cursor = 0; m_entsize = extractor.GetU32_unchecked(&cursor); m_count = extractor.GetU32_unchecked(&cursor); @@ -1555,7 +1555,7 @@ private: DataExtractor extractor(buffer.GetBytes(), size, process->GetByteOrder(), process->GetAddressByteSize()); - uint32_t cursor = 0; + lldb::offset_t cursor = 0; m_offset_ptr = extractor.GetAddress_unchecked(&cursor); m_name_ptr = extractor.GetAddress_unchecked(&cursor); @@ -2176,11 +2176,11 @@ AppleObjCRuntimeV2::UpdateISAToDescriptorMapIfNeeded() DataExtractor isa_extractor(isas_buffer.GetBytes(), isas_allocation_size, process->GetByteOrder(), process->GetAddressByteSize()); - uint32_t offset_ptr = 0; + lldb::offset_t offset = 0; for (size_t index = 0; index < num_isas; ++index) { - uint64_t isa = isa_extractor.GetPointer(&offset_ptr); + uint64_t isa = isa_extractor.GetPointer(&offset); const char *name = (const char*)(names_buffer.GetBytes() + (name_size * index)); diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp index 1e35a2f9661..7766f5cd2aa 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp @@ -194,12 +194,12 @@ AppleObjCTrampolineHandler::AppleObjCVTables::VTableRegion::SetUpRegion() return; } - uint32_t offset_ptr = 0; - const uint16_t header_size = data.GetU16(&offset_ptr); - const uint16_t descriptor_size = data.GetU16(&offset_ptr); - const size_t num_descriptors = data.GetU32(&offset_ptr); + lldb::offset_t offset = 0; + const uint16_t header_size = data.GetU16(&offset); + const uint16_t descriptor_size = data.GetU16(&offset); + const size_t num_descriptors = data.GetU32(&offset); - m_next_region = data.GetPointer(&offset_ptr); + m_next_region = data.GetPointer(&offset); // If the header size is 0, that means we've come in too early before this data is set up. // Set ourselves as not valid, and continue. @@ -239,16 +239,16 @@ AppleObjCTrampolineHandler::AppleObjCVTables::VTableRegion::SetUpRegion() // The actual code for the vtables will be laid out consecutively, so I also // compute the start and end of the whole code block. - offset_ptr = 0; + offset = 0; m_code_start_addr = 0; m_code_end_addr = 0; for (int i = 0; i < num_descriptors; i++) { - lldb::addr_t start_offset = offset_ptr; - uint32_t offset = desc_extractor.GetU32 (&offset_ptr); - uint32_t flags = desc_extractor.GetU32 (&offset_ptr); - lldb::addr_t code_addr = desc_ptr + start_offset + offset; + lldb::addr_t start_offset = offset; + uint32_t voffset = desc_extractor.GetU32 (&offset); + uint32_t flags = desc_extractor.GetU32 (&offset); + lldb::addr_t code_addr = desc_ptr + start_offset + voffset; m_descriptors.push_back (VTableDescriptor(flags, code_addr)); if (m_code_start_addr == 0 || code_addr < m_code_start_addr) @@ -256,7 +256,7 @@ AppleObjCTrampolineHandler::AppleObjCVTables::VTableRegion::SetUpRegion() if (code_addr > m_code_end_addr) m_code_end_addr = code_addr; - offset_ptr = start_offset + descriptor_size; + offset = start_offset + descriptor_size; } // Finally, a little bird told me that all the vtable code blocks are the same size. // Let's compute the blocks and if they are all the same add the size to the code end address: @@ -427,8 +427,8 @@ AppleObjCTrampolineHandler::AppleObjCVTables::RefreshTrampolines (void *baton, data, 0, NULL); - uint32_t offset_ptr = 0; - lldb::addr_t region_addr = data.GetPointer(&offset_ptr); + lldb::offset_t offset = 0; + lldb::addr_t region_addr = data.GetPointer(&offset); if (region_addr != 0) vtable_handler->ReadRegions(region_addr); |
