hjyamauchi updated this revision to Diff 547086.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D157059/new/
https://reviews.llvm.org/D157059
Files:
lldb/include/lldb/Symbol/ObjectFile.h
lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
lldb/source/Symbol/ObjectFile.cpp
lldb/unittests/ObjectFile/PECOFF/CMakeLists.txt
lldb/unittests/ObjectFile/PECOFF/TestSectionSize.cpp
llvm/lib/ObjectYAML/COFFYAML.cpp
llvm/test/tools/yaml2obj/COFF/invalid-raw-data.yaml
llvm/test/tools/yaml2obj/COFF/xrelocs.yaml
Index: llvm/test/tools/yaml2obj/COFF/xrelocs.yaml
===================================================================
--- llvm/test/tools/yaml2obj/COFF/xrelocs.yaml
+++ llvm/test/tools/yaml2obj/COFF/xrelocs.yaml
@@ -30,6 +30,7 @@
# CHECK-YAML-NEXT: Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_LNK_NRELOC_OVFL, IMAGE_SCN_MEM_READ ]
# CHECK-YAML-NEXT: Alignment: 16
# CHECK-YAML-NEXT: SectionData: '00000000000000000000000000000000'
+# CHECK-YAML-NEXT: SizeOfRawData: 16
# CHECK-YAML-NEXT: Relocations:
# CHECK-YAML-NEXT: - VirtualAddress: 0
# CHECK-YAML-NEXT: SymbolName: foo
Index: llvm/test/tools/yaml2obj/COFF/invalid-raw-data.yaml
===================================================================
--- llvm/test/tools/yaml2obj/COFF/invalid-raw-data.yaml
+++ llvm/test/tools/yaml2obj/COFF/invalid-raw-data.yaml
@@ -1,5 +1,5 @@
# RUN: not yaml2obj %s -o %t 2>&1 | FileCheck %s
-# CHECK: YAML:18:5: error: unknown key 'SizeOfRawData'
+# CHECK: YAML:14:5: error: StructuredData and SizeOfRawData can't be used together
--- !COFF
OptionalHeader:
Index: llvm/lib/ObjectYAML/COFFYAML.cpp
===================================================================
--- llvm/lib/ObjectYAML/COFFYAML.cpp
+++ llvm/lib/ObjectYAML/COFFYAML.cpp
@@ -689,11 +689,12 @@
return;
}
- // Uninitialized sections, such as .bss, typically have no data, but the size
- // is carried in SizeOfRawData, even though PointerToRawData is zero.
- if (Sec.SectionData.binary_size() == 0 && Sec.StructuredData.empty() &&
- NC->Characteristics & COFF::IMAGE_SCN_CNT_UNINITIALIZED_DATA)
- IO.mapOptional("SizeOfRawData", Sec.Header.SizeOfRawData);
+ IO.mapOptional("SizeOfRawData", Sec.Header.SizeOfRawData, 0U);
+
+ if (!Sec.StructuredData.empty() && Sec.Header.SizeOfRawData) {
+ IO.setError("StructuredData and SizeOfRawData can't be used together");
+ return;
+ }
IO.mapOptional("Relocations", Sec.Relocations);
}
Index: lldb/unittests/ObjectFile/PECOFF/TestSectionSize.cpp
===================================================================
--- /dev/null
+++ lldb/unittests/ObjectFile/PECOFF/TestSectionSize.cpp
@@ -0,0 +1,78 @@
+//===-- TestSectionFileSize.cpp -------------------------------------------===//
+//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "gtest/gtest.h"
+
+#include "Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h"
+#include "Plugins/Process/Utility/lldb-x86-register-enums.h"
+#include "TestingSupport/SubsystemRAII.h"
+#include "TestingSupport/TestUtilities.h"
+
+#include "lldb/Core/Module.h"
+#include "lldb/Symbol/CallFrameInfo.h"
+#include "lldb/Symbol/UnwindPlan.h"
+#include "llvm/Testing/Support/Error.h"
+
+using namespace lldb_private;
+using namespace lldb;
+
+class SectionSizeTest : public testing::Test {
+ SubsystemRAII<FileSystem, ObjectFilePECOFF> subsystems;
+};
+
+TEST_F(SectionSizeTest, NoAlignmentPadding) {
+ llvm::Expected<TestFile> ExpectedFile = TestFile::fromYaml(
+ R"(
+--- !COFF
+OptionalHeader:
+ SectionAlignment: 4096
+ FileAlignment: 512
+header:
+ Machine: IMAGE_FILE_MACHINE_AMD64
+ Characteristics: [ IMAGE_FILE_EXECUTABLE_IMAGE, IMAGE_FILE_LARGE_ADDRESS_AWARE ]
+sections:
+ - Name: swiftast
+ VirtualSize: 496
+ SizeOfRawData: 512
+ Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
+ SectionData: 11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000
+
+symbols: []
+...
+)");
+ ASSERT_THAT_EXPECTED(ExpectedFile, llvm::Succeeded());
+
+ ModuleSP module_sp = std::make_shared<Module>(ExpectedFile->moduleSpec());
+ ObjectFile *object_file = module_sp->GetObjectFile();
+ ASSERT_NE(object_file, nullptr);
+
+ SectionList *section_list = object_file->GetSectionList();
+ ASSERT_NE(section_list, nullptr);
+
+ SectionSP swiftast_section;
+ size_t section_count = section_list->GetNumSections(0);
+ for (size_t i = 0; i < section_count; ++i) {
+ SectionSP section_sp = section_list->GetSectionAtIndex(i);
+ if (section_sp->GetName() == "swiftast") {
+ swiftast_section = section_sp;
+ break;
+ }
+ }
+ ASSERT_NE(swiftast_section.get(), nullptr);
+
+ DataExtractor section_data;
+ ASSERT_NE(object_file->ReadSectionData(swiftast_section.get(),
+ section_data),
+ 0);
+
+ // Check that the section data size is equal to VirtualSize (496)
+ // without the zero padding, instead of SizeOfRawData (512).
+ EXPECT_EQ(section_data.GetByteSize(), 496);
+}
+
Index: lldb/unittests/ObjectFile/PECOFF/CMakeLists.txt
===================================================================
--- lldb/unittests/ObjectFile/PECOFF/CMakeLists.txt
+++ lldb/unittests/ObjectFile/PECOFF/CMakeLists.txt
@@ -1,5 +1,6 @@
add_lldb_unittest(ObjectFilePECOFFTests
TestPECallFrameInfo.cpp
+ TestSectionSize.cpp
LINK_LIBS
lldbUtilityHelpers
Index: lldb/source/Symbol/ObjectFile.cpp
===================================================================
--- lldb/source/Symbol/ObjectFile.cpp
+++ lldb/source/Symbol/ObjectFile.cpp
@@ -550,8 +550,8 @@
// The object file now contains a full mmap'ed copy of the object file
// data, so just use this
- return GetData(section->GetFileOffset(), section->GetFileSize(),
- section_data);
+ return GetData(section->GetFileOffset(), GetSectionDataSize(section),
+ section_data);
}
bool ObjectFile::SplitArchivePathWithObject(llvm::StringRef path_with_object,
Index: lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
===================================================================
--- lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
+++ lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
@@ -263,6 +263,7 @@
llvm::StringRef GetSectionName(const section_header_t §);
static lldb::SectionType GetSectionType(llvm::StringRef sect_name,
const section_header_t §);
+ size_t GetSectionDataSize(lldb_private::Section *section) override;
typedef std::vector<section_header_t> SectionHeaderColl;
typedef SectionHeaderColl::iterator SectionHeaderCollIter;
Index: lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
===================================================================
--- lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
+++ lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
@@ -1027,6 +1027,16 @@
return eSectionTypeOther;
}
+size_t ObjectFilePECOFF::GetSectionDataSize(Section *section) {
+ // For executables, SizeOfRawData (getFileSize()) is aligned by
+ // FileAllignment and the actual section size is in VirtualSize
+ // (getByteSize()). See the comment on
+ // llvm::object::COFFObjectFile::getSectionSize().
+ if (m_binary->getDOSHeader())
+ return std::min(section->GetByteSize(), section->GetFileSize());
+ return section->GetFileSize();
+}
+
void ObjectFilePECOFF::CreateSections(SectionList &unified_section_list) {
if (m_sections_up)
return;
Index: lldb/include/lldb/Symbol/ObjectFile.h
===================================================================
--- lldb/include/lldb/Symbol/ObjectFile.h
+++ lldb/include/lldb/Symbol/ObjectFile.h
@@ -654,6 +654,12 @@
virtual size_t ReadSectionData(Section *section,
DataExtractor §ion_data);
+ // Returns the section data size. This is special-cased for PECOFF
+ // due to file alignment.
+ virtual size_t GetSectionDataSize(Section *section) {
+ return section->GetFileSize();
+ }
+
/// Returns true if the object file exists only in memory.
bool IsInMemory() const { return m_memory_addr != LLDB_INVALID_ADDRESS; }
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
