4111841f88
This patch makes sure that `BinaryContext::printInstruction` prints the
preferred disassembly. Preferred disassembly only gets printed when
there are no annotations on the MCInst. Therefore, this patch
temporarily removes the annotations before printing it.
A few examples of before and after on AArch64 instructions are as
follows:
```
BEFORE AFTER
(preferred disassembly)
ret x30 ret
orr x30, xzr, x0 mov x30, x0
hint #29 autiasp
hint #12 autia1716
```
Clearly, the preferred disassembly is easier for developers to read, and
is the disassembly that tools should be printing.
This patch is motivated as part of future work on the
llvm-bolt-binary-analysis tool, making sure that the reports it prints
do use preferred disassembly.
This patch was cherry-picked from
https://github.com/kbeyls/llvm-project/tree/bolt-gadget-scanner-prototype.
In this current patch, this only affects existing RISCV test cases.
This patch also does improve test cases in future patches that will
introduce a binary analysis for llvm-bolt-binary-analysis that checks
for correct application of pac-ret (pointer authentication on return
addresses).
66 lines
1.8 KiB
ArmAsm
66 lines
1.8 KiB
ArmAsm
/// Test that annotations are properly carried over to fixed calls.
|
|
/// Note that --enable-bat is used to force offsets to be kept.
|
|
|
|
// RUN: llvm-mc -triple riscv64 -mattr=+c -filetype obj -o %t.o %s
|
|
// RUN: ld.lld --emit-relocs -o %t %t.o
|
|
// RUN: llvm-bolt --enable-bat --print-cfg --print-fix-riscv-calls \
|
|
// RUN: -o %t.null %t | FileCheck %s
|
|
|
|
.text
|
|
.option norvc
|
|
.global f
|
|
.p2align 1
|
|
f:
|
|
ret
|
|
.size f, .-f
|
|
|
|
// CHECK-LABEL: Binary Function "_start" after building cfg {
|
|
// CHECK: auipc ra, f
|
|
// CHECK-NEXT: jalr -0x4(ra) # Offset: 4
|
|
// CHECK-NEXT: jal f # Offset: 8
|
|
// CHECK-NEXT: j f # TAILCALL # Offset: 12
|
|
|
|
// CHECK-LABEL: Binary Function "long_tail" after building cfg {
|
|
// CHECK: auipc t1, f
|
|
// CHECK-NEXT: jr -0x18(t1) # TAILCALL # Offset: 8
|
|
|
|
// CHECK-LABEL: Binary Function "compressed_tail" after building cfg {
|
|
// CHECK: jr a0 # TAILCALL # Offset: 0
|
|
|
|
// CHECK-LABEL: Binary Function "_start" after fix-riscv-calls {
|
|
// CHECK: call f # Offset: 0
|
|
// CHECK-NEXT: call f # Offset: 8
|
|
// CHECK-NEXT: tail f # TAILCALL # Offset: 12
|
|
|
|
// CHECK-LABEL: Binary Function "long_tail" after fix-riscv-calls {
|
|
// CHECK: tail f # TAILCALL # Offset: 4
|
|
|
|
// CHECK-LABEL: Binary Function "compressed_tail" after fix-riscv-calls {
|
|
// CHECK: jr a0 # TAILCALL # Offset: 0
|
|
|
|
.globl _start
|
|
.p2align 1
|
|
_start:
|
|
call f
|
|
jal f
|
|
jal zero, f
|
|
.size _start, .-_start
|
|
|
|
.globl long_tail
|
|
.p2align 1
|
|
long_tail:
|
|
// NOTE: BOLT assumes indirect calls in single-BB functions are tail calls
|
|
// so artificially introduce a second BB to force RISC-V-specific analysis
|
|
// to get triggered.
|
|
beq a0, a1, 1f
|
|
1:
|
|
tail f
|
|
.size long_tail, .-long_tail
|
|
|
|
.globl compressed_tail
|
|
.p2align 1
|
|
.option rvc
|
|
compressed_tail:
|
|
c.jr a0
|
|
.size compressed_tail, .-compressed_tail
|