mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-07-20 10:30:03 +00:00
MC: Fix symbol fragment offsets in COFF.
Patch by Cameron Esfahani! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110104 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Michael J. Spencer
parent
a69494ee5e
commit
237f8fe5df
@ -619,7 +619,8 @@ void WinCOFFObjectWriter::WriteObject(const MCAssembler &Asm,
|
|||||||
COFFSection *coff_section = SectionMap[SymbolData->Fragment->getParent()];
|
COFFSection *coff_section = SectionMap[SymbolData->Fragment->getParent()];
|
||||||
|
|
||||||
coff_symbol->Data.SectionNumber = coff_section->Number;
|
coff_symbol->Data.SectionNumber = coff_section->Number;
|
||||||
coff_symbol->Data.Value = Layout.getFragmentOffset(SymbolData->Fragment);
|
coff_symbol->Data.Value = Layout.getFragmentOffset(SymbolData->Fragment)
|
||||||
|
+ SymbolData->Offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update auxiliary symbol info.
|
// Update auxiliary symbol info.
|
||||||
|
|||||||
182
test/MC/COFF/symbol-fragment-offset.ll
Normal file
182
test/MC/COFF/symbol-fragment-offset.ll
Normal file
@ -0,0 +1,182 @@
|
|||||||
|
; RUN: llc -filetype=obj %s -o %t
|
||||||
|
; RUN: coff-dump.py %abs_tmp | FileCheck %s
|
||||||
|
|
||||||
|
; ModuleID = 'coff-fragment-test.c'
|
||||||
|
target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f80:128:128-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32"
|
||||||
|
target triple = "i686-pc-win32"
|
||||||
|
|
||||||
|
@.str = private constant [7 x i8] c"Hello \00" ; <[7 x i8]*> [#uses=1]
|
||||||
|
@str = internal constant [7 x i8] c"World!\00" ; <[7 x i8]*> [#uses=1]
|
||||||
|
|
||||||
|
define i32 @main() nounwind {
|
||||||
|
entry:
|
||||||
|
%call = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([7 x i8]* @.str, i32 0, i32 0)) nounwind ; <i32> [#uses=0]
|
||||||
|
%puts = tail call i32 @puts(i8* getelementptr inbounds ([7 x i8]* @str, i32 0, i32 0)) ; <i32> [#uses=0]
|
||||||
|
ret i32 0
|
||||||
|
}
|
||||||
|
|
||||||
|
declare i32 @printf(i8* nocapture, ...) nounwind
|
||||||
|
|
||||||
|
declare i32 @puts(i8* nocapture) nounwind
|
||||||
|
|
||||||
|
; CHECK: {
|
||||||
|
; CHECK: MachineType = IMAGE_FILE_MACHINE_I386 (0x14C)
|
||||||
|
; CHECK: NumberOfSections = 2
|
||||||
|
; CHECK: TimeDateStamp = {{[0-9]+}}
|
||||||
|
; CHECK: PointerToSymbolTable = 0xBB
|
||||||
|
; CHECK: NumberOfSymbols = 9
|
||||||
|
; CHECK: SizeOfOptionalHeader = 0
|
||||||
|
; CHECK: Characteristics = 0x0
|
||||||
|
; CHECK: Sections = [
|
||||||
|
; CHECK: 0 = {
|
||||||
|
; CHECK: Name = .text
|
||||||
|
; CHECK: VirtualSize = 0
|
||||||
|
; CHECK: VirtualAddress = 0
|
||||||
|
; CHECK: SizeOfRawData = 33
|
||||||
|
; CHECK: PointerToRawData = 0x64
|
||||||
|
; CHECK: PointerToRelocations = 0x85
|
||||||
|
; CHECK: PointerToLineNumbers = 0x0
|
||||||
|
; CHECK: NumberOfRelocations = 4
|
||||||
|
; CHECK: NumberOfLineNumbers = 0
|
||||||
|
; CHECK: Charateristics = 0x60500020
|
||||||
|
; CHECK: IMAGE_SCN_CNT_CODE
|
||||||
|
; CHECK: IMAGE_SCN_ALIGN_16BYTES
|
||||||
|
; CHECK: IMAGE_SCN_MEM_EXECUTE
|
||||||
|
; CHECK: IMAGE_SCN_MEM_READ
|
||||||
|
; CHECK: SectionData =
|
||||||
|
; CHECK: 83 EC 04 C7 04 24 00 00 - 00 00 E8 00 00 00 00 C7 |.....$..........|
|
||||||
|
; CHECK: 04 24 00 00 00 00 E8 00 - 00 00 00 31 C0 83 C4 04 |.$.........1....|
|
||||||
|
; CHECK: C3 |.|
|
||||||
|
|
||||||
|
; CHECK: Relocations = [
|
||||||
|
; CHECK: 0 = {
|
||||||
|
; CHECK: VirtualAddress = 0x6
|
||||||
|
; CHECK: SymbolTableIndex = 5
|
||||||
|
; CHECK: Type = IMAGE_REL_I386_DIR32 (6)
|
||||||
|
; CHECK: SymbolName = _main
|
||||||
|
; CHECK: }
|
||||||
|
; CHECK: 1 = {
|
||||||
|
; CHECK: VirtualAddress = 0xB
|
||||||
|
; CHECK: SymbolTableIndex = 6
|
||||||
|
; CHECK: Type = IMAGE_REL_I386_REL32 (20)
|
||||||
|
; CHECK: SymbolName = L_.str
|
||||||
|
; CHECK: }
|
||||||
|
; CHECK: 2 = {
|
||||||
|
; CHECK: VirtualAddress = 0x12
|
||||||
|
; CHECK: SymbolTableIndex = 7
|
||||||
|
; CHECK: Type = IMAGE_REL_I386_DIR32 (6)
|
||||||
|
; CHECK: SymbolName = _printf
|
||||||
|
; CHECK: }
|
||||||
|
; CHECK: 3 = {
|
||||||
|
; CHECK: VirtualAddress = 0x17
|
||||||
|
; CHECK: SymbolTableIndex = 8
|
||||||
|
; CHECK: Type = IMAGE_REL_I386_REL32 (20)
|
||||||
|
; CHECK: SymbolName = _str
|
||||||
|
; CHECK: }
|
||||||
|
; CHECK: ]
|
||||||
|
; CHECK: }
|
||||||
|
; CHECK: 1 = {
|
||||||
|
; CHECK: Name = .data
|
||||||
|
; CHECK: VirtualSize = 0
|
||||||
|
; CHECK: VirtualAddress = 0
|
||||||
|
; CHECK: SizeOfRawData = 14
|
||||||
|
; CHECK: PointerToRawData = 0xAD
|
||||||
|
; CHECK: PointerToRelocations = 0x0
|
||||||
|
; CHECK: PointerToLineNumbers = 0x0
|
||||||
|
; CHECK: NumberOfRelocations = 0
|
||||||
|
; CHECK: NumberOfLineNumbers = 0
|
||||||
|
; CHECK: Charateristics = 0xC0100040
|
||||||
|
; CHECK: IMAGE_SCN_CNT_INITIALIZED_DATA
|
||||||
|
; CHECK: IMAGE_SCN_ALIGN_1BYTES
|
||||||
|
; CHECK: IMAGE_SCN_MEM_READ
|
||||||
|
; CHECK: IMAGE_SCN_MEM_WRITE
|
||||||
|
; CHECK: SectionData =
|
||||||
|
; CHECK: 48 65 6C 6C 6F 20 00 57 - 6F 72 6C 64 21 00 |Hello .World!.|
|
||||||
|
|
||||||
|
; CHECK: Relocations = None
|
||||||
|
; CHECK: }
|
||||||
|
; CHECK: ]
|
||||||
|
; CHECK: Symbols = [
|
||||||
|
; CHECK: 0 = {
|
||||||
|
; CHECK: Name = .text
|
||||||
|
; CHECK: Value = 0
|
||||||
|
; CHECK: SectionNumber = 1
|
||||||
|
; CHECK: SimpleType = IMAGE_SYM_TYPE_NULL (0)
|
||||||
|
; CHECK: ComplexType = IMAGE_SYM_DTYPE_NULL (0)
|
||||||
|
; CHECK: StorageClass = IMAGE_SYM_CLASS_STATIC (3)
|
||||||
|
; CHECK: NumberOfAuxSymbols = 1
|
||||||
|
; CHECK: AuxillaryData =
|
||||||
|
; CHECK: 21 00 00 00 04 00 00 00 - 00 00 00 00 01 00 00 00 |!...............|
|
||||||
|
; CHECK: 00 00 |..|
|
||||||
|
|
||||||
|
; CHECK: }
|
||||||
|
; CHECK: 1 = {
|
||||||
|
; CHECK: Name = .data
|
||||||
|
; CHECK: Value = 0
|
||||||
|
; CHECK: SectionNumber = 2
|
||||||
|
; CHECK: SimpleType = IMAGE_SYM_TYPE_NULL (0)
|
||||||
|
; CHECK: ComplexType = IMAGE_SYM_DTYPE_NULL (0)
|
||||||
|
; CHECK: StorageClass = IMAGE_SYM_CLASS_STATIC (3)
|
||||||
|
; CHECK: NumberOfAuxSymbols = 1
|
||||||
|
; CHECK: AuxillaryData =
|
||||||
|
; CHECK: 0E 00 00 00 00 00 00 00 - 00 00 00 00 02 00 00 00 |................|
|
||||||
|
; CHECK: 00 00 |..|
|
||||||
|
|
||||||
|
; CHECK: }
|
||||||
|
; CHECK: 2 = {
|
||||||
|
; CHECK: Name = _main
|
||||||
|
; CHECK: Value = 0
|
||||||
|
; CHECK: SectionNumber = 1
|
||||||
|
; CHECK: SimpleType = unknown (32)
|
||||||
|
; CHECK: ComplexType = IMAGE_SYM_DTYPE_NULL (0)
|
||||||
|
; CHECK: StorageClass = IMAGE_SYM_CLASS_EXTERNAL (2)
|
||||||
|
; CHECK: NumberOfAuxSymbols = 0
|
||||||
|
; CHECK: AuxillaryData =
|
||||||
|
|
||||||
|
; CHECK: }
|
||||||
|
; CHECK: 3 = {
|
||||||
|
; CHECK: Name = L_.str
|
||||||
|
; CHECK: Value = 0
|
||||||
|
; CHECK: SectionNumber = 2
|
||||||
|
; CHECK: SimpleType = IMAGE_SYM_TYPE_NULL (0)
|
||||||
|
; CHECK: ComplexType = IMAGE_SYM_DTYPE_NULL (0)
|
||||||
|
; CHECK: StorageClass = IMAGE_SYM_CLASS_STATIC (3)
|
||||||
|
; CHECK: NumberOfAuxSymbols = 0
|
||||||
|
; CHECK: AuxillaryData =
|
||||||
|
|
||||||
|
; CHECK: }
|
||||||
|
; CHECK: 4 = {
|
||||||
|
; CHECK: Name = _printf
|
||||||
|
; CHECK: Value = 0
|
||||||
|
; CHECK: SectionNumber = 0
|
||||||
|
; CHECK: SimpleType = IMAGE_SYM_TYPE_NULL (0)
|
||||||
|
; CHECK: ComplexType = IMAGE_SYM_DTYPE_NULL (0)
|
||||||
|
; CHECK: StorageClass = IMAGE_SYM_CLASS_EXTERNAL (2)
|
||||||
|
; CHECK: NumberOfAuxSymbols = 0
|
||||||
|
; CHECK: AuxillaryData =
|
||||||
|
|
||||||
|
; CHECK: }
|
||||||
|
; CHECK: 5 = {
|
||||||
|
; CHECK: Name = _str
|
||||||
|
; CHECK: Value = 7
|
||||||
|
; CHECK: SectionNumber = 2
|
||||||
|
; CHECK: SimpleType = IMAGE_SYM_TYPE_NULL (0)
|
||||||
|
; CHECK: ComplexType = IMAGE_SYM_DTYPE_NULL (0)
|
||||||
|
; CHECK: StorageClass = IMAGE_SYM_CLASS_STATIC (3)
|
||||||
|
; CHECK: NumberOfAuxSymbols = 0
|
||||||
|
; CHECK: AuxillaryData =
|
||||||
|
|
||||||
|
; CHECK: }
|
||||||
|
; CHECK: 6 = {
|
||||||
|
; CHECK: Name = _puts
|
||||||
|
; CHECK: Value = 0
|
||||||
|
; CHECK: SectionNumber = 0
|
||||||
|
; CHECK: SimpleType = IMAGE_SYM_TYPE_NULL (0)
|
||||||
|
; CHECK: ComplexType = IMAGE_SYM_DTYPE_NULL (0)
|
||||||
|
; CHECK: StorageClass = IMAGE_SYM_CLASS_EXTERNAL (2)
|
||||||
|
; CHECK: NumberOfAuxSymbols = 0
|
||||||
|
; CHECK: AuxillaryData =
|
||||||
|
|
||||||
|
; CHECK: }
|
||||||
|
; CHECK: ]
|
||||||
|
; CHECK: }
|
||||||
Loading…
Reference in New Issue
Block a user