From patchwork Wed Oct 13 02:46:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 515713 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp6097918ime; Tue, 12 Oct 2021 20:19:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcdUaMhODtCp/FyiiXjX9HgMivpQhxeu3jkiqoAzARAOaeJc0MPhSsiTBHeNKcdN+1t+CL X-Received: by 2002:a25:2bc1:: with SMTP id r184mr31437097ybr.44.1634095160892; Tue, 12 Oct 2021 20:19:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634095160; cv=none; d=google.com; s=arc-20160816; b=0GakFsJlP0uZn9K//40UuHPgYMFL2zArmahH7XaQglwvfQslTzMgaiV+olia2ujWtS EKWlHZuN6QaPZ8nXePiIRoidAqE882KQ4uWcBm7n4RhE8pvMsEZ7auYkjl0JkPw9IzRD hicxf90VnFnB6hQQbqk+aNJtPXZeTyi/SH9vXgUUOgNpeRiHYIdF0ccyMD7SwTsmWVb4 m4fFzBxs1620ZuUrwAeaPoMDfERgqbjIaXqeakKlN3rNE/Qb352tHeYgakgpnsgYx22D F+YSkbUu10DITgvRIablWeu9Aw3REhMxqIj27Q842L0doFCRQbPlOTLS3BqZC7A178cy 9jzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=dk0S43b6nxrquRYrbUsZ6pFDuF+19OrA7E9Ry0WMKCU=; b=yCxL0TFZJD3oT8JNty8owJX/O0jBcmR0rYTh+S6B1+LXfpez1bGHxpcBF5FbcARzlS /0XLOvir+JYDiaYkpx2IYDf6AGPVjl5rz6vwjHmuAvnYIQVkSgK8D7DZYND18YGZqJui Pc4z7cOqcuIz+f/6nn/I5OqfprARv8gx1pNFHNowHAgOSGapMussoceLGEkUd/647NdM 8+lwR3E8CgE2YJdpS1ADs9bMABc6fB/liV8oRrDtEV3jQjx55QD/UFV5dxiw+KCOfz9r WLwM3ylspjQCbs7cs8+nJqa4KuqLUOqCwgqazlpTYmMqymDXW3pMHbMHAetY7JbLd9We 3zKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ePbKVg7d; 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 j5si14410368ybb.322.2021.10.12.20.19.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Oct 2021 20:19:20 -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=ePbKVg7d; 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]:48760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1maUnY-0000wm-C7 for patch@linaro.org; Tue, 12 Oct 2021 23:19:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1maUL2-0005NT-Mi for qemu-devel@nongnu.org; Tue, 12 Oct 2021 22:49:52 -0400 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]:46935) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1maUL1-00016N-8g for qemu-devel@nongnu.org; Tue, 12 Oct 2021 22:49:52 -0400 Received: by mail-pg1-x52c.google.com with SMTP id m21so864318pgu.13 for ; Tue, 12 Oct 2021 19:49:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=dk0S43b6nxrquRYrbUsZ6pFDuF+19OrA7E9Ry0WMKCU=; b=ePbKVg7d4/Ll/Zvxl3RJbsDvQIXm2TU2eLaCgcE5O4zFNe05G3z2KS2MM+aoEhIDmh WwV6ZGOx9prd+PuFNWcFQQVSJZFeHbYZE/zcO547DmDmnwaZ/bAe9vvauFYJHG/VdXbF n5evVexEQL8/YQ+htjfCUy4KGgS65EFavABID1i/CSayebjf8ORSfxUHsfMpv1WB/8i7 cWokMwdVA636QdxFuUa9tNZ768R66FcP3ILj3JU3fDoJ6arrbEdIU3RDt3GntNVorW9o q8V62/4zAfLlyW0NpqzuG5lDpfbK5uEW10kPwxiNqYop2BchQQ3YjqEE2R+7N3gPWrac PYIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dk0S43b6nxrquRYrbUsZ6pFDuF+19OrA7E9Ry0WMKCU=; b=NsGRt5VtcbyAeHDLEZny38tNQixV/c+pL3k1AcTDcXeuHKkuI6D9OLMuRu9FacK5JD abshp9A8CW0j3+elUEIrTrMp8E7F913tD9b1516vIWCxwWZ1//CYiB0rLZj/Fzzth2hx ZndzOP3C8wq3sT7Ab39K3erWGiQQ9e4d6O/rmLIH+UdXetH3iX/wJVaF5lAcz1TtHQ7Q AecjCIJNGbtt7gX3Qf6c5R2cGRrcFx1ZYTlGHqDhjTJa572jCt65idCsdKudM0oIAOdr QyRjchPhicWzrGybSCv4F8aK8F5nuYt7N8n5ljkhHvbFIqgabyQuwN/r0f4EegBgiiP2 9vpg== X-Gm-Message-State: AOAM530T2pV3+gkfjxFHpd/MpF0+YlX90oqFGQSLDkJrOAFHxiskIF5P MDEiQLurFQ24SeTuDP8fGr516hhyLnGcoA== X-Received: by 2002:a62:641:0:b0:44b:74bb:294c with SMTP id 62-20020a620641000000b0044b74bb294cmr36219724pfg.12.1634093389796; Tue, 12 Oct 2021 19:49:49 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id y20sm12579610pfp.68.2021.10.12.19.49.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Oct 2021 19:49:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 41/48] tcg: Canonicalize alignment flags in MemOp Date: Tue, 12 Oct 2021 19:46:00 -0700 Message-Id: <20211013024607.731881-42-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211013024607.731881-1-richard.henderson@linaro.org> References: <20211013024607.731881-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52c; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52c.google.com 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Having observed e.g. al8+leq in dumps, canonicalize to al+leq. Signed-off-by: Richard Henderson --- tcg/tcg-op.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index b1cfd36f29..61b492d89f 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -2765,7 +2765,12 @@ void tcg_gen_lookup_and_goto_ptr(void) static inline MemOp tcg_canonicalize_memop(MemOp op, bool is64, bool st) { /* Trigger the asserts within as early as possible. */ - (void)get_alignment_bits(op); + unsigned a_bits = get_alignment_bits(op); + + /* Prefer MO_ALIGN+MO_XX over MO_ALIGN_XX+MO_XX */ + if (a_bits == (op & MO_SIZE)) { + op = (op & ~MO_AMASK) | MO_ALIGN; + } switch (op & MO_SIZE) { case MO_8: