From patchwork Tue Feb 19 17:40:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 221882 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 99DDB2C0079 for ; Wed, 20 Feb 2013 07:50:53 +1100 (EST) Received: from localhost ([::1]:55920 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7u9L-00016s-OR for incoming@patchwork.ozlabs.org; Tue, 19 Feb 2013 15:50:51 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44616) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7rD0-00071a-Lo for qemu-devel@nongnu.org; Tue, 19 Feb 2013 12:42:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U7rCu-0008Mb-1N for qemu-devel@nongnu.org; Tue, 19 Feb 2013 12:42:26 -0500 Received: from mail-da0-f52.google.com ([209.85.210.52]:40328) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7rCt-0008MD-Qn for qemu-devel@nongnu.org; Tue, 19 Feb 2013 12:42:19 -0500 Received: by mail-da0-f52.google.com with SMTP id f10so3072656dak.39 for ; Tue, 19 Feb 2013 09:42:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=NLq7zrj+8KLrZYd20P3wgcEaqGgrRdWILX99wyTRHt4=; b=ABHduSSQ4hbjTWGgi8dbE8wZlP7JPzas+XXWMi3gs1FI+tfns37qRlMTx7JQqcZmtf Utrff6KikJrqmWAAlC6HEExWqu0Q3GhXIx3+q1ZVK+uW0qD2woYEJjRE7Lsj0Ndrc2dG FcxgBoiWsh3nKotnoZkbF8QR2rYhVx4sjA305lTnevveec/XlE++eRawgVUaptkH/nDh GrVKNFKzO/47ZRaurE78UDQ7mqzAaUrPgwKuqNDozq5buO7zJfUNfybUm1pvfy/T/Xri XLwWm5zaZeUYMv/8ukjpxGlP02JP0HNMqIxqQ44l724Avo4/0s0LVyH/RHtT92TI7e5+ PgRQ== X-Received: by 10.68.217.164 with SMTP id oz4mr41941262pbc.73.1361295738413; Tue, 19 Feb 2013 09:42:18 -0800 (PST) Received: from anchor.twiddle.net (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPS id 1sm18659295pbg.18.2013.02.19.09.42.16 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 19 Feb 2013 09:42:17 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 19 Feb 2013 09:40:29 -0800 Message-Id: <1361295631-21316-56-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1361295631-21316-1-git-send-email-rth@twiddle.net> References: <1361295631-21316-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.52 Cc: blauwirbel@gmail.com, pbonzini@redhat.com, afaerber@suse.de, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 55/57] target-i386: Use clz/ctz for bsf/bsr helpers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org And mark the helpers as NO_RWG_SE. Signed-off-by: Richard Henderson --- target-i386/helper.h | 6 +++--- target-i386/int_helper.c | 45 +++++++++++---------------------------------- 2 files changed, 14 insertions(+), 37 deletions(-) diff --git a/target-i386/helper.h b/target-i386/helper.h index 81e0fbd..e1ecdb8 100644 --- a/target-i386/helper.h +++ b/target-i386/helper.h @@ -195,9 +195,9 @@ DEF_HELPER_3(frstor, void, env, tl, int) DEF_HELPER_3(fxsave, void, env, tl, int) DEF_HELPER_3(fxrstor, void, env, tl, int) -DEF_HELPER_1(bsf, tl, tl) -DEF_HELPER_1(bsr, tl, tl) -DEF_HELPER_2(lzcnt, tl, tl, int) +DEF_HELPER_FLAGS_1(bsf, TCG_CALL_NO_RWG_SE, tl, tl) +DEF_HELPER_FLAGS_1(bsr, TCG_CALL_NO_RWG_SE, tl, tl) +DEF_HELPER_FLAGS_2(lzcnt, TCG_CALL_NO_RWG_SE, tl, tl, int) DEF_HELPER_FLAGS_2(pdep, TCG_CALL_NO_RWG_SE, tl, tl, tl) DEF_HELPER_FLAGS_2(pext, TCG_CALL_NO_RWG_SE, tl, tl, tl) diff --git a/target-i386/int_helper.c b/target-i386/int_helper.c index 527af40..7bec4eb 100644 --- a/target-i386/int_helper.c +++ b/target-i386/int_helper.c @@ -447,53 +447,30 @@ void helper_idivq_EAX(CPUX86State *env, target_ulong t0) } #endif +#if TARGET_LONG_BITS == 32 +# define ctztl ctz32 +# define clztl clz32 +#else +# define ctztl ctz64 +# define clztl clz64 +#endif + /* bit operations */ target_ulong helper_bsf(target_ulong t0) { - int count; - target_ulong res; - - res = t0; - count = 0; - while ((res & 1) == 0) { - count++; - res >>= 1; - } - return count; + return ctztl(t0); } target_ulong helper_lzcnt(target_ulong t0, int wordsize) { - int count; - target_ulong res, mask; - - if (wordsize > 0 && t0 == 0) { - return wordsize; - } - res = t0; - count = TARGET_LONG_BITS - 1; - mask = (target_ulong)1 << (TARGET_LONG_BITS - 1); - while ((res & mask) == 0) { - count--; - res <<= 1; - } - if (wordsize > 0) { - return wordsize - 1 - count; - } - return count; + return clztl(t0) - (TARGET_LONG_BITS - wordsize); } target_ulong helper_bsr(target_ulong t0) { - return helper_lzcnt(t0, 0); + return clztl(t0) ^ (TARGET_LONG_BITS - 1); } -#if TARGET_LONG_BITS == 32 -# define ctztl ctz32 -#else -# define ctztl ctz64 -#endif - target_ulong helper_pdep(target_ulong src, target_ulong mask) { target_ulong dest = 0;