Skip to content

Commit 6702910

Browse files
Dong BoRealFYang
Dong Bo
authored and
RealFYang
committed
8256375: AArch64: aarch64-asmtest.py may generate undefined register r18
Reviewed-by: aph
1 parent 9fe2d31 commit 6702910

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎src/hotspot/cpu/aarch64/aarch64-asmtest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ def generate(self):
801801
self.reg = regMode().generate()
802802
kindStr = Address.kindToStr(self.kind);
803803
if (not isFloat) and (kindStr is "pre" or kindStr is "post"):
804-
(self.reg.number, self.adr.base.number) = random.sample(range(31), 2)
804+
(self.reg.number, self.adr.base.number) = random.sample(list(set(range(31)) - set([18])), 2)
805805
return self
806806

807807
def cstr(self):
@@ -841,11 +841,11 @@ def generate(self):
841841
kindStr = Address.kindToStr(self.kind);
842842
if kindStr is "pre" or kindStr is "post":
843843
if self._name.startswith("ld"):
844-
(self.reg[0].number, self.reg[1].number, self.base.number) = random.sample(range(31), 3)
844+
(self.reg[0].number, self.reg[1].number, self.base.number) = random.sample(list(set(range(31)) - set([18])), 3)
845845
if self._name.startswith("st"):
846-
self.base.number = random.choice(list(set(range(31)) - set([self.reg[0].number, self.reg[1].number])))
846+
self.base.number = random.choice(list(set(range(31)) - set([self.reg[0].number, self.reg[1].number, 18])))
847847
elif self._name.startswith("ld"):
848-
(self.reg[0].number, self.reg[1].number) = random.sample(range(31), 2)
848+
(self.reg[0].number, self.reg[1].number) = random.sample(list(set(range(31)) - set([18])), 2)
849849
return self
850850

851851
def astr(self):

‎src/hotspot/cpu/aarch64/assembler_aarch64.cpp

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -337,32 +337,32 @@ void entry(CodeBuffer *cb) {
337337

338338
// pre
339339
// LoadStoreOp
340-
__ str(r11, Address(__ pre(r0, 8))); // str x11, [x0, 8]!
340+
__ str(r10, Address(__ pre(r0, 8))); // str x10, [x0, 8]!
341341
__ strw(r3, Address(__ pre(r0, 29))); // str w3, [x0, 29]!
342-
__ strb(r11, Address(__ pre(r14, 9))); // strb w11, [x14, 9]!
343-
__ strh(r29, Address(__ pre(r24, -3))); // strh w29, [x24, -3]!
344-
__ ldr(r13, Address(__ pre(r17, -144))); // ldr x13, [x17, -144]!
342+
__ strb(r10, Address(__ pre(r14, 9))); // strb w10, [x14, 9]!
343+
__ strh(r29, Address(__ pre(r25, -3))); // strh w29, [x25, -3]!
344+
__ ldr(r12, Address(__ pre(r16, -144))); // ldr x12, [x16, -144]!
345345
__ ldrw(r12, Address(__ pre(r22, -6))); // ldr w12, [x22, -6]!
346-
__ ldrb(r13, Address(__ pre(r12, -10))); // ldrb w13, [x12, -10]!
346+
__ ldrb(r13, Address(__ pre(r11, -10))); // ldrb w13, [x11, -10]!
347347
__ ldrh(r0, Address(__ pre(r21, -21))); // ldrh w0, [x21, -21]!
348-
__ ldrsb(r23, Address(__ pre(r7, 4))); // ldrsb x23, [x7, 4]!
348+
__ ldrsb(r23, Address(__ pre(r6, 4))); // ldrsb x23, [x6, 4]!
349349
__ ldrsh(r3, Address(__ pre(r7, -53))); // ldrsh x3, [x7, -53]!
350-
__ ldrshw(r28, Address(__ pre(r5, -7))); // ldrsh w28, [x5, -7]!
351-
__ ldrsw(r24, Address(__ pre(r9, -18))); // ldrsw x24, [x9, -18]!
350+
__ ldrshw(r28, Address(__ pre(r4, -7))); // ldrsh w28, [x4, -7]!
351+
__ ldrsw(r24, Address(__ pre(r8, -18))); // ldrsw x24, [x8, -18]!
352352
__ ldrd(v14, Address(__ pre(r11, 12))); // ldr d14, [x11, 12]!
353353
__ ldrs(v19, Address(__ pre(r12, -67))); // ldr s19, [x12, -67]!
354354
__ strd(v20, Address(__ pre(r0, -253))); // str d20, [x0, -253]!
355355
__ strs(v8, Address(__ pre(r0, 64))); // str s8, [x0, 64]!
356356

357357
// post
358358
// LoadStoreOp
359-
__ str(r4, Address(__ post(r28, -94))); // str x4, [x28], -94
360-
__ strw(r12, Address(__ post(r7, -54))); // str w12, [x7], -54
359+
__ str(r3, Address(__ post(r28, -94))); // str x3, [x28], -94
360+
__ strw(r11, Address(__ post(r7, -54))); // str w11, [x7], -54
361361
__ strb(r27, Address(__ post(r10, -24))); // strb w27, [x10], -24
362-
__ strh(r6, Address(__ post(r8, 27))); // strh w6, [x8], 27
363-
__ ldr(r14, Address(__ post(r10, -202))); // ldr x14, [x10], -202
364-
__ ldrw(r16, Address(__ post(r5, -41))); // ldr w16, [x5], -41
365-
__ ldrb(r2, Address(__ post(r14, 9))); // ldrb w2, [x14], 9
362+
__ strh(r6, Address(__ post(r7, 27))); // strh w6, [x7], 27
363+
__ ldr(r13, Address(__ post(r10, -202))); // ldr x13, [x10], -202
364+
__ ldrw(r15, Address(__ post(r5, -41))); // ldr w15, [x5], -41
365+
__ ldrb(r2, Address(__ post(r13, 9))); // ldrb w2, [x13], 9
366366
__ ldrh(r28, Address(__ post(r13, -20))); // ldrh w28, [x13], -20
367367
__ ldrsb(r9, Address(__ post(r13, -31))); // ldrsb x9, [x13], -31
368368
__ ldrsh(r3, Address(__ post(r24, -36))); // ldrsh x3, [x24], -36
@@ -566,22 +566,22 @@ void entry(CodeBuffer *cb) {
566566
// LoadStorePairOp
567567
__ stpw(r20, r6, Address(r15, -32)); // stp w20, w6, [x15, #-32]
568568
__ ldpw(r27, r14, Address(r3, -208)); // ldp w27, w14, [x3, #-208]
569-
__ ldpsw(r17, r10, Address(r11, -80)); // ldpsw x17, x10, [x11, #-80]
569+
__ ldpsw(r16, r10, Address(r11, -80)); // ldpsw x16, x10, [x11, #-80]
570570
__ stp(r7, r7, Address(r14, 64)); // stp x7, x7, [x14, #64]
571571
__ ldp(r12, r23, Address(r0, 112)); // ldp x12, x23, [x0, #112]
572572

573573
// LoadStorePairOp
574574
__ stpw(r13, r7, Address(__ pre(r6, -80))); // stp w13, w7, [x6, #-80]!
575-
__ ldpw(r30, r16, Address(__ pre(r2, -144))); // ldp w30, w16, [x2, #-144]!
576-
__ ldpsw(r4, r1, Address(__ pre(r26, -144))); // ldpsw x4, x1, [x26, #-144]!
575+
__ ldpw(r30, r15, Address(__ pre(r2, -144))); // ldp w30, w15, [x2, #-144]!
576+
__ ldpsw(r4, r1, Address(__ pre(r27, -144))); // ldpsw x4, x1, [x27, #-144]!
577577
__ stp(r23, r14, Address(__ pre(r11, 64))); // stp x23, x14, [x11, #64]!
578578
__ ldp(r29, r27, Address(__ pre(r21, -192))); // ldp x29, x27, [x21, #-192]!
579579

580580
// LoadStorePairOp
581581
__ stpw(r22, r5, Address(__ post(r21, -48))); // stp w22, w5, [x21], #-48
582582
__ ldpw(r27, r17, Address(__ post(r6, -32))); // ldp w27, w17, [x6], #-32
583-
__ ldpsw(r17, r6, Address(__ post(r1, -80))); // ldpsw x17, x6, [x1], #-80
584-
__ stp(r13, r20, Address(__ post(r21, -208))); // stp x13, x20, [x21], #-208
583+
__ ldpsw(r16, r5, Address(__ post(r1, -80))); // ldpsw x16, x5, [x1], #-80
584+
__ stp(r13, r20, Address(__ post(r22, -208))); // stp x13, x20, [x22], #-208
585585
__ ldp(r30, r27, Address(__ post(r10, 80))); // ldp x30, x27, [x10], #80
586586

587587
// LoadStorePairOp
@@ -1049,12 +1049,12 @@ void entry(CodeBuffer *cb) {
10491049
0x781ce322, 0xf850f044, 0xb85e129e, 0x385e92f1,
10501050
0x785ff35d, 0x39801921, 0x7881318b, 0x78dce02b,
10511051
0xb8829313, 0xfc45f318, 0xbc5d50af, 0xfc001375,
1052-
0xbc1951b7, 0xf8008c0b, 0xb801dc03, 0x38009dcb,
1053-
0x781fdf1d, 0xf8570e2d, 0xb85faecc, 0x385f6d8d,
1054-
0x785ebea0, 0x38804cf7, 0x789cbce3, 0x78df9cbc,
1055-
0xb89eed38, 0xfc40cd6e, 0xbc5bdd93, 0xfc103c14,
1056-
0xbc040c08, 0xf81a2784, 0xb81ca4ec, 0x381e855b,
1057-
0x7801b506, 0xf853654e, 0xb85d74b0, 0x384095c2,
1052+
0xbc1951b7, 0xf8008c0a, 0xb801dc03, 0x38009dca,
1053+
0x781fdf3d, 0xf8570e0c, 0xb85faecc, 0x385f6d6d,
1054+
0x785ebea0, 0x38804cd7, 0x789cbce3, 0x78df9c9c,
1055+
0xb89eed18, 0xfc40cd6e, 0xbc5bdd93, 0xfc103c14,
1056+
0xbc040c08, 0xf81a2783, 0xb81ca4eb, 0x381e855b,
1057+
0x7801b4e6, 0xf853654d, 0xb85d74af, 0x384095a2,
10581058
0x785ec5bc, 0x389e15a9, 0x789dc703, 0x78c06474,
10591059
0xb89ff667, 0xfc57e51e, 0xbc4155f9, 0xfc05a6ee,
10601060
0xbc1df408, 0xf835da2a, 0xb836d9a4, 0x3833580d,
@@ -1094,10 +1094,10 @@ void entry(CodeBuffer *cb) {
10941094
0x1e22017c, 0x9e2201b9, 0x1e6202eb, 0x9e620113,
10951095
0x1e2602b1, 0x9e660299, 0x1e270233, 0x9e6703a2,
10961096
0x1e2822c0, 0x1e7322a0, 0x1e202288, 0x1e602168,
1097-
0x293c19f4, 0x2966387b, 0x69762971, 0xa9041dc7,
1098-
0xa9475c0c, 0x29b61ccd, 0x29ee405e, 0x69ee0744,
1097+
0x293c19f4, 0x2966387b, 0x69762970, 0xa9041dc7,
1098+
0xa9475c0c, 0x29b61ccd, 0x29ee3c5e, 0x69ee0764,
10991099
0xa9843977, 0xa9f46ebd, 0x28ba16b6, 0x28fc44db,
1100-
0x68f61831, 0xa8b352ad, 0xa8c56d5e, 0x28024565,
1100+
0x68f61430, 0xa8b352cd, 0xa8c56d5e, 0x28024565,
11011101
0x2874134e, 0xa8027597, 0xa87b1aa0, 0x0c40734f,
11021102
0x4cdfa177, 0x0cc76ee8, 0x4cdf2733, 0x0d40c23d,
11031103
0x4ddfcaf8, 0x0dd9ccaa, 0x4c408d51, 0x0cdf85ec,

0 commit comments

Comments
 (0)