From patchwork Mon Apr 24 05:40:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 676528 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp1987457wrs; Sun, 23 Apr 2023 22:54:28 -0700 (PDT) X-Google-Smtp-Source: AKy350ae79k8tRxiCyl3xAZfYBE6lFzVpv+5n2eG2/5KJaxlYL/DieDa5NsOYIVDirCElbGxSpCT X-Received: by 2002:a05:622a:1822:b0:3ed:a2f5:f27c with SMTP id t34-20020a05622a182200b003eda2f5f27cmr21190130qtc.12.1682315668527; Sun, 23 Apr 2023 22:54:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682315668; cv=none; d=google.com; s=arc-20160816; b=f7Paaoj2Em1Wo/Xw0yxIxQLBvk3epjzqznrJDvziwVntltyEO9pezu9XNrPPhECBz9 i6LZH4T20cCEJCdKeRFKiryLgZxozKP6B5drN3hEzJJNwRbPAEhMCLV4WdsUNTCer5SK JF6UlrpE4AMSfln/8GeNToyAUJTQKY3eg9OA4utvyr6js8N3dUuFuTJK29aZ4wyHHHiA z+mLvGJUsBhQ26Xl+KpuIgiQCFHqktE9J9+DrFKq0vG9uQCMMTtm12v3ucGXQOLpUjmU CYFcfQ3Fw6TsfpVTC3RwFIPwmFw5YfoB1f2PBCLZfjVBGH2h62j6SPHMx/tKxB9Xsnr1 W6NA== 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=1e3+3125R6Ll+hm5X+IbfdxFrIfgl7VB8JipCIcUQ7c=; b=BajErEGFkz0STS328hFy8U+vC8gPhCvB7Tz1fmv/FWaInNhf8dEv0xdUWb3noOgArc emme8hB5cxw6ZSnH5Fkv1kgl1NWjxBGiksBraKRcGLemjOdZ0omWX98Vg4BIMSQOz2lW kjj3prLiKMuHu4Pf9bWb2YZxTtz8RUQjifUIzCZ/wvR1CumQh5+HMOUKsPi6OTeMyjiy HuQrKFZM7FEZVewLCpEGR1ZukR1DkPSz77qdB4sN9V72dPVAl7u0Tz9QA5g73S1dHS3L 3cYYzg+/vdIhqy0yG3rcN8nNACI/VqMYYUZVsTOGVCcG+58dMbPkdD7VyVDj1CNE3YYt XMhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ikCqUS/e"; 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 s14-20020a05622a018e00b003f0a1d0ae92si1020219qtw.208.2023.04.23.22.54.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 23 Apr 2023 22:54:28 -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="ikCqUS/e"; 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 1pqozc-0002H5-2H; Mon, 24 Apr 2023 01:44:04 -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 1pqoxr-00060s-Th for qemu-devel@nongnu.org; Mon, 24 Apr 2023 01:42:33 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pqox5-0004Ez-NY for qemu-devel@nongnu.org; Mon, 24 Apr 2023 01:42:14 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-2f7c281a015so2296776f8f.1 for ; Sun, 23 Apr 2023 22:41:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1682314886; x=1684906886; 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=1e3+3125R6Ll+hm5X+IbfdxFrIfgl7VB8JipCIcUQ7c=; b=ikCqUS/ewX2b7dhjuRKsfh56WF/nCP5QStoXznFXE0hxBDCdpPoBsRNoNjcIaTdrE+ Fuvkog7wbtif0V5/Z6/gLGMbaNdErOdnUDZgHgGqiIO0VmKTsFvDLyd7/ggF3Qd1u6nB jEB8pAHlYVt3MrKc0fIVlMnCKnuLMkdFPUGF0KVoqr4DY0jqJ9/bVgkBleA2fbCM8UbQ H2DzUS59md2n3x2m4XzfR3CImzcDvhQLmbgW7pZh114ZMOJW+pTiN+nB03qutuPy3Kpx FkRXCsdkDjiya9s7bpV3SCmeaE2uYyxpk7Bz7wZZAFjsuKJwBGsMAjFb8/xmn2mBvdJv VcGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682314886; x=1684906886; 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=1e3+3125R6Ll+hm5X+IbfdxFrIfgl7VB8JipCIcUQ7c=; b=eAUuyUmSElwbK+m6M51r6wlbM+zDpIDVuZIbbvsUu6Ip31yv9Np9S8pL/cGy20wkBQ Hk7ItDfvypvMCGT8xJ+2+oxy2UgdZsyNA2PJUPPPty4hUUabz5VE+ht6wPF4Nlr2fIsb WfUlF5J/UCdp5nK6bEjGu5a1zXqEDQIYA9dMsbrF6mibWyoASfPRitr/j9vmGn1RegE7 xMprstlBD1qkvc5TCoKGBUhqoPigbE+QxiRRKv0XVznq3py3kaJSsb/JT/saFRgtHnxE WqTlHWurSFGvq0XPQWfKDIq5fEW5Ss6EkzQ2LskdSBUG1s8oVv2t6MDmFZve6saT5AS8 JjFw== X-Gm-Message-State: AAQBX9dduHXJnbDF7AU4LdJh7/vfEdfT+r5jnGJZEovOnA1l1ul+lukx xObTW0IOwWynjYwG84U6o1I9HaxDFoWBoFN6C8VfTQ== X-Received: by 2002:a5d:6182:0:b0:303:2702:6d66 with SMTP id j2-20020a5d6182000000b0030327026d66mr7170455wru.63.1682314886134; Sun, 23 Apr 2023 22:41:26 -0700 (PDT) Received: from stoup.c.hoisthospitality.com (cust-west-loneq8-46-193-226-34.wb.wifirst.net. [46.193.226.34]) by smtp.gmail.com with ESMTPSA id j22-20020a5d6e56000000b002fbb285b01fsm9997852wrz.25.2023.04.23.22.41.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Apr 2023 22:41:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, git@xen0n.name, jiaxun.yang@flygoat.com Subject: [PATCH v3 34/57] tcg: Move TCGLabelQemuLdst to tcg.c Date: Mon, 24 Apr 2023 06:40:42 +0100 Message-Id: <20230424054105.1579315-35-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424054105.1579315-1-richard.henderson@linaro.org> References: <20230424054105.1579315-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x429.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 Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- 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 */