Skip to content

Commit b1dfd8c

Browse files
redstarredstar
committed
Use correct type extension for relocations
D means 8 byte.
1 parent b634514 commit b1dfd8c

File tree

6 files changed

+45
-44
lines changed

6 files changed

+45
-44
lines changed

‎llvm/lib/Target/SystemZ/MCTargetDesc/SystemZHLASMAsmStreamer.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ void SystemZHLASMAsmStreamer::emitHLASMValueImpl(const MCExpr *Value,
298298
}
299299

300300
if (Parens)
301-
OS << "A(";
301+
OS << "AD(";
302302
emitHLASMValueImpl(BE.getLHS(), Size);
303303

304304
switch (BE.getOpcode()) {
@@ -336,7 +336,7 @@ void SystemZHLASMAsmStreamer::emitHLASMValueImpl(const MCExpr *Value,
336336
default:
337337
Parens &= isa<MCSymbolRefExpr>(Value);
338338
if (Parens)
339-
OS << "A(";
339+
OS << "AD(";
340340
MAI->printExpr(OS, *Value);
341341
if (Parens)
342342
OS << ')';

‎llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@ void SystemZMCAsmInfoGOFF::printSpecifierExpr(
6363
raw_ostream &OS, const MCSpecifierExpr &Expr) const {
6464
switch (Expr.getSpecifier()) {
6565
case SystemZ::S_None:
66-
OS << "A";
66+
OS << "AD";
6767
break;
6868
case SystemZ::S_QCon:
69-
OS << "Q";
69+
OS << "QD";
7070
break;
7171
case SystemZ::S_RCon:
72-
OS << "R";
72+
OS << "RD";
7373
break;
7474
case SystemZ::S_VCon:
75-
OS << "V";
75+
OS << "VD";
7676
break;
7777
default:
7878
llvm_unreachable("Invalid kind");

‎llvm/test/CodeGen/SystemZ/llvm.sincos.ll‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -184,18 +184,18 @@ define { <2 x fp128>, <2 x fp128> } @test_sincos_v2f128(<2 x fp128> %a) #0 {
184184
}
185185

186186

187-
; ZOS: .quad R(@@FSIN@B) * Offset 0 function descriptor of @@FSIN@B
188-
; ZOS: .quad V(@@FSIN@B)
189-
; ZOS: .quad R(@@FCOS@B) * Offset 16 function descriptor of @@FCOS@B
190-
; ZOS: .quad V(@@FCOS@B)
191-
; ZOS: .quad R(@@SSIN@B) * Offset 32 function descriptor of @@SSIN@B
192-
; ZOS: .quad V(@@SSIN@B)
193-
; ZOS: .quad R(@@SCOS@B) * Offset 48 function descriptor of @@SCOS@B
194-
; ZOS: .quad V(@@SCOS@B)
195-
; ZOS: .quad R(@@LSIN@B) * Offset 64 function descriptor of @@LSIN@B
196-
; ZOS: .quad V(@@LSIN@B)
197-
; ZOS: .quad R(@@LCOS@B) * Offset 80 function descriptor of @@LCOS@B
198-
; ZOS: .quad V(@@LCOS@B)
187+
; ZOS: .quad RD(@@FSIN@B) * Offset 0 function descriptor of @@FSIN@B
188+
; ZOS: .quad VD(@@FSIN@B)
189+
; ZOS: .quad RD(@@FCOS@B) * Offset 16 function descriptor of @@FCOS@B
190+
; ZOS: .quad VD(@@FCOS@B)
191+
; ZOS: .quad RD(@@SSIN@B) * Offset 32 function descriptor of @@SSIN@B
192+
; ZOS: .quad VD(@@SSIN@B)
193+
; ZOS: .quad RD(@@SCOS@B) * Offset 48 function descriptor of @@SCOS@B
194+
; ZOS: .quad VD(@@SCOS@B)
195+
; ZOS: .quad RD(@@LSIN@B) * Offset 64 function descriptor of @@LSIN@B
196+
; ZOS: .quad VD(@@LSIN@B)
197+
; ZOS: .quad RD(@@LCOS@B) * Offset 80 function descriptor of @@LCOS@B
198+
; ZOS: .quad VD(@@LCOS@B)
199199

200200

201201
attributes #0 = { nounwind }

‎llvm/test/CodeGen/SystemZ/zos-ada-relocations.ll‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ declare signext i32 @callout(i32 signext)
6060
; CHECK: stdin#S XATTR LINKAGE(XPLINK),REFERENCE(DATA),SCOPE(SECTION)
6161
; CHECK: .set L#DoFunc@indirect0, DoFunc
6262
; CHECK: .indirect_symbol L#DoFunc@indirect0
63-
; CHECK: .quad V(L#DoFunc@indirect0) * Offset 0 pointer to function descriptor DoFunc
64-
; CHECK: .quad R(Caller) * Offset 8 function descriptor of Caller
65-
; CHECK: .quad V(Caller)
66-
; CHECK: .quad A(i2) * Offset 24 pointer to data symbol i2
67-
; CHECK: .quad A(i) * Offset 32 pointer to data symbol i
68-
; CHECK: .quad R(callout) * Offset 40 function descriptor of callout
69-
; CHECK: .quad V(callout)
63+
; CHECK: .quad VD(L#DoFunc@indirect0) * Offset 0 pointer to function descriptor DoFunc
64+
; CHECK: .quad RD(Caller) * Offset 8 function descriptor of Caller
65+
; CHECK: .quad VD(Caller)
66+
; CHECK: .quad AD(i2) * Offset 24 pointer to data symbol i2
67+
; CHECK: .quad AD(i) * Offset 32 pointer to data symbol i
68+
; CHECK: .quad RD(callout) * Offset 40 function descriptor of callout
69+
; CHECK: .quad VD(callout)

‎llvm/test/CodeGen/SystemZ/zos-hlasm-out.ll‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ define void @foo() {
1313
; CHECK: DC XL1'E7'
1414
; CHECK: DC XL1'22'
1515
; CHECK: DC XL1'04'
16-
; CHECK: DC A(CELQSTRT-L#PPA2)
16+
; CHECK: DC AD(CELQSTRT-L#PPA2)
1717
; CHECK: DC XL4'00000000'
18-
; CHECK: DC A(L#DVS-L#PPA2)
18+
; CHECK: DC AD(L#DVS-L#PPA2)
1919
; CHECK: DC XL4'00000000'
2020
; CHECK: DC XL1'81'
2121
; CHECK: DC XL1'00'
@@ -24,32 +24,32 @@ define void @foo() {
2424
; CHECK: DC XL1'02'
2525
; CHECK: DC XL1'CE'
2626
; CHECK: DC XL2'0300'
27-
; CHECK: DC A(L#PPA2-L#PPA1_foo_0)
27+
; CHECK: DC AD(L#PPA2-L#PPA1_foo_0)
2828
; CHECK: DC XL1'80'
2929
; CHECK: DC XL1'80'
3030
; CHECK: DC XL1'00'
3131
; CHECK: DC XL1'81'
3232
; CHECK: DC XL2'0000'
33-
; CHECK: DC A(L#func_end0-L#EPM_foo_0)
33+
; CHECK: DC AD(L#func_end0-L#EPM_foo_0)
3434
; CHECK: DC XL2'0003'
3535
; CHECK: DC XL3'869696'
36-
; CHECK: DC A(L#EPM_foo_0-L#PPA1_foo_0)
36+
; CHECK: DC AD(L#EPM_foo_0-L#PPA1_foo_0)
3737
; CHECK-LABEL: L#.str DS 0H
3838
; CHECK: DC XL10'48656C6C6F2025730A00'
3939
; CHECK: DS 0B
4040
; CHECK-LABEL: Greeting DS 0H
41-
; CHECK: DC A(L#.str)
41+
; CHECK: DC AD(L#.str)
4242
; CHECK: DS 0B
4343
; CHECK-LABEL: L#.str.1 DS 0H
4444
; CHECK: DC XL6'576F726C6400'
4545
; CHECK: C_WSA64 CATTR ALIGN(4),FILL(0),DEFLOAD,NOTEXECUTABLE,RMODE(64),PART(stdi
4646
; CHECK: in#S)
4747
; CHECK: stdin#S XATTR LINKAGE(XPLINK),REFERENCE(DATA),SCOPE(SECTION)
4848
; CHECK: * Offset 0 pointer to data symbol Greeting
49-
; CHECK: DC A(Greeting)
49+
; CHECK: DC AD(Greeting)
5050
; CHECK: * Offset 8 function descriptor of outs
51-
; CHECK: DC R(outs)
52-
; CHECK: DC V(outs)
51+
; CHECK: DC RD(outs)
52+
; CHECK: DC VD(outs)
5353
; CHECK: END
5454
entry:
5555
%0 = load ptr, ptr @Greeting, align 8

‎llvm/test/CodeGen/SystemZ/zos-intrinsics.ll‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: llc -mtriple s390x-zos < %s | FileCheck %s
1+
; RUN: llc -mtriple s390x-zos -emit-gnuas-syntax-on-zos=0 < %s | FileCheck %s
22

33
define float @sqrt_ieee(float %x) {
44
entry:
@@ -31,17 +31,18 @@ declare fp128 @llvm.exp2.f128(fp128)
3131

3232
; Check the calls in the ADA.
3333
; CHECK: stdin#C CSECT
34-
; CHECK: C_WSA64 CATTR ALIGN(4),FILL(0),DEFLOAD,NOTEXECUTABLE,RMODE(64),PART(stdin#S)
34+
; CHECK: C_WSA64 CATTR ALIGN(4),FILL(0),DEFLOAD,NOTEXECUTABLE,RMODE(64),PART(stdi
35+
; CHECK-NEXT: in#S)
3536
; CHECK: stdin#S XATTR LINKAGE(XPLINK),REFERENCE(DATA),SCOPE(SECTION)
3637

3738
; Check that there is no call to sqrt.
38-
; CHECK-NOT: .quad R(@@WSQT@B)
39-
; CHECK-NOT: .quad V(@@WSQT@B)
39+
; CHECK-NOT: DC RD(@@WSQT@B)
40+
; CHECK-NOT: DC VD(@@WSQT@B)
4041

4142
; Check that there is the correct library call.
42-
; CHECK: .quad R(@@FCOS@B)
43-
; CHECK-NEXT: .quad V(@@FCOS@B)
44-
; CHECK: .quad R(@@SSIN@B)
45-
; CHECK-NEXT: .quad V(@@SSIN@B)
46-
; CHECK: .quad R(@@LXP2@B)
47-
; CHECK-NEXT: .quad V(@@LXP2@B)
43+
; CHECK: DC RD(@@FCOS@B)
44+
; CHECK-NEXT: DC VD(@@FCOS@B)
45+
; CHECK: DC RD(@@SSIN@B)
46+
; CHECK-NEXT: DC VD(@@SSIN@B)
47+
; CHECK: DC RD(@@LXP2@B)
48+
; CHECK-NEXT: DC VD(@@LXP2@B)

0 commit comments

Comments
 (0)