[llvm] r183962 - [yaml2obj] Add support for sh_addralign via `AddressAlign` key.

[Sean Silva]

Author: silvas
Date: Thu Jun 13 19:38:02 2013
New Revision: 183962

URL: http://llvm.org/viewvc/llvm-project?rev=183962&view=rev
Log:
[yaml2obj] Add support for sh_addralign via `AddressAlign` key.

For consistency, change the address in the test case from 0xDEADBEEF to
0xCAFEBABE since 0xCAFEBABE that actually has a 2-byte alignment.

Modified:
    llvm/trunk/include/llvm/Object/ELFYAML.h
    llvm/trunk/lib/Object/ELFYAML.cpp
    llvm/trunk/test/Object/yaml2obj-elf-section-basic.yaml
    llvm/trunk/tools/yaml2obj/yaml2elf.cpp

Modified: llvm/trunk/include/llvm/Object/ELFYAML.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ELFYAML.h?rev=183962&r1=183961&r2=183962&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/ELFYAML.h (original)
+++ llvm/trunk/include/llvm/Object/ELFYAML.h Thu Jun 13 19:38:02 2013
@@ -55,6 +55,7 @@ struct Section {
   ELF_SHF Flags;
   llvm::yaml::Hex64 Address;
   object::yaml::BinaryRef Content;
+  llvm::yaml::Hex64 AddressAlign;
 };
 struct Object {
   FileHeader Header;

Modified: llvm/trunk/lib/Object/ELFYAML.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/ELFYAML.cpp?rev=183962&r1=183961&r2=183962&view=diff
==============================================================================
--- llvm/trunk/lib/Object/ELFYAML.cpp (original)
+++ llvm/trunk/lib/Object/ELFYAML.cpp Thu Jun 13 19:38:02 2013
@@ -267,6 +267,7 @@ void MappingTraits<ELFYAML::Section>::ma
   IO.mapOptional("Flags", Section.Flags, ELFYAML::ELF_SHF(0));
   IO.mapOptional("Address", Section.Address, Hex64(0));
   IO.mapOptional("Content", Section.Content);
+  IO.mapOptional("AddressAlign", Section.AddressAlign, Hex64(0));
 }
 
 void MappingTraits<ELFYAML::Object>::mapping(IO &IO, ELFYAML::Object &Object) {

Modified: llvm/trunk/test/Object/yaml2obj-elf-section-basic.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/yaml2obj-elf-section-basic.yaml?rev=183962&r1=183961&r2=183962&view=diff
==============================================================================
--- llvm/trunk/test/Object/yaml2obj-elf-section-basic.yaml (original)
+++ llvm/trunk/test/Object/yaml2obj-elf-section-basic.yaml Thu Jun 13 19:38:02 2013
@@ -9,8 +9,9 @@ Sections:
   - Name: .text
     Type: SHT_PROGBITS
     Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
-    Address: 0xDEADBEEF
+    Address: 0xCAFEBABE
     Content: EBFE
+    AddressAlign: 2
 
 # CHECK:        Section {
 # CHECK:          Index: 0
@@ -23,8 +24,9 @@ Sections:
 # CHECK-NEXT:       SHF_ALLOC (0x2)
 # CHECK-NEXT:       SHF_EXECINSTR (0x4)
 # CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0xDEADBEEF
+# CHECK-NEXT:     Address: 0xCAFEBABE
 # CHECK:          Size: 2
+# CHECK:          AddressAlignment: 2
 # CHECK:          SectionData (
 # CHECK-NEXT:       0000: EBFE
 # CHECK-NEXT:     )

Modified: llvm/trunk/tools/yaml2obj/yaml2elf.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/yaml2obj/yaml2elf.cpp?rev=183962&r1=183961&r2=183962&view=diff
==============================================================================
--- llvm/trunk/tools/yaml2obj/yaml2elf.cpp (original)
+++ llvm/trunk/tools/yaml2obj/yaml2elf.cpp Thu Jun 13 19:38:02 2013
@@ -161,7 +161,7 @@ static void writeELF(raw_ostream &OS, co
 
     SHeader.sh_link = 0;
     SHeader.sh_info = 0;
-    SHeader.sh_addralign = 1;
+    SHeader.sh_addralign = Sec.AddressAlign;
     SHeader.sh_entsize = 0;
     SHeaders.push_back(SHeader);
   }