Skip to content

Commit 8865d1a

Browse files
committed
Address the review comments
1 parent bbd4791 commit 8865d1a

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

bolt/lib/Rewrite/RewriteInstance.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ static cl::opt<bool> WriteBoltInfoSection(
250250
cl::bits<GadgetScannerKind> GadgetScannersToRun(
251251
"scanners", cl::desc("which gadget scanners to run"),
252252
cl::values(clEnumValN(GS_PACRET, "pacret",
253-
"Return address protection (subset of \"pauth\")"),
253+
"pac-ret: return address protection (subset of \"pauth\")"),
254254
clEnumValN(GS_PAUTH, "pauth",
255255
"All Pointer Authentication scanners"),
256256
clEnumValN(GS_ALL, "all", "All implemented scanners")),

bolt/test/binary-analysis/AArch64/cmdline-args.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ HELP-EMPTY:
3333
HELP-NEXT: BinaryAnalysis options:
3434
HELP-EMPTY:
3535
HELP-NEXT: --scanners=<value> - which gadget scanners to run
36-
HELP-NEXT: =pacret - Return address protection (subset of "pauth")
36+
HELP-NEXT: =pacret - pac-ret: return address protection (subset of "pauth")
3737
HELP-NEXT: =pauth - All Pointer Authentication scanners
3838
HELP-NEXT: =all - All implemented scanners
3939
HELP-EMPTY:

bolt/test/binary-analysis/AArch64/gs-pauth-calls.s

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ good_indirect_call_mem_chain_of_auts:
201201
mov x29, sp
202202

203203
ldr x16, [x0]
204-
autia x16, x1
204+
autda x16, x1
205205
ldr x16, [x16]
206206
autia x16, x0
207207
blr x16
@@ -223,7 +223,7 @@ bad_indirect_call_mem_chain_of_auts:
223223
// CHECK-NEXT: {{[0-9a-f]+}}: stp x29, x30, [sp, #-0x10]!
224224
// CHECK-NEXT: {{[0-9a-f]+}}: mov x29, sp
225225
// CHECK-NEXT: {{[0-9a-f]+}}: ldr x16, [x0]
226-
// CHECK-NEXT: {{[0-9a-f]+}}: autia x16, x1
226+
// CHECK-NEXT: {{[0-9a-f]+}}: autda x16, x1
227227
// CHECK-NEXT: {{[0-9a-f]+}}: ldr x16, [x16]
228228
// CHECK-NEXT: {{[0-9a-f]+}}: blr x16
229229
// CHECK-NEXT: {{[0-9a-f]+}}: ldp x29, x30, [sp], #0x10
@@ -234,7 +234,7 @@ bad_indirect_call_mem_chain_of_auts:
234234
mov x29, sp
235235

236236
ldr x16, [x0]
237-
autia x16, x1
237+
autda x16, x1
238238
ldr x16, [x16]
239239
// Missing AUT of x16. The fact that x16 was authenticated above has nothing to do with it.
240240
blr x16
@@ -386,7 +386,7 @@ good_indirect_call_mem_chain_of_auts_multi_bb:
386386
mov x29, sp
387387

388388
ldr x16, [x0]
389-
autia x16, x1
389+
autda x16, x1
390390
ldr x16, [x16]
391391
autia x16, x0
392392
cbz x2, 1f
@@ -411,7 +411,7 @@ bad_indirect_call_mem_chain_of_auts_multi_bb:
411411
mov x29, sp
412412

413413
ldr x16, [x0]
414-
autia x16, x1
414+
autda x16, x1
415415
ldr x16, [x16]
416416
cbz x2, 1f
417417
autia x16, x0
@@ -492,11 +492,11 @@ bad_indirect_tailcall_mem_chain_of_auts:
492492
// CHECK-NEXT: 1. {{[0-9a-f]+}}: ldr x16, [x16]
493493
// CHECK-NEXT: This happens in the following basic block:
494494
// CHECK-NEXT: {{[0-9a-f]+}}: ldr x16, [x0]
495-
// CHECK-NEXT: {{[0-9a-f]+}}: autia x16, x1
495+
// CHECK-NEXT: {{[0-9a-f]+}}: autda x16, x1
496496
// CHECK-NEXT: {{[0-9a-f]+}}: ldr x16, [x16]
497497
// CHECK-NEXT: {{[0-9a-f]+}}: br x16
498498
ldr x16, [x0]
499-
autia x16, x1
499+
autda x16, x1
500500
ldr x16, [x16]
501501
// Missing AUT of x16. The fact that x16 was authenticated above has nothing to do with it.
502502
br x16

0 commit comments

Comments
 (0)