From patchwork Wed May 3 06:57:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 678608 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp903831wrs; Wed, 3 May 2023 00:10:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Y8co5W6xf5dq28k0WwLrRx2aEvRi/fSkSDhkFgPnYdGH8dNXf9J28InEy5y658icl13xY X-Received: by 2002:a05:622a:48e:b0:3ef:46b0:80db with SMTP id p14-20020a05622a048e00b003ef46b080dbmr29189066qtx.11.1683097800793; Wed, 03 May 2023 00:10:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683097800; cv=none; d=google.com; s=arc-20160816; b=pFcBXVPlPYd5C3kLKQpftVqbrmGnuZcS8Y9VGWZ/DK6zs+iqGGVfAUrvCaQxzWzkaX p6EHLjFVg5yjFORUmtklmWg6Z/pEcKuCXsCCoy6Zh+lX55eV72kzblclcLexGL5E/LZo JEJYMdEl4j5lyPq226rNtcT6c8RgyiWDlbNixyCUVScgWeayO7Lq7eu0YoV+lUSm04NL 7kyY1A5hBTMck57DDOGVvIJ8TdKXQE5xoqykhPKadJVNsylcpT8GA/VPglv6REOTeGMN YvlRGDjoT0cprUQZgWm2PRWw5E6eEA1O5gUSZBKJNR9igdThFWsTuUFHtxW5HvdqcHGH tg9w== 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=JBlLTyWKOiEkOq0J5b/GXBVDB4TkoIkhZS8BOvAsaM4=; b=r4LIff83o9GFt2tqFBgSpK/6puL3RahOciP2LLq9SPX/p0lCVICpIpS4QAlgErw7L9 CaLHX0pglHJKRQ3PipFWhIAoHz+HdM6OqEekw/VtVvvJWL+ZWuPBMTVnGXRKegbXykz2 xulkAwcKqAIRcfEjBM5icmKgN1O8C3INF+cOJ2lILcwbg4f4Na8E9duc2vO0sMjR0o+D zTmXZeAblTIhba8N/WtHXBhmmmHPFf0azfKKZrZf2BIm5dCl08QmgqHNCw4w3rVRaBCU NHpitglM25SdxSfOeKXGKlxBzWr73Gu8cAj+QABRsBOtXwu2pdCQwRSq2gBnBbeDxdpb 5yRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=u2Bhi55b; 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 s21-20020a374515000000b0074fb4934859si11509830qka.503.2023.05.03.00.10.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 May 2023 00:10:00 -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=u2Bhi55b; 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 1pu6SH-0000zz-Q5; Wed, 03 May 2023 02:59:13 -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 1pu6Rk-00009y-HR for qemu-devel@nongnu.org; Wed, 03 May 2023 02:58:49 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pu6R1-0001tF-FS for qemu-devel@nongnu.org; Wed, 03 May 2023 02:58:35 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3f4000ec6ecso28425e9.0 for ; Tue, 02 May 2023 23:57:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683097074; x=1685689074; 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=JBlLTyWKOiEkOq0J5b/GXBVDB4TkoIkhZS8BOvAsaM4=; b=u2Bhi55bZqbHB7M8XahsTwDZtqSe+2e545vT014aCxXrFNtxCZorQzpqli+YAPHzLe j2v2pamGEb2enRmIUfNxJj57jdM4f7wA05G/lOlarrZ9FcyXQMboyifPxgdvXiSSCavi DeXra2RTSykspfa2SKKz2Ihfqu3/QADuS+OT5/oHdfsXfVKm2iKvUKwuYr86DgA423gp EsuuH6Q5xU5ILLI4itktkNigco2HIYx7Kas+f4odPsWsDdIn2W0p9IDPAMfJxO2Dp3FR BqYv8wC7afgW8Gt5gNQO/3ZKLNdh/Qk87Al8rCkbUZmvxGkYT7JXMVxWHDmTocpiYEy1 o6qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683097074; x=1685689074; 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=JBlLTyWKOiEkOq0J5b/GXBVDB4TkoIkhZS8BOvAsaM4=; b=CJByDVz2qSRMPP8tbUpMCDbKhMNP+/RWjhrZsduHiviTtK2QEphp520zqArw8wVPO9 uK3Rv61blCosBKunEvLEwbcMLuRKVkatTx4teJdpKdOs0tXGD6vpbYsx5rNMD7CrGEQW mJycC1giDzBYoJ2bGZfO5bmvEuUw+aR6ZMwINCJyLiK1b3Rn72jZWGEdiZzKNF9+4Ees c72u+e94dhLxiTJ2aLfbSowxI2Jao+zggzjUEf+TgSzwfrVIqzuDwtVqOaKcU2slr1H6 62R1IteiBmEJCy62qTQIX23LCZzAkxD+vO7u9c2RDTl4mw6S9hoVZZ6VfdCXZZFbN/ah 8jvg== X-Gm-Message-State: AC+VfDxkjBwuVLSbqh7qcJDXmBI78QsG3uRkGjqE9iSg9VshdufrQAWT hzoDHRndO0s+9VPv5nv5srFBTAF1D2vf6vsspewE9w== X-Received: by 2002:a05:600c:378e:b0:3f0:3c2:3fa4 with SMTP id o14-20020a05600c378e00b003f003c23fa4mr13824040wmr.12.1683097073885; Tue, 02 May 2023 23:57:53 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:c01d:9d74:b630:9087]) by smtp.gmail.com with ESMTPSA id f6-20020a5d6646000000b002f6dafef040sm32796617wrw.12.2023.05.02.23.57.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 23:57:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: git@xen0n.name, philmd@linaro.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org, qemu-s390x@nongnu.org Subject: [PATCH v4 30/54] tcg: Move TCGLabelQemuLdst to tcg.c Date: Wed, 3 May 2023 07:57:05 +0100 Message-Id: <20230503065729.1745843-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230503065729.1745843-1-richard.henderson@linaro.org> References: <20230503065729.1745843-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32f.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=unavailable 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 Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/tcg.c | 13 +++++++++++++ tcg/tcg-ldst.c.inc | 14 -------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index cfd3262a4a..6f5daaee5f 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -94,6 +94,19 @@ typedef struct QEMU_PACKED { DebugFrameFDEHeader fde; } DebugFrameHeader; +typedef struct TCGLabelQemuLdst { + bool is_ld; /* qemu_ld: true, qemu_st: false */ + MemOpIdx oi; + TCGType type; /* result type of a load */ + TCGReg addrlo_reg; /* reg index for low word of guest virtual addr */ + TCGReg addrhi_reg; /* reg index for high word of guest virtual addr */ + TCGReg datalo_reg; /* reg index for low word to be loaded or stored */ + TCGReg datahi_reg; /* reg index for high word to be loaded or stored */ + const tcg_insn_unit *raddr; /* addr of the next IR of qemu_ld/st IR */ + tcg_insn_unit *label_ptr[2]; /* label pointers to be updated */ + QSIMPLEQ_ENTRY(TCGLabelQemuLdst) next; +} TCGLabelQemuLdst; + static void tcg_register_jit_int(const void *buf, size_t size, const void *debug_frame, size_t debug_frame_size) diff --git a/tcg/tcg-ldst.c.inc b/tcg/tcg-ldst.c.inc index 403cbb0f06..ffada04af0 100644 --- a/tcg/tcg-ldst.c.inc +++ b/tcg/tcg-ldst.c.inc @@ -20,20 +20,6 @@ * THE SOFTWARE. */ -typedef struct TCGLabelQemuLdst { - bool is_ld; /* qemu_ld: true, qemu_st: false */ - MemOpIdx oi; - TCGType type; /* result type of a load */ - TCGReg addrlo_reg; /* reg index for low word of guest virtual addr */ - TCGReg addrhi_reg; /* reg index for high word of guest virtual addr */ - TCGReg datalo_reg; /* reg index for low word to be loaded or stored */ - TCGReg datahi_reg; /* reg index for high word to be loaded or stored */ - const tcg_insn_unit *raddr; /* addr of the next IR of qemu_ld/st IR */ - tcg_insn_unit *label_ptr[2]; /* label pointers to be updated */ - QSIMPLEQ_ENTRY(TCGLabelQemuLdst) next; -} TCGLabelQemuLdst; - - /* * Generate TB finalization at the end of block */