Skip to content

Commit c919ea5

Browse files
benshi001benshi001
committed
[AVR] Fix incorrectly printed global symbol operands in inline-asm
Fixes llvm#58879 Reviewed By: aykevl Differential Revision: https://reviews.llvm.org/D142096
1 parent 05927eb commit c919ea5

File tree

2 files changed

+50
-17
lines changed

2 files changed

+50
-17
lines changed

‎llvm/lib/Target/AVR/AVRAsmPrinter.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,13 @@ bool AVRAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNum,
142142
}
143143
}
144144

145+
// Print global symbols.
146+
const auto &MO = MI->getOperand(OpNum);
147+
if (Error && MO.getType() == MachineOperand::MO_GlobalAddress) {
148+
PrintSymbolOperand(MO, O);
149+
return false;
150+
}
151+
145152
if (Error)
146153
printOperand(MI, OpNum, O);
147154

‎llvm/test/CodeGen/AVR/inline-asm/inline-asm3.ll

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ define void @add_r_i8(i8 signext %0, i8 signext %1) {
1010
; CHECK-NEXT: mov r24, r22
1111
; CHECK-NEXT: add r24, r20
1212
; CHECK-NEXT: ;NO_APP
13-
; CHECK-NEXT: call foo8
13+
; CHECK-NEXT: rcall foo8
1414
; CHECK-NEXT: ret
1515
%3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=r,r,r"(i8 %0, i8 %1)
1616
tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
@@ -32,7 +32,7 @@ define void @add_r_i16(i16 signext %0, i16 signext %1) {
3232
; CHECK-NEXT: add r24, r20
3333
; CHECK-NEXT: adc r25, r21
3434
; CHECK-NEXT: ;NO_APP
35-
; CHECK-NEXT: call foo16
35+
; CHECK-NEXT: rcall foo16
3636
; CHECK-NEXT: ret
3737
%3 = tail call i16 asm sideeffect "mov ${0:A}, ${1:A}\0Amov ${0:B}, ${1:B}\0Aadd ${0:A}, ${2:A}\0Aadc ${0:B}, ${2:B}", "=r,r,r"(i16 %0, i16 %1)
3838
tail call void @foo16(i16 signext %3, i16 signext %0, i16 signext %1)
@@ -51,7 +51,7 @@ define void @add_a_i8(i8 signext %0, i8 signext %1) {
5151
; CHECK-NEXT: add r23, r20
5252
; CHECK-NEXT: ;NO_APP
5353
; CHECK-NEXT: mov r24, r23
54-
; CHECK-NEXT: call foo8
54+
; CHECK-NEXT: rcall foo8
5555
; CHECK-NEXT: ret
5656
%3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=a,a,a"(i8 %0, i8 %1)
5757
tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
@@ -73,7 +73,7 @@ define void @add_a_i16(i16 signext %0, i16 signext %1) {
7373
; CHECK-NEXT: ;NO_APP
7474
; CHECK-NEXT: mov r24, r18
7575
; CHECK-NEXT: mov r25, r19
76-
; CHECK-NEXT: call foo16
76+
; CHECK-NEXT: rcall foo16
7777
; CHECK-NEXT: ret
7878
%3 = tail call i16 asm sideeffect "mov ${0:A}, ${1:A}\0Amov ${0:B}, ${1:B}\0Aadd ${0:A}, ${2:A}\0Aadc ${0:B}, ${2:B}", "=a,a,a"(i16 %0, i16 %1)
7979
tail call void @foo16(i16 signext %3, i16 signext %0, i16 signext %1)
@@ -89,7 +89,7 @@ define void @add_d_i8(i8 signext %0, i8 signext %1) {
8989
; CHECK-NEXT: mov r24, r22
9090
; CHECK-NEXT: add r24, r20
9191
; CHECK-NEXT: ;NO_APP
92-
; CHECK-NEXT: call foo8
92+
; CHECK-NEXT: rcall foo8
9393
; CHECK-NEXT: ret
9494
%3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=d,d,d"(i8 %0, i8 %1)
9595
tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
@@ -109,7 +109,7 @@ define void @add_d_i16(i16 signext %0, i16 signext %1) {
109109
; CHECK-NEXT: add r24, r20
110110
; CHECK-NEXT: adc r25, r21
111111
; CHECK-NEXT: ;NO_APP
112-
; CHECK-NEXT: call foo16
112+
; CHECK-NEXT: rcall foo16
113113
; CHECK-NEXT: ret
114114
%3 = tail call i16 asm sideeffect "mov ${0:A}, ${1:A}\0Amov ${0:B}, ${1:B}\0Aadd ${0:A}, ${2:A}\0Aadc ${0:B}, ${2:B}", "=d,d,d"(i16 %0, i16 %1)
115115
tail call void @foo16(i16 signext %3, i16 signext %0, i16 signext %1)
@@ -131,7 +131,7 @@ define void @add_l_i8(i8 signext %0, i8 signext %1) {
131131
; CHECK-NEXT: mov r24, r13
132132
; CHECK-NEXT: mov r22, r14
133133
; CHECK-NEXT: mov r20, r15
134-
; CHECK-NEXT: call foo8
134+
; CHECK-NEXT: rcall foo8
135135
; CHECK-NEXT: pop r15
136136
; CHECK-NEXT: pop r14
137137
; CHECK-NEXT: pop r13
@@ -166,7 +166,7 @@ define void @add_l_i16(i16 signext %0, i16 signext %1) {
166166
; CHECK-NEXT: mov r23, r13
167167
; CHECK-NEXT: mov r20, r14
168168
; CHECK-NEXT: mov r21, r15
169-
; CHECK-NEXT: call foo16
169+
; CHECK-NEXT: rcall foo16
170170
; CHECK-NEXT: pop r15
171171
; CHECK-NEXT: pop r14
172172
; CHECK-NEXT: pop r13
@@ -190,7 +190,7 @@ define void @add_b_i8(i8 signext %0, i8 signext %1) {
190190
; CHECK-NEXT: add r30, r20
191191
; CHECK-NEXT: ;NO_APP
192192
; CHECK-NEXT: mov r24, r30
193-
; CHECK-NEXT: call foo8
193+
; CHECK-NEXT: rcall foo8
194194
; CHECK-NEXT: ret
195195
%3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=b,b,r"(i8 %0, i8 %1)
196196
tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
@@ -214,7 +214,7 @@ define void @add_b_i16(i16 signext %0, i16 signext %1) {
214214
; CHECK-NEXT: ;NO_APP
215215
; CHECK-NEXT: mov r24, r30
216216
; CHECK-NEXT: mov r25, r31
217-
; CHECK-NEXT: call foo16
217+
; CHECK-NEXT: rcall foo16
218218
; CHECK-NEXT: ret
219219
%3 = tail call i16 asm sideeffect "mov ${0:A}, ${1:A}\0Amov ${0:B}, ${1:B}\0Aadd ${0:A}, ${2:A}\0Aadc ${0:B}, ${2:B}", "=b,b,r"(i16 %0, i16 %1)
220220
tail call void @foo16(i16 signext %3, i16 signext %0, i16 signext %1)
@@ -235,7 +235,7 @@ define void @add_e_i8(i8 signext %0, i8 signext %1) {
235235
; CHECK-NEXT: mov r24, r26
236236
; CHECK-NEXT: ; kill: def $r22 killed $r22 killed $r23r22
237237
; CHECK-NEXT: mov r20, r30
238-
; CHECK-NEXT: call foo8
238+
; CHECK-NEXT: rcall foo8
239239
; CHECK-NEXT: ret
240240
%3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=e,e,e"(i8 %0, i8 %1)
241241
tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
@@ -261,7 +261,7 @@ define void @add_e_i16(i16 signext %0, i16 signext %1) {
261261
; CHECK-NEXT: mov r25, r27
262262
; CHECK-NEXT: mov r20, r30
263263
; CHECK-NEXT: mov r21, r31
264-
; CHECK-NEXT: call foo16
264+
; CHECK-NEXT: rcall foo16
265265
; CHECK-NEXT: ret
266266
%3 = tail call i16 asm sideeffect "mov ${0:A}, ${1:A}\0Amov ${0:B}, ${1:B}\0Aadd ${0:A}, ${2:A}\0Aadc ${0:B}, ${2:B}", "=e,e,e"(i16 %0, i16 %1)
267267
tail call void @foo16(i16 signext %3, i16 signext %0, i16 signext %1)
@@ -278,7 +278,7 @@ define void @add_t_i8(i8 signext %0, i8 signext %1) {
278278
; CHECK-NEXT: add r0, r20
279279
; CHECK-NEXT: ;NO_APP
280280
; CHECK-NEXT: mov r24, r0
281-
; CHECK-NEXT: call foo8
281+
; CHECK-NEXT: rcall foo8
282282
; CHECK-NEXT: ret
283283
%3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=t,r,r"(i8 %0, i8 %1)
284284
tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
@@ -297,7 +297,7 @@ define void @add_w_i8(i8 signext %0, i8 signext %1) {
297297
; CHECK-NEXT: ; kill: def $r24 killed $r24 killed $r25r24
298298
; CHECK-NEXT: mov r22, r30
299299
; CHECK-NEXT: mov r20, r26
300-
; CHECK-NEXT: call foo8
300+
; CHECK-NEXT: rcall foo8
301301
; CHECK-NEXT: ret
302302
%3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=w,w,w"(i8 %0, i8 %1)
303303
tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
@@ -321,7 +321,7 @@ define void @add_w_i16(i16 signext %0, i16 signext %1) {
321321
; CHECK-NEXT: mov r23, r31
322322
; CHECK-NEXT: mov r20, r26
323323
; CHECK-NEXT: mov r21, r27
324-
; CHECK-NEXT: call foo16
324+
; CHECK-NEXT: rcall foo16
325325
; CHECK-NEXT: ret
326326
%3 = tail call i16 asm sideeffect "mov ${0:A}, ${1:A}\0Amov ${0:B}, ${1:B}\0Aadd ${0:A}, ${2:A}\0Aadc ${0:B}, ${2:B}", "=w,w,w"(i16 %0, i16 %1)
327327
tail call void @foo16(i16 signext %3, i16 signext %0, i16 signext %1)
@@ -348,7 +348,7 @@ define void @add_xyz_i8(i8 signext %0, i8 signext %1) {
348348
; CHECK-NEXT: ; kill: def $r24 killed $r24 killed $r25r24
349349
; CHECK-NEXT: ; kill: def $r22 killed $r22 killed $r23r22
350350
; CHECK-NEXT: ; kill: def $r20 killed $r20 killed $r21r20
351-
; CHECK-NEXT: call foo8
351+
; CHECK-NEXT: rcall foo8
352352
; CHECK-NEXT: pop r29
353353
; CHECK-NEXT: pop r28
354354
; CHECK-NEXT: ret
@@ -378,11 +378,37 @@ define void @add_xyz_i16(i16 signext %0, i16 signext %1) {
378378
; CHECK-NEXT: ;NO_APP
379379
; CHECK-NEXT: mov r24, r30
380380
; CHECK-NEXT: mov r25, r31
381-
; CHECK-NEXT: call foo16
381+
; CHECK-NEXT: rcall foo16
382382
; CHECK-NEXT: pop r29
383383
; CHECK-NEXT: pop r28
384384
; CHECK-NEXT: ret
385385
%3 = tail call i16 asm sideeffect "mov ${0:A}, ${1:A}\0Amov ${0:B}, ${1:B}\0Aadd ${0:A}, ${2:A}\0Aadc ${0:B}, ${2:B}", "=z,y,x"(i16 %0, i16 %1)
386386
tail call void @foo16(i16 signext %3, i16 signext %0, i16 signext %1)
387387
ret void
388388
}
389+
390+
@gvar = global i16 0
391+
392+
define i16* @ldi_dreg_symbol() {
393+
; CHECK-LABEL: ldi_dreg_symbol:
394+
; CHECK: ; %bb.0:
395+
; CHECK-NEXT: ;APP
396+
; CHECK-NEXT: ldi r25, hi8(gvar)
397+
; CHECK-NEXT: ldi r24, lo8(gvar)
398+
; CHECK-NEXT: ;NO_APP
399+
; CHECK-NEXT: ret
400+
%1 = tail call i16* asm sideeffect "ldi ${0:B}, hi8($1)\0A\09ldi ${0:A}, lo8($1)", "=d,i"(i16* @gvar)
401+
ret i16* %1
402+
}
403+
404+
define i16* @ldi_dreg_imm() {
405+
; CHECK-LABEL: ldi_dreg_imm:
406+
; CHECK: ; %bb.0:
407+
; CHECK-NEXT: ;APP
408+
; CHECK-NEXT: ldi r25, hi8(2345)
409+
; CHECK-NEXT: ldi r24, lo8(2345)
410+
; CHECK-NEXT: ;NO_APP
411+
; CHECK-NEXT: ret
412+
%1 = tail call i16* asm sideeffect "ldi ${0:B}, hi8($1)\0A\09ldi ${0:A}, lo8($1)", "=d,i"(i16 2345)
413+
ret i16* %1
414+
}

0 commit comments

Comments
 (0)