[lld] r200276 - [PECOFF] Convert more binary files to YAML.
Rui Ueyama
ruiu at google.com
Mon Jan 27 17:41:39 PST 2014
Author: ruiu
Date: Mon Jan 27 19:41:39 2014
New Revision: 200276
URL: http://llvm.org/viewvc/llvm-project?rev=200276&view=rev
Log:
[PECOFF] Convert more binary files to YAML.
Because the object files are now readable to humans, I don't think we need the
source assembly file any more, so I removed them too in this commit.
Added:
lld/trunk/test/pecoff/Inputs/reloc64-1.obj.yaml
lld/trunk/test/pecoff/Inputs/reloc64-2.obj.yaml
Removed:
lld/trunk/test/pecoff/Inputs/reloc64-1.asm
lld/trunk/test/pecoff/Inputs/reloc64-1.obj
lld/trunk/test/pecoff/Inputs/reloc64-2.asm
lld/trunk/test/pecoff/Inputs/reloc64-2.obj
Modified:
lld/trunk/test/pecoff/reloc64.test
Removed: lld/trunk/test/pecoff/Inputs/reloc64-1.asm
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/Inputs/reloc64-1.asm?rev=200275&view=auto
==============================================================================
--- lld/trunk/test/pecoff/Inputs/reloc64-1.asm (original)
+++ lld/trunk/test/pecoff/Inputs/reloc64-1.asm (removed)
@@ -1,8 +0,0 @@
-extern fn2 : PROC
-
-.code
-fn1 PROC
- call fn2
- ret
-fn1 ENDP
-End
Removed: lld/trunk/test/pecoff/Inputs/reloc64-1.obj
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/Inputs/reloc64-1.obj?rev=200275&view=auto
==============================================================================
Binary files lld/trunk/test/pecoff/Inputs/reloc64-1.obj (original) and lld/trunk/test/pecoff/Inputs/reloc64-1.obj (removed) differ
Added: lld/trunk/test/pecoff/Inputs/reloc64-1.obj.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/Inputs/reloc64-1.obj.yaml?rev=200276&view=auto
==============================================================================
--- lld/trunk/test/pecoff/Inputs/reloc64-1.obj.yaml (added)
+++ lld/trunk/test/pecoff/Inputs/reloc64-1.obj.yaml Mon Jan 27 19:41:39 2014
@@ -0,0 +1,71 @@
+---
+header:
+ Machine: IMAGE_FILE_MACHINE_AMD64
+ Characteristics: [ ]
+sections:
+ - Name: .text
+ Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
+ Alignment: 16
+ SectionData: E800000000C3
+ Relocations:
+ - VirtualAddress: 1
+ SymbolName: fn2
+ Type: IMAGE_REL_AMD64_REL32
+ - Name: .data
+ Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
+ Alignment: 16
+ SectionData: ''
+ - Name: '.debug$S'
+ Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
+ Alignment: 1
+ SectionData: 04000000F10000005D0000002200011100000000433A5C63796777696E5C686F6D655C727569755C666E312E6F626A0037003C1103020000D00000000000000000000B00000027C601004D6963726F736F667420285229204D6163726F20417373656D626C65720000000000
+symbols:
+ - Name: '@comp.id'
+ Value: 13485607
+ SectionNumber: 65535
+ SimpleType: IMAGE_SYM_TYPE_NULL
+ ComplexType: IMAGE_SYM_DTYPE_NULL
+ StorageClass: IMAGE_SYM_CLASS_STATIC
+ - Name: '@feat.00'
+ Value: 16
+ SectionNumber: 65535
+ SimpleType: IMAGE_SYM_TYPE_NULL
+ ComplexType: IMAGE_SYM_DTYPE_NULL
+ StorageClass: IMAGE_SYM_CLASS_STATIC
+ - Name: .text
+ Value: 0
+ SectionNumber: 1
+ SimpleType: IMAGE_SYM_TYPE_NULL
+ ComplexType: IMAGE_SYM_DTYPE_NULL
+ StorageClass: IMAGE_SYM_CLASS_STATIC
+ NumberOfAuxSymbols: 1
+ AuxiliaryData: 060000000100000000000000000000000000
+ - Name: .data
+ Value: 0
+ SectionNumber: 2
+ SimpleType: IMAGE_SYM_TYPE_NULL
+ ComplexType: IMAGE_SYM_DTYPE_NULL
+ StorageClass: IMAGE_SYM_CLASS_STATIC
+ NumberOfAuxSymbols: 1
+ AuxiliaryData: 000000000000000000000000000000000000
+ - Name: '.debug$S'
+ Value: 0
+ SectionNumber: 3
+ SimpleType: IMAGE_SYM_TYPE_NULL
+ ComplexType: IMAGE_SYM_DTYPE_NULL
+ StorageClass: IMAGE_SYM_CLASS_STATIC
+ NumberOfAuxSymbols: 1
+ AuxiliaryData: 6C0000000000000000000000000000000000
+ - Name: fn2
+ Value: 0
+ SectionNumber: 0
+ SimpleType: IMAGE_SYM_TYPE_NULL
+ ComplexType: IMAGE_SYM_DTYPE_NULL
+ StorageClass: IMAGE_SYM_CLASS_EXTERNAL
+ - Name: fn1
+ Value: 0
+ SectionNumber: 1
+ SimpleType: IMAGE_SYM_TYPE_NULL
+ ComplexType: IMAGE_SYM_DTYPE_FUNCTION
+ StorageClass: IMAGE_SYM_CLASS_EXTERNAL
+...
Removed: lld/trunk/test/pecoff/Inputs/reloc64-2.asm
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/Inputs/reloc64-2.asm?rev=200275&view=auto
==============================================================================
--- lld/trunk/test/pecoff/Inputs/reloc64-2.asm (original)
+++ lld/trunk/test/pecoff/Inputs/reloc64-2.asm (removed)
@@ -1,5 +0,0 @@
-.code
-fn2 PROC
- ret
-fn2 ENDP
-End
Removed: lld/trunk/test/pecoff/Inputs/reloc64-2.obj
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/Inputs/reloc64-2.obj?rev=200275&view=auto
==============================================================================
Binary files lld/trunk/test/pecoff/Inputs/reloc64-2.obj (original) and lld/trunk/test/pecoff/Inputs/reloc64-2.obj (removed) differ
Added: lld/trunk/test/pecoff/Inputs/reloc64-2.obj.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/Inputs/reloc64-2.obj.yaml?rev=200276&view=auto
==============================================================================
--- lld/trunk/test/pecoff/Inputs/reloc64-2.obj.yaml (added)
+++ lld/trunk/test/pecoff/Inputs/reloc64-2.obj.yaml Mon Jan 27 19:41:39 2014
@@ -0,0 +1,61 @@
+---
+header:
+ Machine: IMAGE_FILE_MACHINE_AMD64
+ Characteristics: [ ]
+sections:
+ - Name: .text
+ Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
+ Alignment: 16
+ SectionData: C3
+ - Name: .data
+ Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
+ Alignment: 16
+ SectionData: ''
+ - Name: '.debug$S'
+ Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
+ Alignment: 1
+ SectionData: 04000000F10000005D0000002200011100000000433A5C63796777696E5C686F6D655C727569755C666E322E6F626A0037003C1103020000D00000000000000000000B00000027C601004D6963726F736F667420285229204D6163726F20417373656D626C65720000000000
+symbols:
+ - Name: '@comp.id'
+ Value: 13485607
+ SectionNumber: 65535
+ SimpleType: IMAGE_SYM_TYPE_NULL
+ ComplexType: IMAGE_SYM_DTYPE_NULL
+ StorageClass: IMAGE_SYM_CLASS_STATIC
+ - Name: '@feat.00'
+ Value: 16
+ SectionNumber: 65535
+ SimpleType: IMAGE_SYM_TYPE_NULL
+ ComplexType: IMAGE_SYM_DTYPE_NULL
+ StorageClass: IMAGE_SYM_CLASS_STATIC
+ - Name: .text
+ Value: 0
+ SectionNumber: 1
+ SimpleType: IMAGE_SYM_TYPE_NULL
+ ComplexType: IMAGE_SYM_DTYPE_NULL
+ StorageClass: IMAGE_SYM_CLASS_STATIC
+ NumberOfAuxSymbols: 1
+ AuxiliaryData: 010000000000000000000000000000000000
+ - Name: .data
+ Value: 0
+ SectionNumber: 2
+ SimpleType: IMAGE_SYM_TYPE_NULL
+ ComplexType: IMAGE_SYM_DTYPE_NULL
+ StorageClass: IMAGE_SYM_CLASS_STATIC
+ NumberOfAuxSymbols: 1
+ AuxiliaryData: 000000000000000000000000000000000000
+ - Name: '.debug$S'
+ Value: 0
+ SectionNumber: 3
+ SimpleType: IMAGE_SYM_TYPE_NULL
+ ComplexType: IMAGE_SYM_DTYPE_NULL
+ StorageClass: IMAGE_SYM_CLASS_STATIC
+ NumberOfAuxSymbols: 1
+ AuxiliaryData: 6C0000000000000000000000000000000000
+ - Name: fn2
+ Value: 0
+ SectionNumber: 1
+ SimpleType: IMAGE_SYM_TYPE_NULL
+ ComplexType: IMAGE_SYM_DTYPE_FUNCTION
+ StorageClass: IMAGE_SYM_CLASS_EXTERNAL
+...
Modified: lld/trunk/test/pecoff/reloc64.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/reloc64.test?rev=200276&r1=200275&r2=200276&view=diff
==============================================================================
--- lld/trunk/test/pecoff/reloc64.test (original)
+++ lld/trunk/test/pecoff/reloc64.test Mon Jan 27 19:41:39 2014
@@ -1,5 +1,8 @@
+# RUN: yaml2obj %p/Inputs/reloc64-1.obj.yaml > %t1.obj
+# RUN: yaml2obj %p/Inputs/reloc64-2.obj.yaml > %t2.obj
+
# RUN: lld -flavor link /out:%t.exe /subsystem:console /machine:x64 \
-# RUN: /entry:fn1 -- %p/Inputs/reloc64-1.obj %p/Inputs/reloc64-2.obj
+# RUN: /entry:fn1 -- %t1.obj %t2.obj
# RUN: llvm-objdump -d %t.exe | FileCheck %s
CHECK: Disassembly of section .text:
More information about the llvm-commits
mailing list