[llvm-commits] [llvm] r115132 - in /llvm/trunk: lib/MC/MCParser/ELFAsmParser.cpp test/MC/ELF/entsize.s

[Jan Wen Voung]

Author: jvoung
Date: Wed Sep 29 21:41:46 2010
New Revision: 115132

URL: http://llvm.org/viewvc/llvm-project?rev=115132&view=rev
Log:
Have ELFAsmParser.cpp use the already parsed "Size" (entry size) when 
constructing a section. Test for a few cases also included.

Added:
    llvm/trunk/test/MC/ELF/entsize.s
Modified:
    llvm/trunk/lib/MC/MCParser/ELFAsmParser.cpp

Modified: llvm/trunk/lib/MC/MCParser/ELFAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/ELFAsmParser.cpp?rev=115132&r1=115131&r2=115132&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCParser/ELFAsmParser.cpp (original)
+++ llvm/trunk/lib/MC/MCParser/ELFAsmParser.cpp Wed Sep 29 21:41:46 2010
@@ -284,7 +284,8 @@
                      ? SectionKind::getText()
                      : SectionKind::getDataRel();
   getStreamer().SwitchSection(getContext().getELFSection(SectionName, Type,
-                                                         Flags, Kind, false));
+                                                         Flags, Kind, false,
+                                                         Size));
   return false;
 }
 

Added: llvm/trunk/test/MC/ELF/entsize.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/entsize.s?rev=115132&view=auto
==============================================================================
--- llvm/trunk/test/MC/ELF/entsize.s (added)
+++ llvm/trunk/test/MC/ELF/entsize.s Wed Sep 29 21:41:46 2010
@@ -0,0 +1,69 @@
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | elf-dump  --dump-section-data | FileCheck  %s
+
+// Test that mergeable constants have sh_entsize set.
+
+// 1 byte strings
+    .section	.rodata.str1.1,"aMS", at progbits,1
+
+    .type	.L.str1, at object         # @.str1
+.L.str1:
+	.asciz	 "tring"
+	.size	.L.str1, 6
+
+	.type	.L.str2, at object         # @.str2
+.L.str2:
+	.asciz	 "String"
+	.size	.L.str2, 7
+
+// 2 byte strings
+    .section	.rodata.str2.1,"aMS", at progbits,2
+	.type	.L.str3, at object         # @.str3
+.L.str3:
+	.asciz	 "L\000o\000n\000g\000"
+	.size	.L.str3, 9
+
+	.type	.L.str4, at object         # @.str4
+.L.str4:
+	.asciz	 "o\000n\000g\000"
+	.size	.L.str4, 7
+
+ // 8 byte constants
+    .section	.rodata.cst8,"aM", at progbits,8
+    .quad 42
+    .quad 42
+
+// CHECK: # Section 4
+// CHECK-NEXT:   ('sh_name', 18) # '.rodata.str1.1'
+// CHECK-NEXT:   ('sh_type', 1)
+// CHECK-NEXT:   ('sh_flags', 50)
+// CHECK-NEXT:   ('sh_addr',
+// CHECK-NEXT:   ('sh_offset',
+// CHECK-NEXT:   ('sh_size', 13)
+// CHECK-NEXT:   ('sh_link',
+// CHECK-NEXT:   ('sh_info',
+// CHECK-NEXT:   ('sh_addralign', 1)
+// CHECK-NEXT:   ('sh_entsize', 1)
+
+// CHECK: # Section 5
+// CHECK-NEXT:   ('sh_name', 33) # '.rodata.str2.1'
+// CHECK-NEXT:   ('sh_type', 1)
+// CHECK-NEXT:   ('sh_flags', 50)
+// CHECK-NEXT:   ('sh_addr',
+// CHECK-NEXT:   ('sh_offset',
+// CHECK-NEXT:   ('sh_size', 16)
+// CHECK-NEXT:   ('sh_link',
+// CHECK-NEXT:   ('sh_info',
+// CHECK-NEXT:   ('sh_addralign', 1)
+// CHECK-NEXT:   ('sh_entsize', 2)
+
+// CHECK: # Section 6
+// CHECK-NEXT:   ('sh_name', 48) # '.rodata.cst8
+// CHECK-NEXT:   ('sh_type', 1)
+// CHECK-NEXT:   ('sh_flags', 18)
+// CHECK-NEXT:   ('sh_addr',
+// CHECK-NEXT:   ('sh_offset',
+// CHECK-NEXT:   ('sh_size', 16)
+// CHECK-NEXT:   ('sh_link',
+// CHECK-NEXT:   ('sh_info',
+// CHECK-NEXT:   ('sh_addralign', 1)
+// CHECK-NEXT:   ('sh_entsize', 8)