wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

COFF: ARM: Implement BLX23T relocation. 

llvm-svn: 243204
This commit is contained in:
Rui Ueyama 2015-07-25 03:25:28 +00:00
parent 145c2f57ae
commit cde7a7907e
2 changed files with 68 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lld/COFF/Chunks.cpp
View File

@ -92,7 +92,7 @@ static void applyMOV32T(uint8_t *Off, uint32_t V) {
or16(Off + 6, ((X & 0x700) << 4) | (X & 0xff));
}
static void applyBranch24T(uint8_t *Off, int32_t V) {
static void applyBranchImm(uint8_t *Off, int32_t V) {
uint32_t S = V < 0 ? 1 : 0;
uint32_t J1 = ((~V >> 23) & 1) ^ S;
uint32_t J2 = ((~V >> 22) & 1) ^ S;
@ -106,7 +106,8 @@ void SectionChunk::applyRelARM(uint8_t *Off, uint16_t Type, uint64_t S,
case IMAGE_REL_ARM_ADDR32: add32(Off, S + Config->ImageBase); break;
case IMAGE_REL_ARM_ADDR32NB: add32(Off, S); break;
case IMAGE_REL_ARM_MOV32T: applyMOV32T(Off, S + Config->ImageBase); break;
case IMAGE_REL_ARM_BRANCH24T: applyBranch24T(Off, S - P - 4); break;
case IMAGE_REL_ARM_BRANCH24T: applyBranchImm(Off, S - P - 4); break;
case IMAGE_REL_ARM_BLX23T: applyBranchImm(Off, S - P - 4); break;
default:
llvm::report_fatal_error("Unsupported relocation type");
}

65
lld/test/COFF/armnt-blx23t.test Normal file
View File

@ -0,0 +1,65 @@
# RUN: yaml2obj < %s > %t.obj
# RUN: llvm-objdump -d %t.obj | FileCheck %s -check-prefix BEFORE
# RUN: lld -flavor link2 /base:0x400000 /entry:function \
# RUN: /subsystem:console /out:%t.exe %t.obj
# RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix AFTER
# BEFORE: Disassembly of section .text:
# BEFORE: 0: 70 47 bx lr
# BEFORE: 2: 00 bf nop
# BEFORE: 4: 2d e9 00 48 push.w {r11, lr}
# BEFORE: 8: eb 46 mov r11, sp
# BEFORE: a: 20 20 movs r0, #32
# BEFORE: c: 00 f0 00 f8 bl #0
# BEFORE: 10: 01 30 adds r0, #1
# BEFORE: 12: bd e8 00 88 pop.w {r11, pc}
# AFTER: Disassembly of section .text:
# AFTER: 1000: 70 47 bx lr
# AFTER: 1002: 00 bf nop
# AFTER: 1004: 2d e9 00 48 push.w {r11, lr}
# AFTER: 1008: eb 46 mov r11, sp
# AFTER: 100a: 20 20 movs r0, #32
# AFTER: 100c: ff f7 f8 ff bl #-16
# AFTER: 1010: 01 30 adds r0, #1
# AFTER: 1012: bd e8 00 88 pop.w {r11, pc}
---
header:
Machine: IMAGE_FILE_MACHINE_ARMNT
Characteristics: [ ]
sections:
- Name: .text
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_PURGEABLE, IMAGE_SCN_MEM_16BIT, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
Alignment: 4
SectionData: 704700BF2DE90048EB46202000F000F80130BDE80088
Relocations:
- VirtualAddress: 12
SymbolName: identity
Type: 21
symbols:
- Name: .text
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 22
NumberOfRelocations: 1
NumberOfLinenumbers: 0
CheckSum: 0
Number: 1
- Name: identity
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: function
Value: 4
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
...