From patchwork Fri May 4 05:40:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 134933 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp425210lji; Thu, 3 May 2018 22:45:48 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqhQnXm9Cddsmih8sHGkEVSz8zIqLg3Byt/wD5CTIOHy+w3LjFTZTQPw7Sq4UXJrhQ/l1n3 X-Received: by 2002:aed:26a4:: with SMTP id q33-v6mr21628190qtd.165.1525412748579; Thu, 03 May 2018 22:45:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525412748; cv=none; d=google.com; s=arc-20160816; b=cBlr4SjuE+9c1VZAw9vGVSDQedBBCOblzZWONpXq2aqVZB+biB97iBEDWUzi/SvGnD m9MlIvLeqKFsczzGc4/VadMTry/A6bsU+PIL95ek1HJCRUErfIY5I483OApY8IXbzrHB GHXsm8jeQwWGXRVs9Ec3CdjVdcj3tcdHXIMfpQHZQvStJl4rrMCsDhckW694MaFza9Le zK5R0nDVgHbUVhhb8nVMprp7mgBZM5Uwh+RRrwnxNvyJl9Hdfr68JEl3xPF8svCmR7jP wtGWmZjiMRVEtt3sbQQW9LasF6A9WwbrJFab9f1sJIwNXxTvsFKzNu67naJAwGP2akRz khQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=YKvQz9BaApc0amBUsiLqlOb7hC1MWlAgisjh1brAe/w=; b=jiGBVfKyospNQwwwJQY3ttgUfiRqn8OoPQwpX4j0O0jP3Lp5A55QPE2rRzNZAf/cFy 9+jxoydOJtF1OTtMVQDh9Sif9TcYdUJ5yR0eMVe4YrvrA5FgS2ra8Rgi6zhEqdLjizry uJMidmiA8ojcVXWuX/ENHKL0pFK/b+AMzE8FUTU7rqPZEr+S9PFWhKtavnqXyGq07lja ukoldTwfpyHwjt3yQWf+Fq12tm/4XcPUrBsMx4Wm1WmN52kG2qJQmY/rdjbZECiTdcs0 SaS9WXXGiHU1IA0YlI/j2DQxnRaASviQ2BSNdP6aR0Urv3qnLN4KW4KeOcx3E5iRh7/h 8R+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hAUGMe3q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id q28-v6si2388934qvf.284.2018.05.03.22.45.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 03 May 2018 22:45:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hAUGMe3q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60570 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fETXP-0004Gf-U0 for patch@linaro.org; Fri, 04 May 2018 01:45:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fETSY-0008Vo-Jj for qemu-devel@nongnu.org; Fri, 04 May 2018 01:40:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fETSW-0004oy-No for qemu-devel@nongnu.org; Fri, 04 May 2018 01:40:46 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:45914) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fETSW-0004oO-I0 for qemu-devel@nongnu.org; Fri, 04 May 2018 01:40:44 -0400 Received: by mail-pf0-x241.google.com with SMTP id c10so16563606pfi.12 for ; Thu, 03 May 2018 22:40:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YKvQz9BaApc0amBUsiLqlOb7hC1MWlAgisjh1brAe/w=; b=hAUGMe3q9D8NEtLsIgD1MgZuTkgv1UcOQTJzfWxPX3VUJ1KJBEzDI10VsvLyyrF6O5 G15vw4nOUn54cVe0wymz0MOhnoGpr3Pc5hPBqQIl7rzO8C4mDlnknnnF6mFADw31p2oA T7zLjz2SgU6v37zsU6l3/SU1FNdSxBsxCGRKI= 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=YKvQz9BaApc0amBUsiLqlOb7hC1MWlAgisjh1brAe/w=; b=sahvW7aeWWWuwkhVOtKKtvtDmQ6+IlLyM7WdCjiDYt1Nyw2dyVvBtrbdBVaPAvB8R4 x8u+e6lfjLUAaS74ARasM2CmvjoO2y8DhFv3X+6xLT71n5REpJd+i8OxflNVvwmpe/uG zmeVqaT8Un3OENDSVEimrHD+DMcvOb2WGNUcyGIr+i/QQeEzhyGqjTzmOmWI79RHsIHb BFx7j4g4xNB+/Caf2jqSA+EtWHI8kZctJ1m5ib62LH9f1V+ICDEZcN/ric/P8CAcYmHV p3jET+4BRMXGuLPgb7kaco76B/g2DQxgMEe4lmgkOMXc4C5z6pV0BomIt0pYHBbPzbex nDUw== X-Gm-Message-State: ALQs6tAr7eUxiLdIuoQQiEGs4NZo1X+lT+Ta5If2/Xp5DsxFhfn250Ee WnNmQut4gncy2nEHCNHhMmFArr0wDEg= X-Received: by 2002:a17:902:bd46:: with SMTP id b6-v6mr26658208plx.170.1525412443290; Thu, 03 May 2018 22:40:43 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-2-170.tukw.qwest.net. [97.113.2.170]) by smtp.gmail.com with ESMTPSA id t23-v6sm26550809pgu.41.2018.05.03.22.40.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 May 2018 22:40:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 3 May 2018 22:40:25 -0700 Message-Id: <20180504054030.24527-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180504054030.24527-1-richard.henderson@linaro.org> References: <20180504054030.24527-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PATCH 08/13] target/openrisc: Convert dec_logic 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: Stafford Horne Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/openrisc/translate.c | 62 +++++++++++++++++++------------------------- target/openrisc/insns.decode | 6 +++++ 2 files changed, 32 insertions(+), 36 deletions(-) -- 2.14.3 Acked-by: Stafford Horne diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 8ca01e1a33..f2f9a0c0d2 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -999,42 +999,36 @@ static bool trans_l_msbu(DisasContext *dc, arg_ab *a, uint32_t insn) return true; } -static void dec_logic(DisasContext *dc, uint32_t insn) +static bool trans_l_slli(DisasContext *dc, arg_dal *a, uint32_t insn) { - uint32_t op0; - uint32_t rd, ra, L6, S6; - op0 = extract32(insn, 6, 2); - rd = extract32(insn, 21, 5); - ra = extract32(insn, 16, 5); - L6 = extract32(insn, 0, 6); - S6 = L6 & (TARGET_LONG_BITS - 1); + LOG_DIS("l.slli r%d, r%d, %d\n", a->d, a->a, a->l); + check_r0_write(a->d); + tcg_gen_shli_tl(cpu_R[a->d], cpu_R[a->a], a->l & (TARGET_LONG_BITS - 1)); + return true; +} - check_r0_write(rd); - switch (op0) { - case 0x00: /* l.slli */ - LOG_DIS("l.slli r%d, r%d, %d\n", rd, ra, L6); - tcg_gen_shli_tl(cpu_R[rd], cpu_R[ra], S6); - break; +static bool trans_l_srli(DisasContext *dc, arg_dal *a, uint32_t insn) +{ + LOG_DIS("l.srli r%d, r%d, %d\n", a->d, a->a, a->l); + check_r0_write(a->d); + tcg_gen_shri_tl(cpu_R[a->d], cpu_R[a->a], a->l & (TARGET_LONG_BITS - 1)); + return true; +} - case 0x01: /* l.srli */ - LOG_DIS("l.srli r%d, r%d, %d\n", rd, ra, L6); - tcg_gen_shri_tl(cpu_R[rd], cpu_R[ra], S6); - break; +static bool trans_l_srai(DisasContext *dc, arg_dal *a, uint32_t insn) +{ + LOG_DIS("l.srai r%d, r%d, %d\n", a->d, a->a, a->l); + check_r0_write(a->d); + tcg_gen_sari_tl(cpu_R[a->d], cpu_R[a->a], a->l & (TARGET_LONG_BITS - 1)); + return true; +} - case 0x02: /* l.srai */ - LOG_DIS("l.srai r%d, r%d, %d\n", rd, ra, L6); - tcg_gen_sari_tl(cpu_R[rd], cpu_R[ra], S6); - break; - - case 0x03: /* l.rori */ - LOG_DIS("l.rori r%d, r%d, %d\n", rd, ra, L6); - tcg_gen_rotri_tl(cpu_R[rd], cpu_R[ra], S6); - break; - - default: - gen_illegal_exception(dc); - break; - } +static bool trans_l_rori(DisasContext *dc, arg_dal *a, uint32_t insn) +{ + LOG_DIS("l.rori r%d, r%d, %d\n", a->d, a->a, a->l); + check_r0_write(a->d); + tcg_gen_rotri_tl(cpu_R[a->d], cpu_R[a->a], a->l & (TARGET_LONG_BITS - 1)); + return true; } static void dec_M(DisasContext *dc, uint32_t insn) @@ -1491,10 +1485,6 @@ static void disas_openrisc_insn(DisasContext *dc, OpenRISCCPU *cpu) dec_M(dc, insn); break; - case 0x2e: - dec_logic(dc, insn); - break; - case 0x2f: dec_compi(dc, insn); break; diff --git a/target/openrisc/insns.decode b/target/openrisc/insns.decode index 7240c6fb77..fb8ba5812a 100644 --- a/target/openrisc/insns.decode +++ b/target/openrisc/insns.decode @@ -20,6 +20,7 @@ &dab d a b &da d a &ab a b +&dal d a l #### # System Instructions @@ -130,3 +131,8 @@ l_mac 110001 ----- a:5 b:5 ------- 0001 l_macu 110001 ----- a:5 b:5 ------- 0011 l_msb 110001 ----- a:5 b:5 ------- 0010 l_msbu 110001 ----- a:5 b:5 ------- 0100 + +l_slli 101110 d:5 a:5 -------- 00 l:6 +l_srli 101110 d:5 a:5 -------- 01 l:6 +l_srai 101110 d:5 a:5 -------- 10 l:6 +l_rori 101110 d:5 a:5 -------- 11 l:6