From patchwork Thu Apr 30 18:09:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 185973 Delivered-To: patch@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp2451430ilf; Thu, 30 Apr 2020 11:26:27 -0700 (PDT) X-Google-Smtp-Source: APiQypL0uPAmAPO91qPUwkpn5n0xBj8riWl/gGSgyLd3SoFlweF4zvZOHxQI2tdWXOnLxWaaY66L X-Received: by 2002:ac8:5304:: with SMTP id t4mr5119329qtn.250.1588271186901; Thu, 30 Apr 2020 11:26:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588271186; cv=none; d=google.com; s=arc-20160816; b=N4R6KBJ5/Jfy7W+OvOiZff15jhguiwUjMCxB5o9hzgYk/QVjJKAXu0wSTOYRqbP1Ch wFo/DVw9+ud9bdC940kpqGEezcoJlMEtMwO2NCUIdfa6k/RH0hiEGC4Sw9bq4lSoD0JY 7AT4C6+f5sDJud7sD+WwRWq27X1qweW2mmiH4DunUnP0ptqMmLVwEiqInIun+ZDT2ByZ fXF5sRMf+sP5EesAHnlAdt2jPz/CEydT8kR2qzeZNyDcdr4hMT1AsgLbw8S1qBdrvCTk +NukxIesezzXrqipI17r7wdGlm8ZTg7NozzGYRFvA4OgA25v1kTQgBCeJX5fCuRYRy57 Ev5g== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=XKGUFsA+PQ5gNasR70DiFZqblEfd/NvB+SNX6wf5d6o=; b=o0OaC1S0FWXKTIJnkCN/2ODdtwIUsqFAjKX6hgkK5NxMqBXTcqXHRraTl/TkIi3SaL hPmuJUV27jhDizRMoEabUZd3FEViQSH7k9nI/N45tWUR7qXm1aSLAqwaww9iKN3yT//j DfwXZX9x9hwRQtnGZf7LjInesdt1Xr5EmawU5u5nhhbiMJPeMeNK78T3194QKVQwRwN/ G/Z0jZ5oLSOBJUEwBrG1fLGMcwNmRAmQrolJ9pVib4WyHmTD8p5lUl7Yusych9YXPRRf eN8EeeC4VgCkQHBm+yhBWWN5HZDZarx6QMed4T76EiG/i9a0Gfg00s+8gqUXjg67NJ0q rLuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="YyWb/2bP"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:470:142::17]) by mx.google.com with ESMTPS id i11si266762qtp.168.2020.04.30.11.26.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Apr 2020 11:26:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) client-ip=2001:470:142::17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="YyWb/2bP"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUDtC-0006kj-BI for patch@linaro.org; Thu, 30 Apr 2020 14:26:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36374) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUDeO-00026L-DN for qemu-devel@nongnu.org; Thu, 30 Apr 2020 14:11:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUDds-0001HA-4K for qemu-devel@nongnu.org; Thu, 30 Apr 2020 14:11:08 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:54356) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUDdr-0001GU-NC for qemu-devel@nongnu.org; Thu, 30 Apr 2020 14:10:35 -0400 Received: by mail-wm1-x341.google.com with SMTP id h4so2976991wmb.4 for ; Thu, 30 Apr 2020 11:10:35 -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 :mime-version:content-transfer-encoding; bh=XKGUFsA+PQ5gNasR70DiFZqblEfd/NvB+SNX6wf5d6o=; b=YyWb/2bPWDGE8YO/Njwu+/vFsjD2t6seWQx7FgYDIBdIqtq64fx2dp0cNc/aVEcmeo RF4JdTwJzHUHluT9zeKE+loYFNVOvGT8Qfz755nNGwKoyNKGZ4U2LDyg+RlokcGErN+Q Y+wdSQRI3RfhXLtXtTatmQ729fl8BDgBdUYpjuGN5YJtzkBo4cF2/4ie0nwzxUFQPl89 DPzn675PvJ3Jfmi6EfhSZ3P3nt5Lmy1V1A0KxEwHY8tkppPF+7eAU11wMbyZHz1+psHu eK9tS67XG+AIcIOkINZQfTKeGTDeVADi0IKfaQBux0jSjJZpYD9JtWBc8PcTddMD5LDH LYZA== 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:mime-version:content-transfer-encoding; bh=XKGUFsA+PQ5gNasR70DiFZqblEfd/NvB+SNX6wf5d6o=; b=V+ETa7xZ4f2jYwKk1Y1sy3k4A0iVzyLJvsCYeJ0dH6Nvbi3czOUn5c4qaixnRf7E6v Xxwpf4yVs5qhRT26DIMrWV+bF+Uf+UZY121mNPLc0HoN/PsxBvPH6HZF5beMqqVi4Ucb j/UR6wCNysxqC90BeMGfYEoPdsoX8Uvb4seTa26VmqDiozPIrxnJTZR97QbNP5C7H90X wMJwGhIket9u0F2rtlcw2uXuyInVD/1ojgRRVCUfwB9dVdvDWluj9zhGjDVX5bJLLGyw S5kUNLStCin42KEc8eIGMfHRlPj4WkMaOsMoyNp6+oNzlwAvvcv5RjVCh7FffGw0tMz0 S9wA== X-Gm-Message-State: AGi0PuYBJSPQQndio4joUXwZkhgeZIpM+eFfDMWjVL/dtKW+kIR8Igca FYo0OAYaAud2XPfBfzINSBpytg== X-Received: by 2002:a1c:8141:: with SMTP id c62mr4307463wmd.87.1588270234537; Thu, 30 Apr 2020 11:10:34 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id t8sm652421wrq.88.2020.04.30.11.10.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2020 11:10:33 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 22/36] target/arm: Move gen_ function typedefs to translate.h Date: Thu, 30 Apr 2020 19:09:49 +0100 Message-Id: <20200430181003.21682-23-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430181003.21682-1-peter.maydell@linaro.org> References: <20200430181003.21682-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: Error: [-] PROGRAM ABORT : Malformed IPv6 address (bad octet value). Location : parse_addr6(), p0f-client.c:67 X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We're going to want at least some of the NeonGen* typedefs for the refactored 32-bit Neon decoder, so move them all to translate.h since it makes more sense to keep them in one group. Signed-off-by: Peter Maydell --- target/arm/translate.h | 17 +++++++++++++++++ target/arm/translate-a64.c | 17 ----------------- 2 files changed, 17 insertions(+), 17 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/target/arm/translate.h b/target/arm/translate.h index 95b43e7ab65..cb7925ea461 100644 --- a/target/arm/translate.h +++ b/target/arm/translate.h @@ -314,4 +314,21 @@ typedef void GVecGen3Fn(unsigned, uint32_t, uint32_t, typedef void GVecGen4Fn(unsigned, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t); +/* Function prototype for gen_ functions for calling Neon helpers */ +typedef void NeonGenOneOpEnvFn(TCGv_i32, TCGv_ptr, TCGv_i32); +typedef void NeonGenTwoOpFn(TCGv_i32, TCGv_i32, TCGv_i32); +typedef void NeonGenTwoOpEnvFn(TCGv_i32, TCGv_ptr, TCGv_i32, TCGv_i32); +typedef void NeonGenTwo64OpFn(TCGv_i64, TCGv_i64, TCGv_i64); +typedef void NeonGenTwo64OpEnvFn(TCGv_i64, TCGv_ptr, TCGv_i64, TCGv_i64); +typedef void NeonGenNarrowFn(TCGv_i32, TCGv_i64); +typedef void NeonGenNarrowEnvFn(TCGv_i32, TCGv_ptr, TCGv_i64); +typedef void NeonGenWidenFn(TCGv_i64, TCGv_i32); +typedef void NeonGenTwoSingleOPFn(TCGv_i32, TCGv_i32, TCGv_i32, TCGv_ptr); +typedef void NeonGenTwoDoubleOPFn(TCGv_i64, TCGv_i64, TCGv_i64, TCGv_ptr); +typedef void NeonGenOneOpFn(TCGv_i64, TCGv_i64); +typedef void CryptoTwoOpFn(TCGv_ptr, TCGv_ptr); +typedef void CryptoThreeOpIntFn(TCGv_ptr, TCGv_ptr, TCGv_i32); +typedef void CryptoThreeOpFn(TCGv_ptr, TCGv_ptr, TCGv_ptr); +typedef void AtomicThreeOpFn(TCGv_i64, TCGv_i64, TCGv_i64, TCGArg, MemOp); + #endif /* TARGET_ARM_TRANSLATE_H */ diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index efb1c4adc4e..a896f9c4b83 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -70,23 +70,6 @@ typedef struct AArch64DecodeTable { AArch64DecodeFn *disas_fn; } AArch64DecodeTable; -/* Function prototype for gen_ functions for calling Neon helpers */ -typedef void NeonGenOneOpEnvFn(TCGv_i32, TCGv_ptr, TCGv_i32); -typedef void NeonGenTwoOpFn(TCGv_i32, TCGv_i32, TCGv_i32); -typedef void NeonGenTwoOpEnvFn(TCGv_i32, TCGv_ptr, TCGv_i32, TCGv_i32); -typedef void NeonGenTwo64OpFn(TCGv_i64, TCGv_i64, TCGv_i64); -typedef void NeonGenTwo64OpEnvFn(TCGv_i64, TCGv_ptr, TCGv_i64, TCGv_i64); -typedef void NeonGenNarrowFn(TCGv_i32, TCGv_i64); -typedef void NeonGenNarrowEnvFn(TCGv_i32, TCGv_ptr, TCGv_i64); -typedef void NeonGenWidenFn(TCGv_i64, TCGv_i32); -typedef void NeonGenTwoSingleOPFn(TCGv_i32, TCGv_i32, TCGv_i32, TCGv_ptr); -typedef void NeonGenTwoDoubleOPFn(TCGv_i64, TCGv_i64, TCGv_i64, TCGv_ptr); -typedef void NeonGenOneOpFn(TCGv_i64, TCGv_i64); -typedef void CryptoTwoOpFn(TCGv_ptr, TCGv_ptr); -typedef void CryptoThreeOpIntFn(TCGv_ptr, TCGv_ptr, TCGv_i32); -typedef void CryptoThreeOpFn(TCGv_ptr, TCGv_ptr, TCGv_ptr); -typedef void AtomicThreeOpFn(TCGv_i64, TCGv_i64, TCGv_i64, TCGArg, MemOp); - /* initialize TCG globals. */ void a64_translate_init(void) {