diff options
Diffstat (limited to 'lldb/source/Plugins/ObjectFile/PECOFF')
| -rw-r--r-- | lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp | 22 | ||||
| -rw-r--r-- | lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h | 6 |
2 files changed, 14 insertions, 14 deletions
diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp index 8447a88d1dc..6bfe69503e9 100644 --- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp +++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp @@ -169,7 +169,7 @@ bool ObjectFilePECOFF::MagicBytesMatch (DataBufferSP& dataSP) { DataExtractor data(dataSP, eByteOrderLittle, 4); - uint32_t offset = 0; + lldb::offset_t offset = 0; uint16_t magic = data.GetU16 (&offset); return magic == IMAGE_DOS_SIGNATURE; } @@ -206,7 +206,7 @@ ObjectFilePECOFF::ParseHeader () lldb_private::Mutex::Locker locker(module_sp->GetMutex()); m_sect_headers.clear(); m_data.SetByteOrder (eByteOrderLittle); - uint32_t offset = 0; + lldb::offset_t offset = 0; if (ParseDOSHeader()) { @@ -239,7 +239,7 @@ ObjectFilePECOFF::IsExecutable() const return (m_coff_header.flags & IMAGE_FILE_DLL) == 0; } -size_t +uint32_t ObjectFilePECOFF::GetAddressByteSize () const { if (m_coff_header_opt.magic == OPT_HEADER_MAGIC_PE32_PLUS) @@ -271,7 +271,7 @@ bool ObjectFilePECOFF::ParseDOSHeader () { bool success = false; - uint32_t offset = 0; + lldb::offset_t offset = 0; success = m_data.ValidOffsetForDataOfSize(0, sizeof(m_dos_header)); if (success) @@ -326,7 +326,7 @@ ObjectFilePECOFF::ParseDOSHeader () // ParserCOFFHeader //---------------------------------------------------------------------- bool -ObjectFilePECOFF::ParseCOFFHeader(uint32_t* offset_ptr) +ObjectFilePECOFF::ParseCOFFHeader(lldb::offset_t *offset_ptr) { bool success = m_data.ValidOffsetForDataOfSize (*offset_ptr, sizeof(m_coff_header)); if (success) @@ -345,10 +345,10 @@ ObjectFilePECOFF::ParseCOFFHeader(uint32_t* offset_ptr) } bool -ObjectFilePECOFF::ParseCOFFOptionalHeader(uint32_t* offset_ptr) +ObjectFilePECOFF::ParseCOFFOptionalHeader(lldb::offset_t *offset_ptr) { bool success = false; - const uint32_t end_offset = *offset_ptr + m_coff_header.hdrsize; + const lldb::offset_t end_offset = *offset_ptr + m_coff_header.hdrsize; if (*offset_ptr < end_offset) { success = true; @@ -429,7 +429,7 @@ ObjectFilePECOFF::ParseSectionHeaders (uint32_t section_header_data_offset) DataBufferSP section_header_data_sp(m_file.ReadFileContents (section_header_data_offset, section_header_byte_size)); DataExtractor section_header_data (section_header_data_sp, GetByteOrder(), addr_byte_size); - uint32_t offset = 0; + lldb::offset_t offset = 0; if (section_header_data.ValidOffsetForDataOfSize (offset, section_header_byte_size)) { m_sect_headers.resize(nsects); @@ -462,8 +462,8 @@ ObjectFilePECOFF::GetSectionName(std::string& sect_name, const section_header_t& { if (sect.name[0] == '/') { - uint32_t stroff = strtoul(§.name[1], NULL, 10); - uint32_t string_file_offset = m_coff_header.symoff + (m_coff_header.nsyms * 18) + stroff; + lldb::offset_t stroff = strtoul(§.name[1], NULL, 10); + lldb::offset_t string_file_offset = m_coff_header.symoff + (m_coff_header.nsyms * 18) + stroff; const char *name = m_data.GetCStr (&string_file_offset); if (name) { @@ -503,7 +503,7 @@ ObjectFilePECOFF::GetSymtab() // Include the 4 bytes string table size at the end of the symbols DataBufferSP symtab_data_sp(m_file.ReadFileContents (m_coff_header.symoff, symbol_data_size + 4)); DataExtractor symtab_data (symtab_data_sp, GetByteOrder(), addr_byte_size); - uint32_t offset = symbol_data_size; + lldb::offset_t offset = symbol_data_size; const uint32_t strtab_size = symtab_data.GetU32 (&offset); DataBufferSP strtab_data_sp(m_file.ReadFileContents (m_coff_header.symoff + symbol_data_size + 4, strtab_size)); DataExtractor strtab_data (strtab_data_sp, GetByteOrder(), addr_byte_size); diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h index 2e41ce4ff2b..446999c6c84 100644 --- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h +++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h @@ -68,7 +68,7 @@ public: virtual bool IsExecutable () const; - virtual size_t + virtual uint32_t GetAddressByteSize () const; // virtual lldb_private::AddressClass @@ -212,8 +212,8 @@ protected: } coff_symbol_t; bool ParseDOSHeader (); - bool ParseCOFFHeader (uint32_t* offset_ptr); - bool ParseCOFFOptionalHeader (uint32_t* offset_ptr); + bool ParseCOFFHeader (lldb::offset_t *offset_ptr); + bool ParseCOFFOptionalHeader (lldb::offset_t *offset_ptr); bool ParseSectionHeaders (uint32_t offset); static void DumpDOSHeader(lldb_private::Stream *s, const dos_header_t& header); |
