Skip to content

Commit e4dc0cd

Browse files
dbriemannTheRealMDoerr
authored andcommitted
8370579: PPC: fix inswri immediate argument order
Backport-of: 9625993
1 parent b3527e4 commit e4dc0cd

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/hotspot/cpu/ppc/ppc.ad

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13042,27 +13042,27 @@ instruct countTrailingZerosL_cnttzd(iRegIdst dst, iRegLsrc src) %{
1304213042
%}
1304313043

1304413044
// Expand nodes for byte_reverse_int.
13045-
instruct insrwi_a(iRegIdst dst, iRegIsrc src, immI16 pos, immI16 shift) %{
13046-
effect(DEF dst, USE src, USE pos, USE shift);
13045+
instruct insrwi_a(iRegIdst dst, iRegIsrc src, immI16 n, immI16 b) %{
13046+
effect(DEF dst, USE src, USE n, USE b);
1304713047
predicate(false);
1304813048

13049-
format %{ "INSRWI $dst, $src, $pos, $shift" %}
13049+
format %{ "INSRWI $dst, $src, $n, $b" %}
1305013050
size(4);
1305113051
ins_encode %{
13052-
__ insrwi($dst$$Register, $src$$Register, $shift$$constant, $pos$$constant);
13052+
__ insrwi($dst$$Register, $src$$Register, $n$$constant, $b$$constant);
1305313053
%}
1305413054
ins_pipe(pipe_class_default);
1305513055
%}
1305613056

1305713057
// As insrwi_a, but with USE_DEF.
13058-
instruct insrwi(iRegIdst dst, iRegIsrc src, immI16 pos, immI16 shift) %{
13059-
effect(USE_DEF dst, USE src, USE pos, USE shift);
13058+
instruct insrwi(iRegIdst dst, iRegIsrc src, immI16 n, immI16 b) %{
13059+
effect(USE_DEF dst, USE src, USE n, USE b);
1306013060
predicate(false);
1306113061

13062-
format %{ "INSRWI $dst, $src, $pos, $shift" %}
13062+
format %{ "INSRWI $dst, $src, $n, $b" %}
1306313063
size(4);
1306413064
ins_encode %{
13065-
__ insrwi($dst$$Register, $src$$Register, $shift$$constant, $pos$$constant);
13065+
__ insrwi($dst$$Register, $src$$Register, $n$$constant, $b$$constant);
1306613066
%}
1306713067
ins_pipe(pipe_class_default);
1306813068
%}
@@ -13084,12 +13084,12 @@ instruct bytes_reverse_int_Ex(iRegIdst dst, iRegIsrc src) %{
1308413084
iRegLdst tmpI3;
1308513085

1308613086
urShiftI_reg_imm(tmpI1, src, imm24);
13087-
insrwi_a(dst, tmpI1, imm24, imm8);
13087+
insrwi_a(dst, tmpI1, imm8, imm24);
1308813088
urShiftI_reg_imm(tmpI2, src, imm16);
13089-
insrwi(dst, tmpI2, imm8, imm16);
13089+
insrwi(dst, tmpI2, imm16, imm8);
1309013090
urShiftI_reg_imm(tmpI3, src, imm8);
1309113091
insrwi(dst, tmpI3, imm8, imm8);
13092-
insrwi(dst, src, imm0, imm8);
13092+
insrwi(dst, src, imm8, imm0);
1309313093
%}
1309413094
%}
1309513095

@@ -13207,7 +13207,7 @@ instruct bytes_reverse_ushort_Ex(iRegIdst dst, iRegIsrc src) %{
1320713207
immI16 imm8 %{ (int) 8 %}
1320813208

1320913209
urShiftI_reg_imm(dst, src, imm8);
13210-
insrwi(dst, src, imm16, imm8);
13210+
insrwi(dst, src, imm8, imm16);
1321113211
%}
1321213212
%}
1321313213

@@ -13236,7 +13236,7 @@ instruct bytes_reverse_short_Ex(iRegIdst dst, iRegIsrc src) %{
1323613236
iRegLdst tmpI1;
1323713237

1323813238
urShiftI_reg_imm(tmpI1, src, imm8);
13239-
insrwi(tmpI1, src, imm16, imm8);
13239+
insrwi(tmpI1, src, imm8, imm16);
1324013240
extsh(dst, tmpI1);
1324113241
%}
1324213242
%}

0 commit comments

Comments
 (0)