[obj2yaml] [COFF] Write RVA instead of VA for sections, fix roundtripping executables

yaml2obj writes the yaml value as is to the output file.

Differential Revision: https://reviews.llvm.org/D54965

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@347916 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/tools/yaml2obj/coff-arm64.yaml b/test/tools/yaml2obj/coff-arm64.yaml
index 9115082..d734e30 100644 (file)
--- a/test/tools/yaml2obj/coff-arm64.yaml
+++ b/test/tools/yaml2obj/coff-arm64.yaml
@@ -1,8 +1,13 @@
 # RUN: yaml2obj %s -o %t
 # RUN: llvm-readobj -file-headers %t | FileCheck %s
+# RUN: obj2yaml %t | FileCheck %s --check-prefix=ROUNDTRIP
 
 # CHECK: OptionalHeaderSize: 240
 
+# ROUNDTRIP: VirtualAddress:  4096
+# ROUNDTRIP: VirtualAddress:  8192
+# ROUNDTRIP: VirtualAddress:  12288
+
 --- !COFF
 OptionalHeader:  
   AddressOfEntryPoint: 4096
@@ -72,17 +77,17 @@ header:
 sections:        
   - Name:            .text
     Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
-    VirtualAddress:  1073745920
+    VirtualAddress:  4096
     VirtualSize:     4
     SectionData:     C0035FD6
   - Name:            .rdata
     Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
-    VirtualAddress:  1073750016
+    VirtualAddress:  8192
     VirtualSize:     12
     SectionData:     0100400800000000E4E3E3E3
   - Name:            .pdata
     Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
-    VirtualAddress:  1073754112
+    VirtualAddress:  12288
     VirtualSize:     8
     SectionData:     '0010000000200000'
 symbols:         []

diff --git a/tools/obj2yaml/coff2yaml.cpp b/tools/obj2yaml/coff2yaml.cpp
index 57fb1d0..6835dcf 100644 (file)
--- a/tools/obj2yaml/coff2yaml.cpp
+++ b/tools/obj2yaml/coff2yaml.cpp
@@ -147,7 +147,7 @@ void COFFDumper::dumpSections(unsigned NumSections) {
     COFFYAML::Section NewYAMLSection;
     ObjSection.getName(NewYAMLSection.Name);
     NewYAMLSection.Header.Characteristics = COFFSection->Characteristics;
-    NewYAMLSection.Header.VirtualAddress = ObjSection.getAddress();
+    NewYAMLSection.Header.VirtualAddress = COFFSection->VirtualAddress;
     NewYAMLSection.Header.VirtualSize = COFFSection->VirtualSize;
     NewYAMLSection.Header.NumberOfLineNumbers =
         COFFSection->NumberOfLinenumbers;