From patchwork Tue Jul 4 09:54:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 9824473 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 F38C160237 for ; Tue, 4 Jul 2017 10:02:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E142328294 for ; Tue, 4 Jul 2017 10:02:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5D6528497; Tue, 4 Jul 2017 10:02:35 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 5BFC728294 for ; Tue, 4 Jul 2017 10:02:35 +0000 (UTC) Received: from localhost ([::1]:40048 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSKfC-0008Ho-HZ for patchwork-qemu-devel@patchwork.kernel.org; Tue, 04 Jul 2017 06:02:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSKY3-0002JV-Ar for qemu-devel@nongnu.org; Tue, 04 Jul 2017 05:55:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSKY2-0000gu-In for qemu-devel@nongnu.org; Tue, 04 Jul 2017 05:55:11 -0400 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:33153) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSKY2-0000g9-BJ for qemu-devel@nongnu.org; Tue, 04 Jul 2017 05:55:10 -0400 Received: by mail-lf0-x243.google.com with SMTP id t72so17251327lff.0 for ; Tue, 04 Jul 2017 02:55:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3NLzeipQ5BH4jA/WwfsqH7uS7CoDn8xtRrqi1tbMW4o=; b=qWmlrH/ZVipRHaGx00ZRa4+lDWia76hKw8z5Wwm0tHo8PklyVcAp8HAnqsFQ4p/LQQ EqNY3NVko1KEJyTaQK52E9ENqgF2H2OtCsUH3cwP4nEgtKlFk7GsWlbyxS4gkzqyYzcK 8X8lQT7oT4slr0FxMyXIKwllsFQh1d8G+Voa2xVk+aSW/lVbpMcxXtXjxasj6N/AT6u+ nhD8i56pB7rjFNGClOym4wwPxQUjqrFlKVYywltq5IilHhsivKdjEDyrerooNbnAXw/z tuQN+l7qyVDDe8n3LnYoW5jQeLnTr1S4BZTW2nh7LMn+gOFBbhYap7kH18mEg+MJdiEO Dadg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3NLzeipQ5BH4jA/WwfsqH7uS7CoDn8xtRrqi1tbMW4o=; b=nujSjs5k+9oCik6WGVelmr4+TdKR4tlW1wqKJ9exoNYUmIJyQVkGKMZV9AkcG7tueT QUNlKGwvYjMXTyEA8B71ds/ZF/rJL3M0nDMQeAXEjtjfOoDWml4FF6JdR1eW8UVIkjID NNv3adkwsSUHQ8pzs2ZvQElYxui/CTgjy66UxM8yNbxRwUvDu8Q3fthSvlFUi58SSglh DdWjVxNK+wrGgq5vqhpHifZbg3dqE2nnUCigP4h09EMGg/2zCbq4HPAJnPauarM6yFsa 0dD066gxy+kPDpKX3KcWJceGark5r9mgMstr6vnNoAc9UOTntesUJm5wys164sNnHMmi VBkQ== X-Gm-Message-State: AKS2vOz2TLp41AWbt6wzLx4Yqj/OXO172USuwM5M30SbgUkHgpAFl3DL AaV2Pp+TfhCjrQ4o X-Received: by 10.46.32.16 with SMTP id g16mr10703237ljg.125.1499162108792; Tue, 04 Jul 2017 02:55:08 -0700 (PDT) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id b123sm4832335lfb.22.2017.07.04.02.55.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jul 2017 02:55:08 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 4 Jul 2017 11:54:45 +0200 Message-Id: <1499162088-1562-15-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499162088-1562-1-git-send-email-edgar.iglesias@gmail.com> References: <1499162088-1562-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::243 Subject: [Qemu-devel] [PULL v1 14/17] target-microblaze: dec_barrel: Add BSEFI 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: sai.pavan.boddu@xilinx.com, edgar.iglesias@xilinx.com, alistai@xilinx.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Edgar E. Iglesias" Add support for BSEFI. Signed-off-by: Edgar E. Iglesias --- target/microblaze/translate.c | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 6ee4885..3fad13c 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -660,7 +660,8 @@ static void dec_div(DisasContext *dc) static void dec_barrel(DisasContext *dc) { TCGv t0; - bool s, t; + unsigned int imm_w, imm_s; + bool s, t, e = false; if ((dc->tb_flags & MSR_EE_FLAG) && (dc->cpu->env.pvr.regs[2] & PVR2_ILL_OPCODE_EXC_MASK) @@ -670,27 +671,44 @@ static void dec_barrel(DisasContext *dc) return; } + if (dc->type_b) { + /* Insert and extract are only available in immediate mode. */ + e = extract32(dc->imm, 14, 1); + } s = extract32(dc->imm, 10, 1); t = extract32(dc->imm, 9, 1); + imm_w = extract32(dc->imm, 6, 5); + imm_s = extract32(dc->imm, 0, 5); - LOG_DIS("bs%s%s r%d r%d r%d\n", + LOG_DIS("bs%s%s%s r%d r%d r%d\n", + e ? "e" : "", s ? "l" : "r", t ? "a" : "l", dc->rd, dc->ra, dc->rb); - t0 = tcg_temp_new(); + if (e) { + if (imm_w + imm_s > 32 || imm_w == 0) { + /* These inputs have an undefined behavior. */ + qemu_log_mask(LOG_GUEST_ERROR, "bsefi: Bad input w=%d s=%d\n", + imm_w, imm_s); + } else { + tcg_gen_extract_i32(cpu_R[dc->rd], cpu_R[dc->ra], imm_s, imm_w); + } + } else { + t0 = tcg_temp_new(); - tcg_gen_mov_tl(t0, *(dec_alu_op_b(dc))); - tcg_gen_andi_tl(t0, t0, 31); + tcg_gen_mov_tl(t0, *(dec_alu_op_b(dc))); + tcg_gen_andi_tl(t0, t0, 31); - if (s) { - tcg_gen_shl_tl(cpu_R[dc->rd], cpu_R[dc->ra], t0); - } else { - if (t) { - tcg_gen_sar_tl(cpu_R[dc->rd], cpu_R[dc->ra], t0); + if (s) { + tcg_gen_shl_tl(cpu_R[dc->rd], cpu_R[dc->ra], t0); } else { - tcg_gen_shr_tl(cpu_R[dc->rd], cpu_R[dc->ra], t0); + if (t) { + tcg_gen_sar_tl(cpu_R[dc->rd], cpu_R[dc->ra], t0); + } else { + tcg_gen_shr_tl(cpu_R[dc->rd], cpu_R[dc->ra], t0); + } } + tcg_temp_free(t0); } - tcg_temp_free(t0); } static void dec_bit(DisasContext *dc)