From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSEsZ-0002js-78 for qemu-devel@nongnu.org; Tue, 26 Jul 2016 22:47:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSEsT-0001la-QA for qemu-devel@nongnu.org; Tue, 26 Jul 2016 22:47:26 -0400 Date: Wed, 27 Jul 2016 11:57:33 +1000 From: David Gibson Message-ID: <20160727015733.GR17429@voom.fritz.box> References: <1469571686-7284-1-git-send-email-benh@kernel.crashing.org> <1469571686-7284-10-git-send-email-benh@kernel.crashing.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="dO6Thh8T/cwyDjv9" Content-Disposition: inline In-Reply-To: <1469571686-7284-10-git-send-email-benh@kernel.crashing.org> Subject: Re: [Qemu-devel] [PATCH 10/32] ppc: Make float_check_status() pass the return address List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Benjamin Herrenschmidt Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org --dO6Thh8T/cwyDjv9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jul 27, 2016 at 08:21:04AM +1000, Benjamin Herrenschmidt wrote: > Instead of relying on NIP having been updated already. >=20 > Signed-off-by: Benjamin Herrenschmidt > --- > target-ppc/fpu_helper.c | 63 +++++++++++++++++++++++++++++--------------= ------ > 1 file changed, 38 insertions(+), 25 deletions(-) >=20 > diff --git a/target-ppc/fpu_helper.c b/target-ppc/fpu_helper.c > index 8d881fc..7bab3ff 100644 > --- a/target-ppc/fpu_helper.c > +++ b/target-ppc/fpu_helper.c > @@ -209,7 +209,7 @@ static inline uint64_t float_invalid_op_excp(CPUPPCSt= ate *env, int op, > return ret; > } > =20 > -static inline void float_zero_divide_excp(CPUPPCState *env) > +static inline void float_zero_divide_excp(CPUPPCState *env, uintptr_t ra= ddr) > { > env->fpscr |=3D 1 << FPSCR_ZX; > env->fpscr &=3D ~((1 << FPSCR_FR) | (1 << FPSCR_FI)); > @@ -219,8 +219,9 @@ static inline void float_zero_divide_excp(CPUPPCState= *env) > /* Update the floating-point enabled exception summary */ > env->fpscr |=3D 1 << FPSCR_FEX; > if (msr_fe0 !=3D 0 || msr_fe1 !=3D 0) { > - helper_raise_exception_err(env, POWERPC_EXCP_PROGRAM, > - POWERPC_EXCP_FP | POWERPC_EXCP_FP= _ZX); > + raise_exception_err_ra(env, POWERPC_EXCP_PROGRAM, > + POWERPC_EXCP_FP | POWERPC_EXCP_FP_ZX, > + raddr); > } > } > } > @@ -493,13 +494,14 @@ void store_fpscr(CPUPPCState *env, uint64_t arg, ui= nt32_t mask) > helper_store_fpscr(env, arg, mask); > } > =20 > -void helper_float_check_status(CPUPPCState *env) > +static __attribute__((noinline)) void do_float_check_status(CPUPPCState = *env, > + uintptr_t ra= ddr) Why do you need to force this to be non-inline? > { > CPUState *cs =3D CPU(ppc_env_get_cpu(env)); > int status =3D get_float_exception_flags(&env->fp_status); > =20 > if (status & float_flag_divbyzero) { > - float_zero_divide_excp(env); > + float_zero_divide_excp(env, raddr); > } else if (status & float_flag_overflow) { > float_overflow_excp(env); > } else if (status & float_flag_underflow) { > @@ -512,12 +514,23 @@ void helper_float_check_status(CPUPPCState *env) > (env->error_code & POWERPC_EXCP_FP)) { > /* Differred floating-point exception after target FPR update */ > if (msr_fe0 !=3D 0 || msr_fe1 !=3D 0) { > - helper_raise_exception_err(env, cs->exception_index, > - env->error_code); > + raise_exception_err_ra(env, cs->exception_index, > + env->error_code, raddr); > } > } > } > =20 > +static inline void float_check_status(CPUPPCState *env) > +{ > + /* GETPC() works here because this is inline */ > + do_float_check_status(env, GETPC()); > +} > + > +void helper_float_check_status(CPUPPCState *env) > +{ > + do_float_check_status(env, GETPC()); > +} > + > void helper_reset_fpstatus(CPUPPCState *env) > { > set_float_exception_flags(0, &env->fp_status); > @@ -642,7 +655,7 @@ uint64_t helper_##op(CPUPPCState *env, uint64_t arg) = \ > float_flag_invalid) { \ > float_invalid_op_excp(env, POWERPC_EXCP_FP_VXCVI, 1); \ > } \ > - helper_float_check_status(env); \ > + float_check_status(env); \ > } \ > return farg.ll; \ > } > @@ -667,7 +680,7 @@ uint64_t helper_##op(CPUPPCState *env, uint64_t arg) = \ > } else { \ > farg.d =3D cvtr(arg, &env->fp_status); \ > } \ > - helper_float_check_status(env); \ > + float_check_status(env); \ > return farg.ll; \ > } > =20 > @@ -700,7 +713,7 @@ static inline uint64_t do_fri(CPUPPCState *env, uint6= 4_t arg, > env->fp_status.float_exception_flags &=3D ~float_flag_inexac= t; > } > } > - helper_float_check_status(env); > + float_check_status(env); > return farg.ll; > } > =20 > @@ -1856,7 +1869,7 @@ void helper_##name(CPUPPCState *env, uint32_t opcod= e) \ > } = \ > } = \ > putVSR(xT(opcode), &xt, env); = \ > - helper_float_check_status(env); = \ > + float_check_status(env); = \ > } > =20 > VSX_ADD_SUB(xsadddp, add, 1, float64, VsrD(0), 1, 0) > @@ -1912,7 +1925,7 @@ void helper_##op(CPUPPCState *env, uint32_t opcode)= \ > } = \ > = \ > putVSR(xT(opcode), &xt, env); = \ > - helper_float_check_status(env); = \ > + float_check_status(env); = \ > } > =20 > VSX_MUL(xsmuldp, 1, float64, VsrD(0), 1, 0) > @@ -1966,7 +1979,7 @@ void helper_##op(CPUPPCState *env, uint32_t opcode)= \ > } = \ > = \ > putVSR(xT(opcode), &xt, env); = \ > - helper_float_check_status(env); = \ > + float_check_status(env); = \ > } > =20 > VSX_DIV(xsdivdp, 1, float64, VsrD(0), 1, 0) > @@ -2007,7 +2020,7 @@ void helper_##op(CPUPPCState *env, uint32_t opcode)= \ > } = \ > = \ > putVSR(xT(opcode), &xt, env); = \ > - helper_float_check_status(env); = \ > + float_check_status(env); = \ > } > =20 > VSX_RE(xsredp, 1, float64, VsrD(0), 1, 0) > @@ -2056,7 +2069,7 @@ void helper_##op(CPUPPCState *env, uint32_t opcode)= \ > } = \ > = \ > putVSR(xT(opcode), &xt, env); = \ > - helper_float_check_status(env); = \ > + float_check_status(env); = \ > } > =20 > VSX_SQRT(xssqrtdp, 1, float64, VsrD(0), 1, 0) > @@ -2106,7 +2119,7 @@ void helper_##op(CPUPPCState *env, uint32_t opcode)= \ > } = \ > = \ > putVSR(xT(opcode), &xt, env); = \ > - helper_float_check_status(env); = \ > + float_check_status(env); = \ > } > =20 > VSX_RSQRTE(xsrsqrtedp, 1, float64, VsrD(0), 1, 0) > @@ -2305,7 +2318,7 @@ void helper_##op(CPUPPCState *env, uint32_t opcode)= \ > } = \ > } = \ > putVSR(xT(opcode), &xt_out, env); = \ > - helper_float_check_status(env); = \ > + float_check_status(env); = \ > } > =20 > #define MADD_FLGS 0 > @@ -2383,7 +2396,7 @@ void helper_##op(CPUPPCState *env, uint32_t opcode)= \ > env->fpscr |=3D cc << FPSCR_FPRF; = \ > env->crf[BF(opcode)] =3D cc; = \ > = \ > - helper_float_check_status(env); = \ > + float_check_status(env); = \ > } > =20 > VSX_SCALAR_CMP(xscmpodp, 1) > @@ -2415,7 +2428,7 @@ void helper_##name(CPUPPCState *env, uint32_t opcod= e) \ > } = \ > = \ > putVSR(xT(opcode), &xt, env); = \ > - helper_float_check_status(env); = \ > + float_check_status(env); = \ > } > =20 > VSX_MAX_MIN(xsmaxdp, maxnum, 1, float64, VsrD(0)) > @@ -2472,7 +2485,7 @@ void helper_##op(CPUPPCState *env, uint32_t opcode)= \ > if ((opcode >> (31-21)) & 1) { = \ > env->crf[6] =3D (all_true ? 0x8 : 0) | (all_false ? 0x2 : 0); = \ > } = \ > - helper_float_check_status(env); = \ > + float_check_status(env); = \ > } > =20 > VSX_CMP(xvcmpeqdp, 2, float64, VsrD(i), eq, 0) > @@ -2514,7 +2527,7 @@ void helper_##op(CPUPPCState *env, uint32_t opcode)= \ > } \ > \ > putVSR(xT(opcode), &xt, env); \ > - helper_float_check_status(env); \ > + float_check_status(env); \ > } > =20 > VSX_CVT_FP_TO_FP(xscvdpsp, 1, float64, float32, VsrD(0), VsrW(0), 1) > @@ -2573,7 +2586,7 @@ void helper_##op(CPUPPCState *env, uint32_t opcode)= \ > } = \ > = \ > putVSR(xT(opcode), &xt, env); = \ > - helper_float_check_status(env); = \ > + float_check_status(env); = \ > } > =20 > VSX_CVT_FP_TO_INT(xscvdpsxds, 1, float64, int64, VsrD(0), VsrD(0), \ > @@ -2624,7 +2637,7 @@ void helper_##op(CPUPPCState *env, uint32_t opcode)= \ > } \ > \ > putVSR(xT(opcode), &xt, env); \ > - helper_float_check_status(env); \ > + float_check_status(env); \ > } > =20 > VSX_CVT_INT_TO_FP(xscvsxddp, 1, int64, float64, VsrD(0), VsrD(0), 1, 0) > @@ -2688,7 +2701,7 @@ void helper_##op(CPUPPCState *env, uint32_t opcode)= \ > } \ > \ > putVSR(xT(opcode), &xt, env); \ > - helper_float_check_status(env); \ > + float_check_status(env); \ > } > =20 > VSX_ROUND(xsrdpi, 1, float64, VsrD(0), float_round_ties_away, 1) > @@ -2716,6 +2729,6 @@ uint64_t helper_xsrsp(CPUPPCState *env, uint64_t xb) > uint64_t xt =3D helper_frsp(env, xb); > =20 > helper_compute_fprf(env, xt); > - helper_float_check_status(env); > + float_check_status(env); > return xt; > } --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --dO6Thh8T/cwyDjv9 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXmBUNAAoJEGw4ysog2bOSh9sQANalSjM9WGFl/EMNxG+Gq9PA p2bU1GgWyMVRLZ+w50jEQGHYSyfAsYWYFvhTuxVd5W5Ca07ckJd6pQv7Hf+Yp0Ya RWvmDc+s2egkAglp+gZApXxK1UPbEhuAoG3b1YuHLdMHmFJT00WOvDwjTmbA9uij 6u1k3J7bwIWvZNvkIKUIj/LJygMwZmpjLDaMsnKXnGmLCcbZHjgGQen/oCaPKfdI K/zKY2clv4sx2Aj7KkGAusqRvrP0VfO3hegWLrd8xklwbTF9vyv4Sban3ZBED37i r/wMjGe+Zh7BNmc39tos+plk7UbTOS8Kj9cI1XwWqBAltihdrWJt2yH/iBnCSsZV 2jwzjKat0vLDWwMo2pE2P0HtFNvfKdsxPxxW6PkvG94d5fmfB6ZulXjVKjSygCKz 9C53LIxb033AyWmPjv5R4JAafht/hbCak4ZeregHlTtLSi+mEJX+UyglSARb9bas y96NNldZgR2L6FeJebiaZf4sZdqm8/PetFOboWrrgSxz/1wIQHmHdDdLF3OU1vqh 3lB3nOLRmVqO6R/Gb/2BCaN90Qg03C72IQdFcaxQwR3CpyMnCSnotSjVi9+mFgqW h7FwwHEitH9rbNEqhojbO8kzJuB4B7OU+I+fq8XdCoUrKQGAmickUp2T6BVvdqoH R/AQoxKTr8T8ULtw/iNu =2/9L -----END PGP SIGNATURE----- --dO6Thh8T/cwyDjv9--