From patchwork Tue May 16 19:41:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 682435 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp23642wrt; Tue, 16 May 2023 13:05:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Zd3alWrF2p8JvCm7AZ9zcsAFBWYU7xpWA/xBMG5vL0rKyuKzT8mPO5Ls+xxUV3a3Bi5CB X-Received: by 2002:adf:f552:0:b0:306:772:5c2e with SMTP id j18-20020adff552000000b0030607725c2emr23847456wrp.70.1684267512547; Tue, 16 May 2023 13:05:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684267512; cv=none; d=google.com; s=arc-20160816; b=jQmXPBb1gz1nU6ksa9ET+fNszErY4FM2JKaEiGLcG2s7Ns4FO1wScxtKQOTWeHctky fqeyBRssIXIXojKyAv6uK5LfwTpRUhy2rjhFuDLKh8UsCYFI4WpEYMCg/VOEthKk//5C dvy3XDl4sazlHcgBSIo5FYftNwXXhhopbcqNs5mar0gwXr6uVCPT5s2JZZ0PfITrXW+C +haOoS28ueYQ4IB09gf1C4fyKZPXfiJL4EADRNJDPTYgFMwLxKLgMPoVrSoER6AoFxBL qFOnqKkah/nITEv018RxnvIO36ZcgRujim8sdjx+xPOoVXRTcQWYdvxr9bWbWt5ae5lW O3Zg== 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=joEze47TBGXX0770sgjaIGXAA3+n4j9+h7GefAjVJ1s=; b=QapF5P6LpDgc155YU0WZ/UrJ1+VxI9tNwbR25F0OU/SQeb63T9bIgWHI6pijbM7AZS pyCqTnwzCjxOnldc0tt17vTCMV8GhEpTqiboBw9YfFGAA7Sallr5pZPLvL0wN6A9bjo+ vlWLuY2UdFm8m3VjWFdAG5gJQTjiMyK5o52FJHWTdrAXtNKtjpO0qyJw9wUTjbcX7TL2 p1zOg64BaBxLIMRkH7HLC2HTiJ1K+8GQySiMV7mhw9UC5wDSYbwv+OCQLkzq9HI5A3z2 yzHRdTjQc5j74QhB4jFx0mvrVBkhyW1BS37aVgj2nZT0V1at0C8YY8hZhNRAyTRgSCFv QCSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ZBc/Uc7l"; 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 i10-20020a05600c354a00b003f51bbe6ef1si151796wmq.78.2023.05.16.13.05.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 May 2023 13:05:12 -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="ZBc/Uc7l"; 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 1pz0cn-000148-QF; Tue, 16 May 2023 15:46:23 -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 1pz0cI-0000Ll-Eb for qemu-devel@nongnu.org; Tue, 16 May 2023 15:45:52 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pz0cC-0003lH-EW for qemu-devel@nongnu.org; Tue, 16 May 2023 15:45:48 -0400 Received: by mail-pj1-x1029.google.com with SMTP id 98e67ed59e1d1-2533b600d35so58243a91.1 for ; Tue, 16 May 2023 12:45:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684266343; x=1686858343; 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=joEze47TBGXX0770sgjaIGXAA3+n4j9+h7GefAjVJ1s=; b=ZBc/Uc7lvnUykiQfXp7OzLqGjzVFcGIdowXxpO0wzpKIVCpmpxb3epYMg3Pua/pTKL CqEr99hKM8O7iBrZSq7muMH05QotI4ivaBSZ/Sppbt72xu6SzXf5TJMGgjYVeYkfI9cO kAitAC8+I6Gmulnanu8hubq9E0zlzVL9PZR+6VXkDsc7Zq8N6yfPRCvky7lGOLZzBqD9 6UAf/toWK7GIRX/XXybLoWFQxKWJEcV/IgIxnxayKLVPubNmzcZyBSRslU20wXD6lkGX 0pr9rU2FtqORlgHKTri2m8bDQnnm7fKFj8I1W1dA5CNDzMEgGnmBfiDj9ruqjyVsKmYG qiaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684266343; x=1686858343; 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=joEze47TBGXX0770sgjaIGXAA3+n4j9+h7GefAjVJ1s=; b=SaFDC+7Z0pE0Wbo0uFXqueIJhGrQjBy3BqkhIpJlHJhTxGzNiYo1nrve998WuunKRs cHnDZH7qRxT/MukH9/eGqC4mV6iu5I7LO6XCASxAyNeNVGK23sVahsde7DzJ0VGOkxFb jX5J61DDJz846JO/o4RvvdAhGdSwED8ykKW+7K5W04uT2U07gu/9dYV2ZCkOsK/hV19R OZivfqB4/aPBBq4BgN5BScW75wG9JvchfJlK3eBf419BoQFkXjEZLNpzmxpbjrtbUPUs HlhimQBfzxE2jBTyYmcIpRpuhFn61NoA7kKJa9BBWixKO46jVDweyyL2XLLhxVIuhzfd 1XnA== X-Gm-Message-State: AC+VfDx4ptlGadp3X6YSlOzLM1JADHPKZdkVhNJyobaz4Sb9FN2CPTQh XJFpqY2mUJcrlSa20E2TDJP0tGH5m544z8GfTw0= X-Received: by 2002:a17:90b:2313:b0:253:2dc5:4e12 with SMTP id mt19-20020a17090b231300b002532dc54e12mr2463204pjb.46.1684266342887; Tue, 16 May 2023 12:45:42 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:ec81:440e:33a4:40b9]) by smtp.gmail.com with ESMTPSA id y12-20020a17090abd0c00b002508d73f4e8sm25555pjr.57.2023.05.16.12.45.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 12:45:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 63/80] tcg: Add addr_type to TCGContext Date: Tue, 16 May 2023 12:41:28 -0700 Message-Id: <20230516194145.1749305-64-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230516194145.1749305-1-richard.henderson@linaro.org> References: <20230516194145.1749305-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.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 will enable replacement of TARGET_LONG_BITS within tcg/. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- include/tcg/tcg.h | 1 + accel/tcg/translate-all.c | 2 ++ tcg/tcg.c | 3 +++ 3 files changed, 6 insertions(+) diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 42a3c05607..b9748fd0c5 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -558,6 +558,7 @@ struct TCGContext { int nb_temps; int nb_indirects; int nb_ops; + TCGType addr_type; /* TCG_TYPE_I32 or TCG_TYPE_I64 */ TCGRegSet reserved_regs; intptr_t current_frame_offset; diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 7b7d9a5fff..99a9d0e34f 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -356,6 +356,8 @@ TranslationBlock *tb_gen_code(CPUState *cpu, tb_set_page_addr0(tb, phys_pc); tb_set_page_addr1(tb, -1); tcg_ctx->gen_tb = tb; + tcg_ctx->addr_type = TCG_TYPE_TL; + tb_overflow: #ifdef CONFIG_PROFILER diff --git a/tcg/tcg.c b/tcg/tcg.c index 800dcba159..dfe5dde63d 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1520,6 +1520,9 @@ void tcg_func_start(TCGContext *s) QTAILQ_INIT(&s->ops); QTAILQ_INIT(&s->free_ops); QSIMPLEQ_INIT(&s->labels); + + tcg_debug_assert(s->addr_type == TCG_TYPE_I32 || + s->addr_type == TCG_TYPE_I64); } static TCGTemp *tcg_temp_alloc(TCGContext *s)