Skip to content

Commit 8b95a7d

Browse files
nickdesaulniersRussell King (Oracle)
authored andcommitted
ARM: 9087/1: kprobes: test-thumb: fix for LLVM_IAS=1
There's a few instructions that GAS infers operands but Clang doesn't; from what I can tell the Arm ARM doesn't say these are optional. F5.1.257 TBB, TBH T1 Halfword variant F5.1.238 STREXD T1 variant F5.1.84 LDREXD T1 variant Link: ClangBuiltLinux/linux#1309 Signed-off-by: Nick Desaulniers <[email protected]> Reviewed-by: Jian Cai <[email protected]> Signed-off-by: Russell King <[email protected]>
1 parent ad05f67 commit 8b95a7d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

arch/arm/probes/kprobes/test-thumb.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -441,21 +441,21 @@ void kprobe_thumb32_test_cases(void)
441441
"3: mvn r0, r0 \n\t"
442442
"2: nop \n\t")
443443

444-
TEST_RX("tbh [pc, r",7, (9f-(1f+4))>>1,"]",
444+
TEST_RX("tbh [pc, r",7, (9f-(1f+4))>>1,", lsl #1]",
445445
"9: \n\t"
446446
".short (2f-1b-4)>>1 \n\t"
447447
".short (3f-1b-4)>>1 \n\t"
448448
"3: mvn r0, r0 \n\t"
449449
"2: nop \n\t")
450450

451-
TEST_RX("tbh [pc, r",12, ((9f-(1f+4))>>1)+1,"]",
451+
TEST_RX("tbh [pc, r",12, ((9f-(1f+4))>>1)+1,", lsl #1]",
452452
"9: \n\t"
453453
".short (2f-1b-4)>>1 \n\t"
454454
".short (3f-1b-4)>>1 \n\t"
455455
"3: mvn r0, r0 \n\t"
456456
"2: nop \n\t")
457457

458-
TEST_RRX("tbh [r",1,9f, ", r",14,1,"]",
458+
TEST_RRX("tbh [r",1,9f, ", r",14,1,", lsl #1]",
459459
"9: \n\t"
460460
".short (2f-1b-4)>>1 \n\t"
461461
".short (3f-1b-4)>>1 \n\t"
@@ -468,10 +468,10 @@ void kprobe_thumb32_test_cases(void)
468468

469469
TEST_UNSUPPORTED("strexb r0, r1, [r2]")
470470
TEST_UNSUPPORTED("strexh r0, r1, [r2]")
471-
TEST_UNSUPPORTED("strexd r0, r1, [r2]")
471+
TEST_UNSUPPORTED("strexd r0, r1, r2, [r2]")
472472
TEST_UNSUPPORTED("ldrexb r0, [r1]")
473473
TEST_UNSUPPORTED("ldrexh r0, [r1]")
474-
TEST_UNSUPPORTED("ldrexd r0, [r1]")
474+
TEST_UNSUPPORTED("ldrexd r0, r1, [r1]")
475475

476476
TEST_GROUP("Data-processing (shifted register) and (modified immediate)")
477477

0 commit comments

Comments
 (0)