ppc-7.0 queue:

* target/ppc: fix helper_xvmadd* argument order
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEoPZlSPBIlev+awtgUaNDx8/77KEFAmI/DdIACgkQUaNDx8/7
 7KF40Q/8DFt4QM5Ck6FsyqB3wYBNmxG8ELDkVDTpt2lGCcs32I/Xd7Bjxxe2pOKN
 9o/Ya2NvYLeT/QV7nmHOrj/LjbQfNTN+i8D6p5b9t5Tn8zoiR13KnIEdUALTCoR3
 nwkdm0GiUMYcMlhJZ/NNIy3aVqMw1A3IUHI+kBzwuKGYA1dNxZ63QvbyFI9uu61V
 FhF5onbFZPYxuJly03KMePTndyVmC1dYsujQbmZax43fklL0Kxz3GrrbRwHQLw4b
 oodkA1KiHq+H5chqdQSbpAfFdWUEnfH2GMCPfGgEXQMni4uJyVLuepZ2KTdMvyUD
 nEQUIONaIQnMRo4O6Eixe4i6YMSeEqp+ds/Tfy7NUtEDR//R40zn4hCv/ohjiGtB
 YLT0EuCyXsMCPCflOEM00JtUP0pQX4rB9dw6kI7jwMZVYYUSRaUzPTvN0yj6yML1
 PiuMliBGhYwMmR227oAnoBQ7aYaT6knvik3Q8R8noCEKL1HZJ+zennA42v0Cuuc4
 hHjMPV76klalWzm3ydCkgWhmhQmcJUWJwnSgct+lXq/vqhirMPizruR1on6NJptM
 DIgeersA+Jv5tukfuMAR0uTVrQ9McOjXE3RQIk/b0CJH65WODecHj+PHoFzcvzWg
 i0VMSFCUrjww891tELdjGMog7DZrmoJURoFIy0NV97/NUdrF12s=
 =IPtV
 -----END PGP SIGNATURE-----

Merge tag 'pull-ppc-20220326' of https://github.com/legoater/qemu into staging

ppc-7.0 queue:

* target/ppc: fix helper_xvmadd* argument order

# gpg: Signature made Sat 26 Mar 2022 12:57:54 GMT
# gpg:                using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1
# gpg: Good signature from "Cédric Le Goater <clg@kaod.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: A0F6 6548 F048 95EB FE6B  0B60 51A3 43C7 CFFB ECA1

* tag 'pull-ppc-20220326' of https://github.com/legoater/qemu:
  target/ppc: fix helper_xvmadd* argument order

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
master
Peter Maydell 2022-03-28 10:16:33 +01:00
commit 27fc9f365d
1 changed files with 10 additions and 10 deletions

View File

@ -1324,31 +1324,31 @@ TRANS(XSNMSUBQP, do_xsmadd_X, gen_helper_XSNMSUBQP, gen_helper_XSNMSUBQPO)
#define GEN_VSX_HELPER_VSX_MADD(name, op1, aop, mop, inval, type) \
static void gen_##name(DisasContext *ctx) \
{ \
TCGv_ptr xt, xa, b, c; \
TCGv_ptr xt, s1, s2, s3; \
if (unlikely(!ctx->vsx_enabled)) { \
gen_exception(ctx, POWERPC_EXCP_VSXU); \
return; \
} \
xt = gen_vsr_ptr(xT(ctx->opcode)); \
xa = gen_vsr_ptr(xA(ctx->opcode)); \
s1 = gen_vsr_ptr(xA(ctx->opcode)); \
if (ctx->opcode & PPC_BIT32(25)) { \
/* \
* AxT + B \
*/ \
b = gen_vsr_ptr(xT(ctx->opcode)); \
c = gen_vsr_ptr(xB(ctx->opcode)); \
s2 = gen_vsr_ptr(xB(ctx->opcode)); \
s3 = gen_vsr_ptr(xT(ctx->opcode)); \
} else { \
/* \
* AxB + T \
*/ \
b = gen_vsr_ptr(xB(ctx->opcode)); \
c = gen_vsr_ptr(xT(ctx->opcode)); \
s2 = gen_vsr_ptr(xT(ctx->opcode)); \
s3 = gen_vsr_ptr(xB(ctx->opcode)); \
} \
gen_helper_##name(cpu_env, xt, xa, b, c); \
gen_helper_##name(cpu_env, xt, s1, s2, s3); \
tcg_temp_free_ptr(xt); \
tcg_temp_free_ptr(xa); \
tcg_temp_free_ptr(b); \
tcg_temp_free_ptr(c); \
tcg_temp_free_ptr(s1); \
tcg_temp_free_ptr(s2); \
tcg_temp_free_ptr(s3); \
}
GEN_VSX_HELPER_VSX_MADD(xvmadddp, 0x04, 0x0C, 0x0D, 0, PPC2_VSX)