From patchwork Fri May 10 20:01:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 163949 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp2816899ilr; Fri, 10 May 2019 13:03:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqz5bH4HzVyHGsmuJxRhjAU/kj+uAEtJxaBsVHR1aHcz2iwVzUtg6Hni3jn5dAuNnGjmjjxX X-Received: by 2002:aa7:c919:: with SMTP id b25mr13378673edt.274.1557518624138; Fri, 10 May 2019 13:03:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557518624; cv=none; d=google.com; s=arc-20160816; b=Kgbj2mCf3+h8xFERi6v/HtdKEF4My+k3Ks0WKROvqEDQx8sxmsezWckDdqwvFvMjsW wZQB/i3uO2fw00Pmu3OKIu6RYMsvJxB57hD975qkuVo/NZTmIqSmK8Qumw5C03fpsZFk /TQHZJYGGbETf1l0s+Y1PlmcXUbvZdSen9VW1v7TU+sLubIApeVqAOW+Hr3QZ3yjAo8w 4A1WW5ekmlsbLp4Xr7f/vJFoW2AVJSTyZXVHnAU8qPnJ8BU9OKE2v8/xAXH5l16FuaTr /LDi2jyW0lc+aJcGnAraLFxS0a1L0cOQn3EFIyny+vth9IyTuJTODaLRsZZO1P3S6MXu SRIQ== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=P6OpXLABH0bE0gbKxQnLm+pXDLfhXNolnZxvDMNERq8=; b=SyvaMsTNu55FxHYXx7F3Mj6lDJt978Y7/Tdg/eLFm6UjUe675LCRE/CSBw1Mct4sIs rVWnM5KltldZbLiq3JD21dBXs20S0AwkUNpUV46CTaXIgKdc2xzSD/yWiPJ+cPfNg0gO +qZO6ivNC4yS8OGL3sspmMUwctC/vopGDYWJ6qR/JjkfoM2/KeaAMLkf2p8ZfojvTXiE 2cSDBZkNGCBP/LGE27oRQpzUtX+ijr4zEuDvguH2cJMSzLZ+1/jm2cvdTo/Yzcz+ZwJE 93oInCH9eM4tAIY5+SbGg23s2IPWfMQwIPX72ByymCe0RDZTZNK5hja1LlvLH+TsG1H0 DU2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xhEzya3U; 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=fail (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 w18si1102161ejz.371.2019.05.10.13.03.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 10 May 2019 13:03:44 -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=fail header.i=@linaro.org header.s=google header.b=xhEzya3U; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:49299 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPBk6-0004Gd-RV for patch@linaro.org; Fri, 10 May 2019 16:03:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPBhk-0002SB-Jq for qemu-devel@nongnu.org; Fri, 10 May 2019 16:01:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hPBhh-0002UX-F6 for qemu-devel@nongnu.org; Fri, 10 May 2019 16:01:16 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:36288) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hPBhd-0002QC-RW for qemu-devel@nongnu.org; Fri, 10 May 2019 16:01:10 -0400 Received: by mail-wm1-x32d.google.com with SMTP id j187so8604743wmj.1 for ; Fri, 10 May 2019 13:01:08 -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=P6OpXLABH0bE0gbKxQnLm+pXDLfhXNolnZxvDMNERq8=; b=xhEzya3U9fREEkpXMVzA1gW7VCa1JRlmW+ax4krdH1cg6AfVfG+pRTIADUgvrwP3ui wY2i0oSPOacSY2m4GajImz3JrG5CKdrSBmV5Z2P/OPpmS+BtVN06A21Yp6AWDqjd1saU sciyBX6CQV1VaqlnlDXVDwzmjsTgHjez5t8RzfrQOFE2lGYhzrGtM+38fCT+0ZqE+n4s g9NMU6SPP+OlchhNRq0K5K4rxnY13SFjCqSFN3BdgYzn6ND5tsS7OLGPWjhicjJaANsT 6KLke5mTmGNfZGqZvhq2yg1zIcD1BmUY7ms1hus77DcYZEBNrnpd+5EWNKXfQ6N7pHGz t8Fg== 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=P6OpXLABH0bE0gbKxQnLm+pXDLfhXNolnZxvDMNERq8=; b=nNiXuA2qaSyIkvfflGFfbTzdPmsumY2neMEJeaKcTl3LrGaWlNKaIbpfXWqymsFV/1 kdE2q7RI5FtUOaB4vPJWMdN8hdBKVdFdx3+gktf4hp1VRjAnmjBmmJxGpy4O27qlUNPs BDjp6EQMWV36i2eYkE8s9aIto4x9yC/x7Eniqv3qBGg1zBJU/GaGAJIUOOhrHdfOov1R BWUvnmYZ0OGIVq/VaGKJ6XpvRNwS9qnOlHV+9W7WHGJjqeP2/1R8ntv1PZKIcrfRSPJZ +bdtvCKUnw1fA7hfZ6Y70vyS2qB5cXj6gakXPbFQBx3+lra/4g0Y4FQ5u9+1XrOzxxU2 w5Dg== X-Gm-Message-State: APjAAAUNMBz8ztdBAY3OUi0GKdxmjxckfXznMADKVqR1Y8w77E4Tq7QV mUtEoPQokGkLLQvrKZLuutH2kQ== X-Received: by 2002:a05:600c:1191:: with SMTP id i17mr318389wmf.84.1557518467333; Fri, 10 May 2019 13:01:07 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b10sm11569023wrh.59.2019.05.10.13.01.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 May 2019 13:01:06 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 428801FF92; Fri, 10 May 2019 21:01:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 10 May 2019 21:01:01 +0100 Message-Id: <20190510200101.31096-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190510200101.31096-1-alex.bennee@linaro.org> References: <20190510200101.31096-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32d Subject: [Qemu-devel] [PULL 5/5] cputlb: Do unaligned store recursion to outermost function 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: Richard Henderson , Mark Cave-Ayland , qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson This is less tricky than for loads, because we always fall back to single byte stores to implement unaligned stores. Signed-off-by: Richard Henderson Signed-off-by: Alex Bennée Tested-by: Mark Cave-Ayland -- 2.20.1 diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index e4d0c943011..a0833247684 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1413,9 +1413,9 @@ tcg_target_ulong helper_be_ldsl_mmu(CPUArchState *env, target_ulong addr, * Store Helpers */ -static void store_helper(CPUArchState *env, target_ulong addr, uint64_t val, - TCGMemOpIdx oi, uintptr_t retaddr, size_t size, - bool big_endian) +static inline void __attribute__((always_inline)) +store_helper(CPUArchState *env, target_ulong addr, uint64_t val, + TCGMemOpIdx oi, uintptr_t retaddr, size_t size, bool big_endian) { uintptr_t mmu_idx = get_mmuidx(oi); uintptr_t index = tlb_index(env, mmu_idx, addr); @@ -1514,7 +1514,7 @@ static void store_helper(CPUArchState *env, target_ulong addr, uint64_t val, /* Little-endian extract. */ val8 = val >> (i * 8); } - store_helper(env, addr + i, val8, oi, retaddr, 1, big_endian); + helper_ret_stb_mmu(env, addr + i, val8, oi, retaddr); } return; }