From patchwork Wed May 3 07:23:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 678754 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp914594wrs; Wed, 3 May 2023 00:42:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7dh7Vxd5bwGasPc64LWmAvJMHhbLGFwfbSCaT40jqFRc15ER4gr+lUcYIKG0x4BHokGLWZ X-Received: by 2002:a05:6214:2689:b0:615:a787:6d31 with SMTP id gm9-20020a056214268900b00615a7876d31mr8772838qvb.38.1683099753343; Wed, 03 May 2023 00:42:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683099753; cv=none; d=google.com; s=arc-20160816; b=jW0yo2bwxNVeYtOb4Jeyh75R8ENTdD5zvG/1T168VvtVBZavzGj8GDUgE00/0B4z88 DS6Li6GFzLa+B+401UW2/S5y4BLCccSlZmnhIgXpqDtUzwoh39lxSLN1WV4w0gBfUtWu 6wPI13gD2l7p5/upPHKZ59148e5rXupV6uf4DVCJybiKWk2QKAEWURwbOsZ/3Al1RFZi ewPbqsHNmoLUspfPJSHODgCbcRonc1ngyaVZuKusPadvbTrY3t5j4k6dxBfEQjwWLuH9 Xcs7KyMPCUYoyzDlaDTFOIlqbp28WCyAY6ytfkG/2xSbvRAbnasDPHs9dq6y80jPjYXZ 6Pxw== 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:cc:to :from:dkim-signature; bh=vy5nR7m9duq9DZVmj1wz55/l+1SOQkxvTQSRU9OgRBU=; b=gkrm+polLxlUUumVMeEKTsAqRHbgCGEBOxZkDxolfjtws2IjWLVZjGhBLdhxJkK52t LIFi1IqIEZO4WjoKdluxqR/Tfrc6Rtm5hS9ZBvFNTe4EUa48+3RcGAP5VUjO+6MCb7dj ydsDAPcNYEbzsXPbPZtsp5gJdparqtbN1TCr4eWSKAN/+ICkftCtN/7wG55Fm4yq8RUu 3qqeJmg8DwyVTLT5xObgKQ+ab+AA9I6zCjq/+51u8RQg8gIlbf/8IgM2iTo77mRA4D9A jdL6E2lpnKEW5/PPe3eaan/l5EhUPa7gmTbWobegwDSEDZCH2Ja1sv8thXMvkyDaMjCj +H+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zJ9jJyyk; 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 c13-20020a056214224d00b005f16a6cce07si18076115qvc.62.2023.05.03.00.42.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 May 2023 00:42:33 -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=zJ9jJyyk; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pu6ta-0004pc-QY; Wed, 03 May 2023 03:27:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pu6tS-0004PU-UD for qemu-devel@nongnu.org; Wed, 03 May 2023 03:27:19 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pu6tP-0005ec-Kp for qemu-devel@nongnu.org; Wed, 03 May 2023 03:27:17 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3f4000ec71dso211135e9.2 for ; Wed, 03 May 2023 00:27:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683098834; x=1685690834; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vy5nR7m9duq9DZVmj1wz55/l+1SOQkxvTQSRU9OgRBU=; b=zJ9jJyykDjgsHkACespTfibXLZqS5brz9FSYdOa+YyeefcV/swI/1fsP7yiLtbGrAi mzyQ1MEd3iGb7TNZzSJLEw5QOGsycRHpAeoIV/BH9RSa2227uEyQXpBEVuYkzKywuEzp kR4/+rAD+s6jos/YrEJILdPGrpSVEO+Uf+X9xxE7LMy+yfBZAXfqN7IgJUmF8fYeGhr9 esd2m1dMl+poW975+d6McPiN9y4TI37oNo3Otjk9pqQvwDlpsG4a0ht5KD7tUt11Btdg E/KRRdMuDBbYUPR8kclh3hJXFxOlq92VQyOEZOa+9L5QZ7PyzVgZBQBLGe4jEjqNdlJC bJGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683098834; x=1685690834; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vy5nR7m9duq9DZVmj1wz55/l+1SOQkxvTQSRU9OgRBU=; b=bqUGxjMUuxpuywqHmNPTM4Rlq+TM51KmSkLdvg2fh5KO9boCVltM8gcmtYHbmeCqzv X27BFL3lELN0WbudOuZg+P5IgzEXdDZPdIwTv/PM5V+2BDiZwCA2v3a/eEQUxtLuL7H0 qQaboOpXYIV3FaNadVwL5ymS9GrwGiooq0WfHeqJJLFtr2Y7RaOEZHH8nWGDLpnBB/p9 7KysGIAINj8mVK1RcNipb9oNICXxugqurZGtap0vQ67U97CocXUrQt+ArhQnArfoixC2 I0EleB7zsjo8he/wqj5gLm3JYYeWxTYTxM936iX+vWN8AANSDKMt5WKJgwJPjv6mhTyk M5mg== X-Gm-Message-State: AC+VfDwqhJwfJQTGWi54QUjffK3nuJ44hDlDN5dK0ehEYZpLCKhgZCC5 OOxLF74H/7KxVf35NHXdAcVZpg9Nwcbd05NZLBZ0Vw== X-Received: by 2002:a1c:f607:0:b0:3f1:8173:fc1a with SMTP id w7-20020a1cf607000000b003f18173fc1amr13805973wmc.28.1683098833947; Wed, 03 May 2023 00:27:13 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:c01d:9d74:b630:9087]) by smtp.gmail.com with ESMTPSA id t4-20020a7bc3c4000000b003f1745c7df3sm974315wmj.23.2023.05.03.00.27.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 May 2023 00:27:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: ale@rev.ng, philmd@linaro.org, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, anjo@rev.ng Subject: [PATCH 55/84] tcg: Add guest_mo to TCGContext Date: Wed, 3 May 2023 08:23:02 +0100 Message-Id: <20230503072331.1747057-56-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230503072331.1747057-1-richard.henderson@linaro.org> References: <20230503072331.1747057-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32c.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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 This replaces of TCG_GUEST_DEFAULT_MO in tcg-op-ldst.c. Signed-off-by: Richard Henderson --- include/tcg/tcg.h | 1 + accel/tcg/translate-all.c | 5 +++++ tcg/tcg-op-ldst.c | 4 +--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 97f13d937d..24e8cd65ef 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -521,6 +521,7 @@ struct TCGContext { uint8_t tlb_dyn_max_bits; #endif uint8_t insn_start_words; + TCGBar guest_mo; TCGRegSet reserved_regs; intptr_t current_frame_offset; diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 03ebe58099..181f276b18 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -367,6 +367,11 @@ TranslationBlock *tb_gen_code(CPUState *cpu, (int)offsetof(ArchCPU, neg.tlb.f) - (int)offsetof(ArchCPU, env); #endif tcg_ctx->insn_start_words = TARGET_INSN_START_WORDS; +#ifdef TCG_GUEST_DEFAULT_MO + tcg_ctx->guest_mo = TCG_GUEST_DEFAULT_MO; +#else + tcg_ctx->guest_mo = TCG_MO_ALL; +#endif tb_overflow: diff --git a/tcg/tcg-op-ldst.c b/tcg/tcg-op-ldst.c index 71cc559f67..9eef859c97 100644 --- a/tcg/tcg-op-ldst.c +++ b/tcg/tcg-op-ldst.c @@ -104,9 +104,7 @@ static void gen_ldst_i64(TCGOpcode opc, TCGv_i64 v, TCGTemp *addr, MemOpIdx oi) static void tcg_gen_req_mo(TCGBar type) { -#ifdef TCG_GUEST_DEFAULT_MO - type &= TCG_GUEST_DEFAULT_MO; -#endif + type &= tcg_ctx->guest_mo; type &= ~TCG_TARGET_DEFAULT_MO; if (type) { tcg_gen_mb(type | TCG_BAR_SC);