Skip to content

Commit 248eb54

Browse files
dbriemannTheRealMDoerr
authored andcommitted
8370579: PPC: fix inswri immediate argument order
Backport-of: 9625993
1 parent 9a28f7e commit 248eb54

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
@@ -13073,27 +13073,27 @@ instruct countTrailingZerosL_cnttzd(iRegIdst dst, iRegLsrc src) %{
1307313073
%}
1307413074

1307513075
// Expand nodes for byte_reverse_int.
13076-
instruct insrwi_a(iRegIdst dst, iRegIsrc src, immI16 pos, immI16 shift) %{
13077-
effect(DEF dst, USE src, USE pos, USE shift);
13076+
instruct insrwi_a(iRegIdst dst, iRegIsrc src, immI16 n, immI16 b) %{
13077+
effect(DEF dst, USE src, USE n, USE b);
1307813078
predicate(false);
1307913079

13080-
format %{ "INSRWI $dst, $src, $pos, $shift" %}
13080+
format %{ "INSRWI $dst, $src, $n, $b" %}
1308113081
size(4);
1308213082
ins_encode %{
13083-
__ insrwi($dst$$Register, $src$$Register, $shift$$constant, $pos$$constant);
13083+
__ insrwi($dst$$Register, $src$$Register, $n$$constant, $b$$constant);
1308413084
%}
1308513085
ins_pipe(pipe_class_default);
1308613086
%}
1308713087

1308813088
// As insrwi_a, but with USE_DEF.
13089-
instruct insrwi(iRegIdst dst, iRegIsrc src, immI16 pos, immI16 shift) %{
13090-
effect(USE_DEF dst, USE src, USE pos, USE shift);
13089+
instruct insrwi(iRegIdst dst, iRegIsrc src, immI16 n, immI16 b) %{
13090+
effect(USE_DEF dst, USE src, USE n, USE b);
1309113091
predicate(false);
1309213092

13093-
format %{ "INSRWI $dst, $src, $pos, $shift" %}
13093+
format %{ "INSRWI $dst, $src, $n, $b" %}
1309413094
size(4);
1309513095
ins_encode %{
13096-
__ insrwi($dst$$Register, $src$$Register, $shift$$constant, $pos$$constant);
13096+
__ insrwi($dst$$Register, $src$$Register, $n$$constant, $b$$constant);
1309713097
%}
1309813098
ins_pipe(pipe_class_default);
1309913099
%}
@@ -13115,12 +13115,12 @@ instruct bytes_reverse_int_Ex(iRegIdst dst, iRegIsrc src) %{
1311513115
iRegLdst tmpI3;
1311613116

1311713117
urShiftI_reg_imm(tmpI1, src, imm24);
13118-
insrwi_a(dst, tmpI1, imm24, imm8);
13118+
insrwi_a(dst, tmpI1, imm8, imm24);
1311913119
urShiftI_reg_imm(tmpI2, src, imm16);
13120-
insrwi(dst, tmpI2, imm8, imm16);
13120+
insrwi(dst, tmpI2, imm16, imm8);
1312113121
urShiftI_reg_imm(tmpI3, src, imm8);
1312213122
insrwi(dst, tmpI3, imm8, imm8);
13123-
insrwi(dst, src, imm0, imm8);
13123+
insrwi(dst, src, imm8, imm0);
1312413124
%}
1312513125
%}
1312613126

@@ -13238,7 +13238,7 @@ instruct bytes_reverse_ushort_Ex(iRegIdst dst, iRegIsrc src) %{
1323813238
immI16 imm8 %{ (int) 8 %}
1323913239

1324013240
urShiftI_reg_imm(dst, src, imm8);
13241-
insrwi(dst, src, imm16, imm8);
13241+
insrwi(dst, src, imm8, imm16);
1324213242
%}
1324313243
%}
1324413244

@@ -13267,7 +13267,7 @@ instruct bytes_reverse_short_Ex(iRegIdst dst, iRegIsrc src) %{
1326713267
iRegLdst tmpI1;
1326813268

1326913269
urShiftI_reg_imm(tmpI1, src, imm8);
13270-
insrwi(tmpI1, src, imm16, imm8);
13270+
insrwi(tmpI1, src, imm8, imm16);
1327113271
extsh(dst, tmpI1);
1327213272
%}
1327313273
%}

0 commit comments

Comments
 (0)