From patchwork Thu Feb 23 19:56:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nikunj A. Dadhania" X-Patchwork-Id: 9588927 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 730D160578 for ; Thu, 23 Feb 2017 20:04:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 621EC28911 for ; Thu, 23 Feb 2017 20:04:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 557192891B; Thu, 23 Feb 2017 20:04:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 459B02891A for ; Thu, 23 Feb 2017 20:04:21 +0000 (UTC) Received: from localhost ([::1]:60732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgzci-0003zP-9s for patchwork-qemu-devel@patchwork.kernel.org; Thu, 23 Feb 2017 15:04:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgzVk-0005JT-1Q for qemu-devel@nongnu.org; Thu, 23 Feb 2017 14:57:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgzVh-0001jl-BC for qemu-devel@nongnu.org; Thu, 23 Feb 2017 14:57:08 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:56900) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cgzVh-0001jC-2u for qemu-devel@nongnu.org; Thu, 23 Feb 2017 14:57:05 -0500 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v1NJrbcY051262 for ; Thu, 23 Feb 2017 14:57:04 -0500 Received: from e28smtp02.in.ibm.com (e28smtp02.in.ibm.com [125.16.236.2]) by mx0a-001b2d01.pphosted.com with ESMTP id 28t61r0t18-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 23 Feb 2017 14:57:03 -0500 Received: from localhost by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 24 Feb 2017 01:26:59 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp02.in.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 24 Feb 2017 01:26:56 +0530 Received: from d28relay06.in.ibm.com (d28relay06.in.ibm.com [9.184.220.150]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 4E706E0024; Fri, 24 Feb 2017 01:28:36 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay06.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v1NJuuEb10616916; Fri, 24 Feb 2017 01:26:56 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v1NJuttN024611; Fri, 24 Feb 2017 01:26:56 +0530 Received: from abhimanyu.in.ibm.com ([9.102.3.191]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v1NJurVK024530; Fri, 24 Feb 2017 01:26:54 +0530 From: Nikunj A Dadhania To: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au, rth@twiddle.net Date: Fri, 24 Feb 2017 01:26:28 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487879800-12352-1-git-send-email-nikunj@linux.vnet.ibm.com> References: <1487879800-12352-1-git-send-email-nikunj@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17022319-0004-0000-0000-00000542B845 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17022319-0005-0000-0000-0000133CC04F Message-Id: <1487879800-12352-4-git-send-email-nikunj@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-02-23_13:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1702230177 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH v4 03/15] target/ppc: introduce helper_update_ca_legacy X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, nikunj@linux.vnet.ibm.com, bharata@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Update the environment carry variable in the helper. Signed-off-by: Nikunj A Dadhania --- target/ppc/int_helper.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c index b376860..d7af671 100644 --- a/target/ppc/int_helper.c +++ b/target/ppc/int_helper.c @@ -37,6 +37,11 @@ static inline void helper_update_ov_legacy(CPUPPCState *env, int ov) } } +static inline void helper_update_ca(CPUPPCState *env, int ca) +{ + env->ca = ca; +} + target_ulong helper_divweu(CPUPPCState *env, target_ulong ra, target_ulong rb, uint32_t oe) { @@ -213,24 +218,26 @@ target_ulong helper_sraw(CPUPPCState *env, target_ulong value, target_ulong shift) { int32_t ret; + int ca; if (likely(!(shift & 0x20))) { if (likely((uint32_t)shift != 0)) { shift &= 0x1f; ret = (int32_t)value >> shift; if (likely(ret >= 0 || (value & ((1 << shift) - 1)) == 0)) { - env->ca = 0; + ca = 0; } else { - env->ca = 1; + ca = 1; } } else { ret = (int32_t)value; - env->ca = 0; + ca = 0; } } else { ret = (int32_t)value >> 31; - env->ca = (ret != 0); + ca = (ret != 0); } + helper_update_ca(env, ca); return (target_long)ret; } @@ -239,24 +246,26 @@ target_ulong helper_srad(CPUPPCState *env, target_ulong value, target_ulong shift) { int64_t ret; + int ca; if (likely(!(shift & 0x40))) { if (likely((uint64_t)shift != 0)) { shift &= 0x3f; ret = (int64_t)value >> shift; if (likely(ret >= 0 || (value & ((1ULL << shift) - 1)) == 0)) { - env->ca = 0; + ca = 0; } else { - env->ca = 1; + ca = 1; } } else { ret = (int64_t)value; - env->ca = 0; + ca = 0; } } else { ret = (int64_t)value >> 63; - env->ca = (ret != 0); + ca = (ret != 0); } + helper_update_ca(env, ca); return ret; } #endif