This revision was automatically updated to reflect the committed changes.
Closed by commit rGbde5d31e96f5: Revert "Revert "[lldb] Make
SBSection::GetSectionData call Section… (authored by omjavaid).
Changed prior to commit:
https://reviews.llvm.org/D142672?vs=492839&id=493267#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D142672/new/
https://reviews.llvm.org/D142672
Files:
lldb/source/API/SBSection.cpp
lldb/test/API/python_api/section/TestSectionAPI.py
lldb/test/API/python_api/section/compressed-sections.yaml
Index: lldb/test/API/python_api/section/compressed-sections.yaml
===================================================================
--- /dev/null
+++ lldb/test/API/python_api/section/compressed-sections.yaml
@@ -0,0 +1,11 @@
+--- !ELF
+FileHeader:
+ Class: ELFCLASS32
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_386
+Sections:
+ - Name: .compressed
+ Type: SHT_PROGBITS
+ Flags: [ SHF_COMPRESSED ]
+ Content: 010000000800000001000000789c5330700848286898000009c802c1
Index: lldb/test/API/python_api/section/TestSectionAPI.py
===================================================================
--- lldb/test/API/python_api/section/TestSectionAPI.py
+++ lldb/test/API/python_api/section/TestSectionAPI.py
@@ -11,6 +11,8 @@
class SectionAPITestCase(TestBase):
+ @no_debug_info_test
+ @skipIfXmlSupportMissing
def test_get_target_byte_size(self):
d = {'EXE': 'b.out'}
self.build(dictionary=d)
@@ -38,6 +40,8 @@
self.assertIsNotNone(data_section)
self.assertEqual(data_section.target_byte_size, 1)
+ @no_debug_info_test
+ @skipIfXmlSupportMissing
def test_get_alignment(self):
exe = self.getBuildArtifact("aligned.out")
self.yaml2obj("aligned.yaml", exe)
@@ -48,3 +52,20 @@
section = target.modules[0].sections[0]
self.assertEqual(section.GetAlignment(), 0x1000)
self.assertEqual(section.alignment, 0x1000)
+
+ @no_debug_info_test
+ @skipIfXmlSupportMissing
+ def test_compressed_section_data(self):
+ exe = self.getBuildArtifact("compressed-sections.out")
+ self.yaml2obj("compressed-sections.yaml", exe)
+ target = self.dbg.CreateTarget(exe)
+ self.assertTrue(target, VALID_TARGET)
+
+ # exe contains a single section with SHF_COMPRESSED. Check that
+ # GetSectionData returns the uncompressed data and not the raw contents
+ # of the section.
+ section = target.modules[0].sections[0]
+ section_data = section.GetSectionData().uint8s
+ self.assertEqual(section_data,
+ [0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80, 0x90])
+
Index: lldb/source/API/SBSection.cpp
===================================================================
--- lldb/source/API/SBSection.cpp
+++ lldb/source/API/SBSection.cpp
@@ -182,35 +182,10 @@
SBData sb_data;
SectionSP section_sp(GetSP());
if (section_sp) {
- const uint64_t sect_file_size = section_sp->GetFileSize();
- if (sect_file_size > 0) {
- ModuleSP module_sp(section_sp->GetModule());
- if (module_sp) {
- ObjectFile *objfile = module_sp->GetObjectFile();
- if (objfile) {
- const uint64_t sect_file_offset =
- objfile->GetFileOffset() + section_sp->GetFileOffset();
- const uint64_t file_offset = sect_file_offset + offset;
- uint64_t file_size = size;
- if (file_size == UINT64_MAX) {
- file_size = section_sp->GetByteSize();
- if (file_size > offset)
- file_size -= offset;
- else
- file_size = 0;
- }
- auto data_buffer_sp = FileSystem::Instance().CreateDataBuffer(
- objfile->GetFileSpec().GetPath(), file_size, file_offset);
- if (data_buffer_sp && data_buffer_sp->GetByteSize() > 0) {
- DataExtractorSP data_extractor_sp(
- new DataExtractor(data_buffer_sp, objfile->GetByteOrder(),
- objfile->GetAddressByteSize()));
-
- sb_data.SetOpaque(data_extractor_sp);
- }
- }
- }
- }
+ DataExtractor section_data;
+ section_sp->GetSectionData(section_data);
+ sb_data.SetOpaque(
+ std::make_shared<DataExtractor>(section_data, offset, size));
}
return sb_data;
}
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
