caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move DataBuffer / DataExtractor and friends from Core -> Utility.

Browse Source 
llvm-svn: 296943
This commit is contained in:
Zachary Turner
2017-03-04 01:30:05 +00:00
parent 51383a60c0
commit 666cc0b291
179 changed files with 308 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
View File

@@ -14,7 +14,6 @@
#include <unordered_map>
#include "lldb/Core/ArchSpec.h"
#include "lldb/Core/DataBufferLLVM.h"
#include "lldb/Core/FileSpecList.h"
#include "lldb/Core/Module.h"
#include "lldb/Core/ModuleSpec.h"
@@ -25,6 +24,7 @@
#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Target/SectionLoadList.h"
#include "lldb/Target/Target.h"
#include "lldb/Utility/DataBufferLLVM.h"
#include "lldb/Utility/Error.h"
#include "lldb/Utility/Log.h"
#include "lldb/Utility/Stream.h"
@@ -387,7 +387,8 @@ ObjectFile *ObjectFileELF::CreateInstance(const lldb::ModuleSP &module_sp,
lldb::offset_t file_offset,
lldb::offset_t length) {
if (!data_sp) {
data_sp = DataBufferLLVM::CreateFromFileSpec(*file, length, file_offset);
data_sp =
DataBufferLLVM::CreateFromPath(file->GetPath(), length, file_offset);
if (!data_sp)
return nullptr;
data_offset = 0;
@@ -404,7 +405,8 @@ ObjectFile *ObjectFileELF::CreateInstance(const lldb::ModuleSP &module_sp,
// Update the data to contain the entire file if it doesn't already
if (data_sp->GetByteSize() < length) {
data_sp = DataBufferLLVM::CreateFromFileSpec(*file, length, file_offset);
data_sp =
DataBufferLLVM::CreateFromPath(file->GetPath(), length, file_offset);
if (!data_sp)
return nullptr;
data_offset = 0;
@@ -663,8 +665,8 @@ size_t ObjectFileELF::GetModuleSpecifications(
size_t section_header_end = header.e_shoff + header.e_shentsize;
if (header.HasHeaderExtension() &&
section_header_end > data_sp->GetByteSize()) {
data_sp = DataBufferLLVM::CreateFromFileSpec(
file, section_header_end, file_offset);
data_sp = DataBufferLLVM::CreateFromPath(
file.GetPath(), section_header_end, file_offset);
if (data_sp) {
data.SetData(data_sp);
lldb::offset_t header_offset = data_offset;
@@ -677,8 +679,8 @@ size_t ObjectFileELF::GetModuleSpecifications(
section_header_end =
header.e_shoff + header.e_shnum * header.e_shentsize;
if (section_header_end > data_sp->GetByteSize()) {
data_sp = DataBufferLLVM::CreateFromFileSpec(
file, section_header_end, file_offset);
data_sp = DataBufferLLVM::CreateFromPath(
file.GetPath(), section_header_end, file_offset);
if (data_sp)
data.SetData(data_sp);
}
@@ -722,8 +724,8 @@ size_t ObjectFileELF::GetModuleSpecifications(
size_t program_headers_end =
header.e_phoff + header.e_phnum * header.e_phentsize;
if (program_headers_end > data_sp->GetByteSize()) {
data_sp = DataBufferLLVM::CreateFromFileSpec(
file, program_headers_end, file_offset);
data_sp = DataBufferLLVM::CreateFromPath(
file.GetPath(), program_headers_end, file_offset);
if (data_sp)
data.SetData(data_sp);
}
@@ -738,8 +740,8 @@ size_t ObjectFileELF::GetModuleSpecifications(
}
if (segment_data_end > data_sp->GetByteSize()) {
data_sp = DataBufferLLVM::CreateFromFileSpec(
file, segment_data_end, file_offset);
data_sp = DataBufferLLVM::CreateFromPath(
file.GetPath(), segment_data_end, file_offset);
if (data_sp)
data.SetData(data_sp);
}
@@ -748,8 +750,8 @@ size_t ObjectFileELF::GetModuleSpecifications(
CalculateELFNotesSegmentsCRC32(program_headers, data);
} else {
// Need to map entire file into memory to calculate the crc.
data_sp =
DataBufferLLVM::CreateFromFileSpec(file, -1, file_offset);
data_sp = DataBufferLLVM::CreateFromPath(file.GetPath(), -1,
file_offset);
if (data_sp) {
data.SetData(data_sp);
gnu_debuglink_crc = calc_gnu_debuglink_crc32(