From patchwork Wed Aug 12 17:19:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 247637 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp550467ilo; Wed, 12 Aug 2020 10:20:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwlrLxIuk75TH64G5vyRq2rkptTvL9brC/gwFYRmrPe28omSUWRuFGohRyMhamdvHK4JzRI X-Received: by 2002:a5b:58f:: with SMTP id l15mr523206ybp.215.1597252831046; Wed, 12 Aug 2020 10:20:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597252831; cv=none; d=google.com; s=arc-20160816; b=BKHLtU1MhNg/3xOM5bv9qr9H6Wt1EO20Q05SfmqyLvtAwGyqVWUGJdfd2mlKyxgMEP 07zw+tNOdHdMfvQHt6uFH0Nxl3qJiYU/3wwPkvgmF6npVIQ3l1yPH07ALUsJMGFeJiKY u510DZSNsBKpoBIIQBRL8zH6Qt3kTNFZhjGR25bkW036OGU3K0cvtOrxGEKr6cWR96fl sEBMRJjdwJt1YPz8OEmyrZTEX1OIYrA4XZT43aXaKEgQ94yTqqrMz7WV9ijtk546RT1Y 2aGfU2OQ+Wlv5nm6j9gaYtA7jbTM376zejbdpaRbuLCsH+mOkv2xwhZfj94buxEpxeXS U7Bg== 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=3Vi8D6cToE+83DNLkfNqfMDYxXOTd4xd+RpYBMQnwio=; b=WJmD/oaW57blKTREmU9XPo35MxA7+x8eFVAcLC5cQUDAWx0Ub46PSejNsHaB34LKhO 1QwVJzqRKC93jqU7YyZvEMfnOB17sIvKc/bWhWKVv4rmFICNNJw7DNwT2bXb3oEEPePB SljiYF7cQT6Zhoamj4sBvXqOZJrEUm4KwUC84fOzfGOkyKN81GPNY6GDgbmqoGXeABKu uCwxQL/yBwVxDd+kWDeXCYQ3zgWFYAFnyOFzY+WpdrHI6n9OoikXjgfFsCN5OdOP7SZC 2mcsnm8+39o+b3R408txvniJKrkDq+h3Y95GtctQaq9tBHC5hUwA5iKsOnJ/accdNCpc CllQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LUjXCMBn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.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. [209.51.188.17]) by mx.google.com with ESMTPS id 185si2752798ybz.301.2020.08.12.10.20.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Aug 2020 10:20:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LUjXCMBn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.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]:44734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5uQQ-0003pg-Hp for patch@linaro.org; Wed, 12 Aug 2020 13:20:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5uPp-0003og-6h for qemu-devel@nongnu.org; Wed, 12 Aug 2020 13:19:53 -0400 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:44294) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k5uPn-000182-Jo for qemu-devel@nongnu.org; Wed, 12 Aug 2020 13:19:52 -0400 Received: by mail-pf1-x441.google.com with SMTP id r11so1338019pfl.11 for ; Wed, 12 Aug 2020 10:19:51 -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=3Vi8D6cToE+83DNLkfNqfMDYxXOTd4xd+RpYBMQnwio=; b=LUjXCMBnc3FU5sdaW54XQ44rDWLDksdD10xRyOT+mpzCO+5LTSgsARnJ63kpTV5vXa X3kgLvEcnMhgSq8Qg20Aq5S7YBauDtBlhukrqINo76CS/HkNeepcAxUiJ2mQHJhG4lWb HzSPUfdbljHyGF3F6SjpMYNTIjFRe2P/GDFZK8mzrCDdb2AB0zBRuQuAXXmxPodE7RDu RmzGHQKCkFQzWvEV0er+2qhUc6g8AfIVX+RzFO2/Lbjr/OFIZc/ZGHKQzHnB9dNpf7id bwFbDNB1K7ZROWuIY/P+4f/mhvwa3JZeoMB0uJk+LOZXG9zTnZNNO+ISsJdYf559CgSB yoHA== 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=3Vi8D6cToE+83DNLkfNqfMDYxXOTd4xd+RpYBMQnwio=; b=PIKlYPJzoCmsfxDgFznsY/x0QWBJDFz0yKjK1lpmvyDsPIOFYH+q0ax6PSMl5yTB6s /SwkXnXOinZNYglFJCvzN3U3FKNYV0tDC5Tg4xM1EFRQlZCEoIHAbiFJKSvd5l/ZajRu tqmmNWYbHU9KK4j905kSk9v7RbkLUG6Dym9AM4xQc7vKT/tEUm5XIBUtF/mGXGQnhgEL x34RD85KsYXvUzFf06nez5hlg1Rxz7nOBkbO3Cr7hWdD4CaJwWFGh0gxn+fEBOKnNRtH Ru+BNiTl7smUgSVtriWz5kcJDwQF9UfJEwoJLpxgfBGGbVtphSbp21YLbwwIhZYSmos1 C8tA== X-Gm-Message-State: AOAM5315brIjrcLbLE3I8WINyKXcey7PH8pZWH0ocVshTMB0qvfXKl1W z60cADogNa7pPUqc53VCcDAbg07RxqI= X-Received: by 2002:a63:5b0f:: with SMTP id p15mr123360pgb.299.1597252789793; Wed, 12 Aug 2020 10:19:49 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id y79sm3097206pfb.65.2020.08.12.10.19.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2020 10:19:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/3] target/arm: Export merge_syn_data_abort from tlb_helper.c Date: Wed, 12 Aug 2020 10:19:44 -0700 Message-Id: <20200812171946.2044791-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200812171946.2044791-1-richard.henderson@linaro.org> References: <20200812171946.2044791-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::441; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Andrey Konovalov , Vincenzo Frascino , alex.bennee@linaro.org, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We will shortly need this function in mte_helper.c. It's also a bit too large for inlining, for something that is on an exceptional path. Signed-off-by: Richard Henderson --- target/arm/internals.h | 4 ++++ target/arm/tlb_helper.c | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) -- 2.25.1 diff --git a/target/arm/internals.h b/target/arm/internals.h index ae99725d2b..967d1319de 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -500,6 +500,10 @@ static inline uint32_t syn_wfx(int cv, int cond, int ti, bool is_16bit) (cv << 24) | (cond << 20) | ti; } +uint32_t merge_syn_data_abort(uint32_t template_syn, unsigned int target_el, + bool same_el, bool ea, bool s1ptw, + bool is_write, int fsc); + /* Update a QEMU watchpoint based on the information the guest has set in the * DBGWCR_EL1 and DBGWVR_EL1 registers. */ diff --git a/target/arm/tlb_helper.c b/target/arm/tlb_helper.c index b35dc8a011..e8cf39f7d9 100644 --- a/target/arm/tlb_helper.c +++ b/target/arm/tlb_helper.c @@ -10,11 +10,9 @@ #include "internals.h" #include "exec/exec-all.h" -static inline uint32_t merge_syn_data_abort(uint32_t template_syn, - unsigned int target_el, - bool same_el, bool ea, - bool s1ptw, bool is_write, - int fsc) +uint32_t merge_syn_data_abort(uint32_t template_syn, unsigned int target_el, + bool same_el, bool ea, bool s1ptw, + bool is_write, int fsc) { uint32_t syn;