diff options
author | David Majnemer <david.majnemer@gmail.com> | 2014-03-19 04:47:47 +0000 |
---|---|---|
committer | David Majnemer <david.majnemer@gmail.com> | 2014-03-19 04:47:47 +0000 |
commit | 6d191534f63b0ece222e2d6e418144b123c81c0c (patch) | |
tree | 72a8ca1b42f1f5c47cdeff5a5593c7b2ffcc8d58 /test | |
parent | 92c5a193e0d17f4b70f507ff976aac6a44962041 (diff) | |
download | llvm-6d191534f63b0ece222e2d6e418144b123c81c0c.tar.gz llvm-6d191534f63b0ece222e2d6e418144b123c81c0c.tar.bz2 llvm-6d191534f63b0ece222e2d6e418144b123c81c0c.tar.xz |
Object: Provide a richer means of describing auxiliary symbols
The current state of affairs has auxiliary symbols described as a big
bag of bytes. This is less than satisfying, it detracts from the YAML
file as being human readable.
Instead, allow for symbols to optionally contain their auxiliary data.
This allows us to have a much higher level way of describing things like
weak symbols, function definitions and section definitions.
This depends on D3105.
Differential Revision: http://llvm-reviews.chandlerc.com/D3092
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204214 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
-rw-r--r-- | test/Object/Inputs/COFF/i386.yaml | 16 | ||||
-rw-r--r-- | test/Object/Inputs/COFF/x86-64.yaml | 16 | ||||
-rw-r--r-- | test/Object/obj2yaml.test | 32 |
3 files changed, 48 insertions, 16 deletions
diff --git a/test/Object/Inputs/COFF/i386.yaml b/test/Object/Inputs/COFF/i386.yaml index 1badad8d59..7873df0a7e 100644 --- a/test/Object/Inputs/COFF/i386.yaml +++ b/test/Object/Inputs/COFF/i386.yaml @@ -39,8 +39,12 @@ symbols: SimpleType: IMAGE_SYM_TYPE_NULL # (0) ComplexType: IMAGE_SYM_DTYPE_NULL # (0) StorageClass: IMAGE_SYM_CLASS_STATIC # (3) - NumberOfAuxSymbols: 1 - AuxiliaryData: !hex "240000000300000000000000010000000000" # |$.................| + SectionDefinition: + Length: 36 + NumberOfRelocations: 3 + NumberOfLinenumbers: 0 + CheckSum: 0 + Number: 1 - !Symbol Name: .data @@ -49,8 +53,12 @@ symbols: SimpleType: IMAGE_SYM_TYPE_NULL # (0) ComplexType: IMAGE_SYM_DTYPE_NULL # (0) StorageClass: IMAGE_SYM_CLASS_STATIC # (3) - NumberOfAuxSymbols: 1 - AuxiliaryData: !hex "0D0000000000000000000000020000000000" # |..................| + SectionDefinition: + Length: 13 + NumberOfRelocations: 0 + NumberOfLinenumbers: 0 + CheckSum: 0 + Number: 2 - !Symbol Name: _main diff --git a/test/Object/Inputs/COFF/x86-64.yaml b/test/Object/Inputs/COFF/x86-64.yaml index b775ae9cdf..1dc2b10cf4 100644 --- a/test/Object/Inputs/COFF/x86-64.yaml +++ b/test/Object/Inputs/COFF/x86-64.yaml @@ -38,8 +38,12 @@ symbols: SimpleType: IMAGE_SYM_TYPE_NULL # (0) ComplexType: IMAGE_SYM_DTYPE_NULL # (0) StorageClass: IMAGE_SYM_CLASS_STATIC # (3) - NumberOfAuxSymbols: 1 - AuxiliaryData: !hex "260000000300000000000000010000000000" # |&.................| + SectionDefinition: + Length: 38 + NumberOfRelocations: 3 + NumberOfLinenumbers: 0 + CheckSum: 0 + Number: 1 - !Symbol Name: .data @@ -48,8 +52,12 @@ symbols: SimpleType: IMAGE_SYM_TYPE_NULL # (0) ComplexType: IMAGE_SYM_DTYPE_NULL # (0) StorageClass: IMAGE_SYM_CLASS_STATIC # (3) - NumberOfAuxSymbols: 1 - AuxiliaryData: !hex "0D0000000000000000000000020000000000" # |..................| + SectionDefinition: + Length: 13 + NumberOfRelocations: 0 + NumberOfLinenumbers: 0 + CheckSum: 0 + Number: 2 - !Symbol Name: main diff --git a/test/Object/obj2yaml.test b/test/Object/obj2yaml.test index 49541336c6..d96275fe2c 100644 --- a/test/Object/obj2yaml.test +++ b/test/Object/obj2yaml.test @@ -36,8 +36,12 @@ COFF-I386-NEXT: SectionNumber: 1 COFF-I386-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL COFF-I386-NEXT: ComplexType: IMAGE_SYM_DTYPE_NULL COFF-I386-NEXT: StorageClass: IMAGE_SYM_CLASS_STATIC -COFF-I386-NEXT: NumberOfAuxSymbols: 1 -COFF-I386-NEXT: AuxiliaryData: 240000000300000000000000010000000000 +COFF-I386-NEXT: SectionDefinition: +COFF-I386-NEXT: Length: 36 +COFF-I386-NEXT: NumberOfRelocations: 3 +COFF-I386-NEXT: NumberOfLinenumbers: 0 +COFF-I386-NEXT: CheckSum: 0 +COFF-I386-NEXT: Number: 1 COFF-I386: - Name: .data COFF-I386-NEXT: Value: 0 @@ -45,8 +49,12 @@ COFF-I386-NEXT: SectionNumber: 2 COFF-I386-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL COFF-I386-NEXT: ComplexType: IMAGE_SYM_DTYPE_NULL COFF-I386-NEXT: StorageClass: IMAGE_SYM_CLASS_STATIC -COFF-I386-NEXT: NumberOfAuxSymbols: 1 -COFF-I386-NEXT: AuxiliaryData: 0D0000000000000000000000020000000000 +COFF-I386-NEXT: SectionDefinition: +COFF-I386-NEXT: Length: 13 +COFF-I386-NEXT: NumberOfRelocations: 0 +COFF-I386-NEXT: NumberOfLinenumbers: 0 +COFF-I386-NEXT: CheckSum: 0 +COFF-I386-NEXT: Number: 2 COFF-I386: - Name: _main COFF-I386-NEXT: Value: 0 @@ -111,8 +119,12 @@ COFF-X86-64-NEXT: SectionNumber: 1 COFF-X86-64-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL COFF-X86-64-NEXT: ComplexType: IMAGE_SYM_DTYPE_NULL COFF-X86-64-NEXT: StorageClass: IMAGE_SYM_CLASS_STATIC -COFF-X86-64-NEXT: NumberOfAuxSymbols: 1 -COFF-X86-64-NEXT: AuxiliaryData: 260000000300000000000000010000000000 +COFF-X86-64-NEXT: SectionDefinition: +COFF-X86-64-NEXT: Length: 38 +COFF-X86-64-NEXT: NumberOfRelocations: 3 +COFF-X86-64-NEXT: NumberOfLinenumbers: 0 +COFF-X86-64-NEXT: CheckSum: 0 +COFF-X86-64-NEXT: Number: 1 COFF-X86-64: - Name: .data COFF-X86-64-NEXT: Value: 0 @@ -120,8 +132,12 @@ COFF-X86-64-NEXT: SectionNumber: 2 COFF-X86-64-NEXT: SimpleType: IMAGE_SYM_TYPE_NULL COFF-X86-64-NEXT: ComplexType: IMAGE_SYM_DTYPE_NULL COFF-X86-64-NEXT: StorageClass: IMAGE_SYM_CLASS_STATIC -COFF-X86-64-NEXT: NumberOfAuxSymbols: 1 -COFF-X86-64-NEXT: AuxiliaryData: 0D0000000000000000000000020000000000 +COFF-X86-64-NEXT: SectionDefinition: +COFF-X86-64-NEXT: Length: 13 +COFF-X86-64-NEXT: NumberOfRelocations: 0 +COFF-X86-64-NEXT: NumberOfLinenumbers: 0 +COFF-X86-64-NEXT: CheckSum: 0 +COFF-X86-64-NEXT: Number: 2 COFF-X86-64: - Name: main COFF-X86-64-NEXT: Value: 0 |