diff options
| -rw-r--r-- | llvm/test/DebugInfo/PDB/pdbdump-headers.test | 46 | ||||
| -rw-r--r-- | llvm/tools/llvm-pdbdump/LLVMOutputStyle.cpp | 3 |
2 files changed, 40 insertions, 9 deletions
diff --git a/llvm/test/DebugInfo/PDB/pdbdump-headers.test b/llvm/test/DebugInfo/PDB/pdbdump-headers.test index c3a97f0dd64..dfa2f30ab79 100644 --- a/llvm/test/DebugInfo/PDB/pdbdump-headers.test +++ b/llvm/test/DebugInfo/PDB/pdbdump-headers.test @@ -859,7 +859,11 @@ ; EMPTY-NEXT: File Pointer to Linenumbers: 0 ; EMPTY-NEXT: Number of Relocations: 0 ; EMPTY-NEXT: Number of Linenumbers: 0 -; EMPTY-NEXT: Characteristics: 1610612768 +; EMPTY-NEXT: Characteristics [ (0x60000020) +; EMPTY-NEXT: IMAGE_SCN_CNT_CODE (0x20) +; EMPTY-NEXT: IMAGE_SCN_MEM_EXECUTE (0x20000000) +; EMPTY-NEXT: IMAGE_SCN_MEM_READ (0x40000000) +; EMPTY-NEXT: ] ; EMPTY-NEXT: } ; EMPTY-NEXT: { ; EMPTY-NEXT: Name: .rdata @@ -871,7 +875,10 @@ ; EMPTY-NEXT: File Pointer to Linenumbers: 0 ; EMPTY-NEXT: Number of Relocations: 0 ; EMPTY-NEXT: Number of Linenumbers: 0 -; EMPTY-NEXT: Characteristics: 1073741888 +; EMPTY-NEXT: Characteristics [ (0x40000040) +; EMPTY-NEXT: IMAGE_SCN_CNT_INITIALIZED_DATA (0x40) +; EMPTY-NEXT: IMAGE_SCN_MEM_READ (0x40000000) +; EMPTY-NEXT: ] ; EMPTY-NEXT: } ; EMPTY-NEXT: { ; EMPTY-NEXT: Name: .data @@ -883,7 +890,11 @@ ; EMPTY-NEXT: File Pointer to Linenumbers: 0 ; EMPTY-NEXT: Number of Relocations: 0 ; EMPTY-NEXT: Number of Linenumbers: 0 -; EMPTY-NEXT: Characteristics: 3221225536 +; EMPTY-NEXT: Characteristics [ (0xC0000040) +; EMPTY-NEXT: IMAGE_SCN_CNT_INITIALIZED_DATA (0x40) +; EMPTY-NEXT: IMAGE_SCN_MEM_READ (0x40000000) +; EMPTY-NEXT: IMAGE_SCN_MEM_WRITE (0x80000000) +; EMPTY-NEXT: ] ; EMPTY-NEXT: } ; EMPTY-NEXT: { ; EMPTY-NEXT: Name: .reloc @@ -895,7 +906,11 @@ ; EMPTY-NEXT: File Pointer to Linenumbers: 0 ; EMPTY-NEXT: Number of Relocations: 0 ; EMPTY-NEXT: Number of Linenumbers: 0 -; EMPTY-NEXT: Characteristics: 1107296320 +; EMPTY-NEXT: Characteristics [ (0x42000040) +; EMPTY-NEXT: IMAGE_SCN_CNT_INITIALIZED_DATA (0x40) +; EMPTY-NEXT: IMAGE_SCN_MEM_DISCARDABLE (0x2000000) +; EMPTY-NEXT: IMAGE_SCN_MEM_READ (0x40000000) +; EMPTY-NEXT: ] ; EMPTY-NEXT: } ; EMPTY-NEXT: ] ; EMPTY: New FPO [ @@ -1584,7 +1599,11 @@ ; ALL: File Pointer to Linenumbers: 0 ; ALL: Number of Relocations: 0 ; ALL: Number of Linenumbers: 0 -; ALL: Characteristics: 1610612768 +; ALL: Characteristics [ (0x60000020) +; ALL: IMAGE_SCN_CNT_CODE (0x20) +; ALL: IMAGE_SCN_MEM_EXECUTE (0x20000000) +; ALL: IMAGE_SCN_MEM_READ (0x40000000) +; ALL: ] ; ALL: } ; ALL: { ; ALL: Name: .rdata @@ -1596,7 +1615,10 @@ ; ALL: File Pointer to Linenumbers: 0 ; ALL: Number of Relocations: 0 ; ALL: Number of Linenumbers: 0 -; ALL: Characteristics: 1073741888 +; ALL: Characteristics [ (0x40000040) +; ALL: IMAGE_SCN_CNT_INITIALIZED_DATA (0x40) +; ALL: IMAGE_SCN_MEM_READ (0x40000000) +; ALL: ] ; ALL: } ; ALL: { ; ALL: Name: .data @@ -1608,7 +1630,11 @@ ; ALL: File Pointer to Linenumbers: 0 ; ALL: Number of Relocations: 0 ; ALL: Number of Linenumbers: 0 -; ALL: Characteristics: 3221225536 +; ALL: Characteristics [ (0xC0000040) +; ALL: IMAGE_SCN_CNT_INITIALIZED_DATA (0x40) +; ALL: IMAGE_SCN_MEM_READ (0x40000000) +; ALL: IMAGE_SCN_MEM_WRITE (0x80000000) +; ALL: ] ; ALL: } ; ALL: { ; ALL: Name: .reloc @@ -1620,7 +1646,11 @@ ; ALL: File Pointer to Linenumbers: 0 ; ALL: Number of Relocations: 0 ; ALL: Number of Linenumbers: 0 -; ALL: Characteristics: 1107296320 +; ALL: Characteristics [ (0x42000040) +; ALL: IMAGE_SCN_CNT_INITIALIZED_DATA (0x40) +; ALL: IMAGE_SCN_MEM_DISCARDABLE (0x2000000) +; ALL: IMAGE_SCN_MEM_READ (0x40000000) +; ALL: ] ; ALL: } ; ALL: ] diff --git a/llvm/tools/llvm-pdbdump/LLVMOutputStyle.cpp b/llvm/tools/llvm-pdbdump/LLVMOutputStyle.cpp index 75e87afeb74..034879bf0f4 100644 --- a/llvm/tools/llvm-pdbdump/LLVMOutputStyle.cpp +++ b/llvm/tools/llvm-pdbdump/LLVMOutputStyle.cpp @@ -665,7 +665,8 @@ Error LLVMOutputStyle::dumpSectionHeaders() { P.printNumber("File Pointer to Linenumbers", Section.PointerToLinenumbers); P.printNumber("Number of Relocations", Section.NumberOfRelocations); P.printNumber("Number of Linenumbers", Section.NumberOfLinenumbers); - P.printNumber("Characteristics", Section.Characteristics); + P.printFlags("Characteristics", Section.Characteristics, + getImageSectionCharacteristicNames()); } return Error::success(); } |
