[llvm-readobj/elf] - Fix the PREL31 relocation computation used for dumping arm32 unwind info (-u).

This is a part of https://bugs.llvm.org/show_bug.cgi?id=47581.

We have the following computation:
```
(1) uint64_t Location = Address & 0x7fffffff;
(2) if (Location & 0x04000000)
(3)   Location |= (uint64_t) ~0x7fffffff;
(4) return Location + Place;
```

At line 2 there is a mistype. The constant should be `0x40000000`,
not `0x04000000`, because the intention here is to sign extend the `Location`,
which is the 31 bit signed value.

Differential revision: https://reviews.llvm.org/D88407
This commit is contained in:
Georgii Rymar 2020-09-28 14:43:19 +03:00
parent fdfe324da1
commit 4ba00619ee
2 changed files with 19 additions and 1 deletions

View File

@ -48,6 +48,17 @@
# UNWIND-NEXT: FunctionAddress: 0x24C
# UNWIND-NEXT: Model: CantUnwind
# UNWIND-NEXT: }
# UNWIND-NEXT: Entry {
# UNWIND-NEXT: FunctionAddress: 0x4000026B
# UNWIND-NEXT: FunctionName: func4
# UNWIND-NEXT: Model: Compact (Inline)
# UNWIND-NEXT: PersonalityIndex: 0
# UNWIND-NEXT: Opcodes [
# UNWIND-NEXT: 0xB0 ; finish
# UNWIND-NEXT: 0xB0 ; finish
# UNWIND-NEXT: 0xB0 ; finish
# UNWIND-NEXT: ]
# UNWIND-NEXT: }
# UNWIND-NEXT: ]
# UNWIND-NEXT: }
# UNWIND-NEXT: }
@ -78,6 +89,9 @@ Sections:
## Address of .ARM.exidx (0x24C) + entry offset (24) + 0x7fffffe8 (31 bit) == 0x24C.
- Offset: 0x7FFFFFE8
Value: EXIDX_CANTUNWIND
## Address of .ARM.exidx (0x24C) + entry offset (32) + 0x3FFFFFFF (31 bit) == 0x4000026b.
- Offset: 0x3FFFFFFF
Value: 0x80B0B0B0 ## arbitrary opcodes.
Symbols:
- Name: func1
Type: STT_FUNC
@ -91,3 +105,7 @@ Symbols:
Type: STT_FUNC
Section: .text
Value: 0x248
- Name: func4
Type: STT_FUNC
Section: .text
Value: 0x4000026b

View File

@ -336,7 +336,7 @@ class PrinterContext {
static uint64_t PREL31(uint32_t Address, uint32_t Place) {
uint64_t Location = Address & 0x7fffffff;
if (Location & 0x04000000)
if (Location & 0x40000000)
Location |= (uint64_t) ~0x7fffffff;
return Location + Place;
}