From patchwork Thu Feb 19 21:14:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 441757 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F9C5140140 for ; Fri, 20 Feb 2015 08:19:55 +1100 (AEDT) Received: from localhost ([::1]:58125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOYVl-0000kx-7v for incoming@patchwork.ozlabs.org; Thu, 19 Feb 2015 16:19:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOYRL-0000db-KU for qemu-devel@nongnu.org; Thu, 19 Feb 2015 16:15:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YOYRF-0007LJ-KW for qemu-devel@nongnu.org; Thu, 19 Feb 2015 16:15:19 -0500 Received: from mail-qg0-x22d.google.com ([2607:f8b0:400d:c04::22d]:43277) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOYRF-0007LE-Fr for qemu-devel@nongnu.org; Thu, 19 Feb 2015 16:15:13 -0500 Received: by mail-qg0-f45.google.com with SMTP id h3so9684783qgf.4 for ; Thu, 19 Feb 2015 13:15:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=DoRtFrr95dbCfi/R91jv0ujCQED+cUMyuBl+b6gifAo=; b=o5TYdpKDuebCkJcAop8ewTR0N6WXfGcC+Ex54RBKj0ibMrFnuHONW08nzwocXsHJSt viMQpXr49dmRiiq7KRviMXkCINMgE5cY2y/aZpikOf70aHj0kzGJwh4Iz+5t3O7LIBqw ZH0hfbmowClP1+Skcef20cEXIxWQzaZWivrXJYm4g/38T9tV7thcXx98BIyf8X4itOyJ og2ari8aCGdqUIYStGdqSCXQEHaVNAlRW01fPegHklLjNdHVa3jARxZiBrUi0q7qITNj sf1vS1B+XK+9nA1yqCvkDgmflvYk0DZTc9ixjqxKleKbOx06ItqwJZZtQqWpFq9GLYei AA0g== X-Received: by 10.140.236.211 with SMTP id h202mr16787884qhc.88.1424380513236; Thu, 19 Feb 2015 13:15:13 -0800 (PST) Received: from anchor.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id i185sm10474745qhc.49.2015.02.19.13.15.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Feb 2015 13:15:12 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 19 Feb 2015 13:14:25 -0800 Message-Id: <1424380469-20138-8-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1424380469-20138-1-git-send-email-rth@twiddle.net> References: <1424380469-20138-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::22d Cc: peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH 07/11] target-arm: Recognize ROR 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 Signed-off-by: Richard Henderson --- target-arm/translate-a64.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index ed97ed6..d139b2d 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -3136,17 +3136,7 @@ static void disas_extract(DisasContext *s, uint32_t insn) tcg_rd = cpu_reg(s, rd); - if (imm) { - /* OPTME: we can special case rm==rn as a rotate */ - tcg_rm = read_cpu_reg(s, rm, sf); - tcg_rn = read_cpu_reg(s, rn, sf); - tcg_gen_shri_i64(tcg_rm, tcg_rm, imm); - tcg_gen_shli_i64(tcg_rn, tcg_rn, bitsize - imm); - tcg_gen_or_i64(tcg_rd, tcg_rm, tcg_rn); - if (!sf) { - tcg_gen_ext32u_i64(tcg_rd, tcg_rd); - } - } else { + if (unlikely(imm == 0)) { /* tcg shl_i32/shl_i64 is undefined for 32/64 bit shifts, * so an extract from bit 0 is a special case. */ @@ -3155,8 +3145,27 @@ static void disas_extract(DisasContext *s, uint32_t insn) } else { tcg_gen_ext32u_i64(tcg_rd, cpu_reg(s, rm)); } + } else if (rm == rn) { /* ROR */ + tcg_rm = cpu_reg(s, rm); + if (sf) { + tcg_gen_rotri_i64(tcg_rd, tcg_rm, imm); + } else { + TCGv_i32 tmp = tcg_temp_new_i32(); + tcg_gen_trunc_i64_i32(tmp, tcg_rm); + tcg_gen_rotri_i32(tmp, tmp, imm); + tcg_gen_extu_i32_i64(tcg_rd, tmp); + tcg_temp_free_i32(tmp); + } + } else { + tcg_rm = read_cpu_reg(s, rm, sf); + tcg_rn = read_cpu_reg(s, rn, sf); + tcg_gen_shri_i64(tcg_rm, tcg_rm, imm); + tcg_gen_shli_i64(tcg_rn, tcg_rn, bitsize - imm); + tcg_gen_or_i64(tcg_rd, tcg_rm, tcg_rn); + if (!sf) { + tcg_gen_ext32u_i64(tcg_rd, tcg_rd); + } } - } }