From patchwork Mon Feb 17 17:19:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 24783 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5B78E202B2 for ; Mon, 17 Feb 2014 17:21:08 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id m1sf65258732oag.5 for ; Mon, 17 Feb 2014 09:21:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=+G3APQPEG81mCU1Dw0esmFYFCLyjX5syZH/yXWjqSTc=; b=jILhd3RqqNtZZXhxHc8+Gn/k+IU3XdlMomE+Nj2XKSImBugbaKtrC5/ySY8GCf8NiA z0zMrBDB2VjGeW58+b9wVJHNdS5qC1c/HAkZ8H18uLLAbVQ5ytdCk5Eyg628j6Qskxbx R5656s4vvv78prjMCKAC1Qd87iy2CS4vLqLuaI0GxqSTNklsZpJb59U26HEYxmY8lYQ2 5SuB4UuzoY2ZVbopH+TPadmtdWN6iWqXEFGH1bzpk+0/OLC95axG19EfwsbgHO59x2fn 6NlQi9zkPCRDElP9KzcufMuZEZCdeQ4HnkrrHj6SfN7RliBrmSG1cjAttaCEcvR54Rwc Vh2A== X-Gm-Message-State: ALoCoQla6IuoZNaitgpoo9cspdBZU6srSW1fNi3pBHT9eJ58GFubFhQFqfY5/6L73fzdxGXOcxoQ X-Received: by 10.182.246.39 with SMTP id xt7mr10773998obc.40.1392657667119; Mon, 17 Feb 2014 09:21:07 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.30.8 with SMTP id c8ls1025233qgc.56.gmail; Mon, 17 Feb 2014 09:21:07 -0800 (PST) X-Received: by 10.221.37.200 with SMTP id tf8mr37724vcb.54.1392657666955; Mon, 17 Feb 2014 09:21:06 -0800 (PST) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id dq2si4611438veb.107.2014.02.17.09.21.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Feb 2014 09:21:06 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id ik5so11796139vcb.23 for ; Mon, 17 Feb 2014 09:21:06 -0800 (PST) X-Received: by 10.220.92.135 with SMTP id r7mr17773740vcm.11.1392657666865; Mon, 17 Feb 2014 09:21:06 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp154907vcz; Mon, 17 Feb 2014 09:21:06 -0800 (PST) X-Received: by 10.224.166.210 with SMTP id n18mr29240756qay.32.1392657666450; Mon, 17 Feb 2014 09:21:06 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id w44si8593849qge.71.2014.02.17.09.21.06 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 17 Feb 2014 09:21:06 -0800 (PST) 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; Received: from localhost ([::1]:42997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFRsP-0003EQ-TR for patch@linaro.org; Mon, 17 Feb 2014 12:21:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFRrB-0001oi-3C for qemu-devel@nongnu.org; Mon, 17 Feb 2014 12:19:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFRr4-0000Nm-6X for qemu-devel@nongnu.org; Mon, 17 Feb 2014 12:19:49 -0500 Received: from mail-we0-f178.google.com ([74.125.82.178]:62572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFRr3-0000NT-UK for qemu-devel@nongnu.org; Mon, 17 Feb 2014 12:19:42 -0500 Received: by mail-we0-f178.google.com with SMTP id q59so10965545wes.9 for ; Mon, 17 Feb 2014 09:19:41 -0800 (PST) X-Received: by 10.180.98.71 with SMTP id eg7mr13966442wib.31.1392657581287; Mon, 17 Feb 2014 09:19:41 -0800 (PST) Received: from localhost.localdomain (cpc6-seac21-2-0-cust453.7-2.cable.virginm.net. [82.1.113.198]) by mx.google.com with ESMTPSA id pm2sm34650978wic.0.2014.02.17.09.19.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Feb 2014 09:19:40 -0800 (PST) From: Will Newton To: qemu-devel@nongnu.org Date: Mon, 17 Feb 2014 17:19:31 +0000 Message-Id: <1392657571-10818-4-git-send-email-will.newton@linaro.org> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1392657571-10818-1-git-send-email-will.newton@linaro.org> References: <1392657571-10818-1-git-send-email-will.newton@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.178 Subject: [Qemu-devel] [PATCH 3/3] target-arm: Add support for AArch32 ARMv8 CRC32 instructions 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: will.newton@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Add support for AArch32 CRC32 and CRC32C instructions added in ARMv8. Signed-off-by: Will Newton --- target-arm/helper.c | 37 +++++++++++++++++++++++++++++++++++++ target-arm/helper.h | 3 +++ target-arm/translate.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+) diff --git a/target-arm/helper.c b/target-arm/helper.c index 5ae08c9..d773612 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -5,6 +5,8 @@ #include "sysemu/arch_init.h" #include "sysemu/sysemu.h" #include "qemu/bitops.h" +#include "qemu/crc32.h" +#include "qemu/crc32c.h" #ifndef CONFIG_USER_ONLY static inline int get_phys_addr(CPUARMState *env, uint32_t address, @@ -4468,3 +4470,38 @@ int arm_rmode_to_sf(int rmode) } return rmode; } + +static void crc_init_buffer(uint8_t *buf, uint32_t val, uint32_t bytes) +{ + memset(buf, 0, 4); + + if (bytes == 1) { + buf[0] = val & 0xff; + } else if (bytes == 2) { + buf[0] = val & 0xff; + buf[1] = (val >> 8) & 0xff; + } else { + buf[0] = val & 0xff; + buf[1] = (val >> 8) & 0xff; + buf[2] = (val >> 16) & 0xff; + buf[3] = (val >> 24) & 0xff; + } +} + +uint32_t HELPER(crc32)(uint32_t acc, uint32_t val, uint32_t bytes) +{ + uint8_t buf[4]; + + crc_init_buffer(buf, val, bytes); + + return crc32(acc, buf, bytes) ^ 0xffffffff; +} + +uint32_t HELPER(crc32c)(uint32_t acc, uint32_t val, uint32_t bytes) +{ + uint8_t buf[4]; + + crc_init_buffer(buf, val, bytes); + + return crc32c(acc, buf, bytes) ^ 0xffffffff; +} diff --git a/target-arm/helper.h b/target-arm/helper.h index 951e6ad..fb92e53 100644 --- a/target-arm/helper.h +++ b/target-arm/helper.h @@ -494,6 +494,9 @@ DEF_HELPER_3(neon_qzip32, void, env, i32, i32) DEF_HELPER_4(crypto_aese, void, env, i32, i32, i32) DEF_HELPER_4(crypto_aesmc, void, env, i32, i32, i32) +DEF_HELPER_3(crc32, i32, i32, i32, i32) +DEF_HELPER_3(crc32c, i32, i32, i32, i32) + #ifdef TARGET_AARCH64 #include "helper-a64.h" #endif diff --git a/target-arm/translate.c b/target-arm/translate.c index 782aab8..9410b6a 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -7541,6 +7541,32 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s) store_reg(s, 14, tmp2); gen_bx(s, tmp); break; + case 0x4: + { + /* crc32/crc32c */ + uint32_t c = extract32(insn, 9, 1); + + /* size == 64 is UNPREDICTABLE but handle as UNDEFINED. */ + if (op1 == 0x3) { + goto illegal_op; + } + + rn = (insn >> 16) & 0xf; + rd = (insn >> 12) & 0xf; + + tmp = load_reg(s, rn); + tmp2 = load_reg(s, rm); + tmp3 = tcg_const_i32(1 << op1); + if (c) { + gen_helper_crc32c(tmp, tmp, tmp2, tmp3); + } else { + gen_helper_crc32(tmp, tmp, tmp2, tmp3); + } + tcg_temp_free_i32(tmp2); + tcg_temp_free_i32(tmp3); + store_reg(s, rd, tmp); + break; + } case 0x5: /* saturating add/subtract */ ARCH(5TE); rd = (insn >> 12) & 0xf; @@ -9125,6 +9151,28 @@ static int disas_thumb2_insn(CPUARMState *env, DisasContext *s, uint16_t insn_hw case 0x18: /* clz */ gen_helper_clz(tmp, tmp); break; + case 0x20: + case 0x21: + case 0x22: + case 0x28: + case 0x29: + case 0x2a: + { + /* crc32/crc32c */ + uint32_t sz = op & 0x3; + uint32_t c = op & 0x8; + + tmp2 = load_reg(s, rm); + tmp3 = tcg_const_i32(1 << sz); + if (c) { + gen_helper_crc32c(tmp, tmp, tmp2, tmp3); + } else { + gen_helper_crc32(tmp, tmp, tmp2, tmp3); + } + tcg_temp_free_i32(tmp2); + tcg_temp_free_i32(tmp3); + break; + } default: goto illegal_op; }