From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgVMP-0000S5-VM for qemu-devel@nongnu.org; Wed, 22 Feb 2017 06:45:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgVMO-0003fh-UZ for qemu-devel@nongnu.org; Wed, 22 Feb 2017 06:45:29 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:37714 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cgVMO-0003fH-Ne for qemu-devel@nongnu.org; Wed, 22 Feb 2017 06:45:28 -0500 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v1MBiFel079270 for ; Wed, 22 Feb 2017 06:45:28 -0500 Received: from e28smtp05.in.ibm.com (e28smtp05.in.ibm.com [125.16.236.5]) by mx0b-001b2d01.pphosted.com with ESMTP id 28s9r3ruxw-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 22 Feb 2017 06:45:27 -0500 Received: from localhost by e28smtp05.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 22 Feb 2017 17:15:23 +0530 From: Nikunj A Dadhania Date: Wed, 22 Feb 2017 17:14:42 +0530 In-Reply-To: <1487763883-4877-1-git-send-email-nikunj@linux.vnet.ibm.com> References: <1487763883-4877-1-git-send-email-nikunj@linux.vnet.ibm.com> Message-Id: <1487763883-4877-10-git-send-email-nikunj@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v3 09/10] target/ppc: add ov32 flag in divide operations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au, rth@twiddle.net Cc: qemu-devel@nongnu.org, bharata@linux.vnet.ibm.com, nikunj@linux.vnet.ibm.com Add helper_div_compute_ov() in the int_helper for updating the overflow flags. For Divide Word: SO, OV, and OV32 bits reflects overflow of the 32-bit result For Divide DoubleWord: SO, OV, and OV32 bits reflects overflow of the 64-bit result Signed-off-by: Nikunj A Dadhania Reviewed-by: Richard Henderson --- target/ppc/int_helper.c | 53 +++++++++++++++++++------------------------------ target/ppc/translate.c | 10 ++++++++-- 2 files changed, 28 insertions(+), 35 deletions(-) diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c index dd0a892..1cad62f 100644 --- a/target/ppc/int_helper.c +++ b/target/ppc/int_helper.c @@ -28,6 +28,22 @@ /*****************************************************************************/ /* Fixed point operations helpers */ +static inline void helper_div_compute_ov(CPUPPCState *env, uint32_t oe, + int overflow) +{ + if (oe) { + if (unlikely(overflow)) { + env->so = env->ov = 1; + } else { + env->ov = 0; + } + + if (is_isa300(env)) { + env->ov32 = env->ov; + } + } +} + target_ulong helper_divweu(CPUPPCState *env, target_ulong ra, target_ulong rb, uint32_t oe) { @@ -48,14 +64,7 @@ target_ulong helper_divweu(CPUPPCState *env, target_ulong ra, target_ulong rb, rt = 0; /* Undefined */ } - if (oe) { - if (unlikely(overflow)) { - env->so = env->ov = 1; - } else { - env->ov = 0; - } - } - + helper_div_compute_ov(env, oe, overflow); return (target_ulong)rt; } @@ -80,14 +89,7 @@ target_ulong helper_divwe(CPUPPCState *env, target_ulong ra, target_ulong rb, rt = 0; /* Undefined */ } - if (oe) { - if (unlikely(overflow)) { - env->so = env->ov = 1; - } else { - env->ov = 0; - } - } - + helper_div_compute_ov(env, oe, overflow); return (target_ulong)rt; } @@ -104,14 +106,7 @@ uint64_t helper_divdeu(CPUPPCState *env, uint64_t ra, uint64_t rb, uint32_t oe) rt = 0; /* Undefined */ } - if (oe) { - if (unlikely(overflow)) { - env->so = env->ov = 1; - } else { - env->ov = 0; - } - } - + helper_div_compute_ov(env, oe, overflow); return rt; } @@ -126,15 +121,7 @@ uint64_t helper_divde(CPUPPCState *env, uint64_t rau, uint64_t rbu, uint32_t oe) rt = 0; /* Undefined */ } - if (oe) { - - if (unlikely(overflow)) { - env->so = env->ov = 1; - } else { - env->ov = 0; - } - } - + helper_div_compute_ov(env, oe, overflow); return rt; } diff --git a/target/ppc/translate.c b/target/ppc/translate.c index ba3387e..99dfcf7 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -1024,6 +1024,9 @@ static inline void gen_op_arith_divw(DisasContext *ctx, TCGv ret, TCGv arg1, } if (compute_ov) { tcg_gen_extu_i32_tl(cpu_ov, t2); + if (is_isa300(ctx)) { + tcg_gen_extu_i32_tl(cpu_ov32, t2); + } tcg_gen_or_tl(cpu_so, cpu_so, cpu_ov); } tcg_temp_free_i32(t0); @@ -1095,6 +1098,9 @@ static inline void gen_op_arith_divd(DisasContext *ctx, TCGv ret, TCGv arg1, } if (compute_ov) { tcg_gen_mov_tl(cpu_ov, t2); + if (is_isa300(ctx)) { + tcg_gen_mov_tl(cpu_ov32, t2); + } tcg_gen_or_tl(cpu_so, cpu_so, cpu_ov); } tcg_temp_free_i64(t0); @@ -1113,10 +1119,10 @@ static void glue(gen_, name)(DisasContext *ctx) cpu_gpr[rA(ctx->opcode)], cpu_gpr[rB(ctx->opcode)], \ sign, compute_ov); \ } -/* divwu divwu. divwuo divwuo. */ +/* divdu divdu. divduo divduo. */ GEN_INT_ARITH_DIVD(divdu, 0x0E, 0, 0); GEN_INT_ARITH_DIVD(divduo, 0x1E, 0, 1); -/* divw divw. divwo divwo. */ +/* divd divd. divdo divdo. */ GEN_INT_ARITH_DIVD(divd, 0x0F, 1, 0); GEN_INT_ARITH_DIVD(divdo, 0x1F, 1, 1); -- 2.7.4