From nobody Sat Jun 29 02:54:21 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610052271; cv=none; d=zohomail.com; s=zohoarc; b=al9nCbLeu5Jxj1QYZIzqa4JfL5u0qCx4YiCa4egTaK4tzDcaXo4tucu+Tz692IvpiYdIurhyB69Hv0cXvLm5wQoLwwZt7+I4vVYzRygJujr9cw4fLsKkSa0IFo39f0bTnGnnTfjURFTFwORe49MzrPkCaAdxRMc2rFxEWwt/Iio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610052271; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/axlOMlK9mP+17efpjcCMV26tl84bU61W0fMNh0sRdI=; b=YKeLu9yuMTKOq7iU46Rr2PrO2YYDVVnjq1s65IO0XM3mUHXNIR0MelaymVgDCADHFPYwWsBQsKVFeiKd1ljwaJOoDo+8cYTse+QZ5IHrWPmQINMj/xhPqyXbR97ThGR8wtLQgiSz1wEo0MtBcn/Et7SkVOhCVSinLMvND7V1VpE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610052271789269.88880680790555; Thu, 7 Jan 2021 12:44:31 -0800 (PST) Received: from localhost ([::1]:47542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxc90-0003n7-Nv for importer@patchew.org; Thu, 07 Jan 2021 15:44:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxbhf-0001fT-Pw for qemu-devel@nongnu.org; Thu, 07 Jan 2021 15:16:16 -0500 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]:46473) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kxbhd-0001nk-Mw for qemu-devel@nongnu.org; Thu, 07 Jan 2021 15:16:15 -0500 Received: by mail-pf1-x433.google.com with SMTP id s21so4543457pfu.13 for ; Thu, 07 Jan 2021 12:16:13 -0800 (PST) Received: from localhost.localdomain (rrcs-173-197-107-21.west.biz.rr.com. [173.197.107.21]) by smtp.gmail.com with ESMTPSA id v6sm6516265pfi.31.2021.01.07.12.16.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 12:16:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/axlOMlK9mP+17efpjcCMV26tl84bU61W0fMNh0sRdI=; b=Mvlb87Ax8F1pSxrYId/kf8csdowCkIiQ7FVPeo2DOX5HpaxtWP3G/vRT2SN/uEN4D7 XgKtln3HncNPkltdkVomAdWVK+/rRIwQSJqkaNtagVBsaw9b+E5v6/YUhqH/8e5a1PDs d2VBq5DsCMdJOD5WNXddSlqhtoiwOnluEy2VZcUP/gcTlCR+CFNiXnWnWbfly2CWeIHU fIg5pulSgGs0seIHDhRM4nt7n9s4fvq/OMm88uAIdGJkFlqwO3udeGcFVuTAW9mYJBQR UKuwUaADdgN6nOTNNHJdW2C7rWWKDOmVSGCRPRDBPBWnqInFyaXS73VaaZnsuVmwD/OU Osig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/axlOMlK9mP+17efpjcCMV26tl84bU61W0fMNh0sRdI=; b=eevCAkRkfS6c5jn8fLKhfnsIN5Ny/w2bXj5wY4ny/22qzFhl6UVjRwTj+VBj9nOOjb 8R5H4S/9M7/CRqNnXPpshjH1JzDkt0PBnQg2Q4uGYOBDjdAwAANERcUYfuZnYPcpWkb5 H7I3a76ENvT8J6nA5fwlvQXgLIczazWm+6ZKFoQ11BYrfSoWvgr7L1YN40tmr/rKkrtn Fq1dySuznsAEHvwsMZQ+E1k3A2PQpZlWTpGx4JtVzrMx2qbY9599L+wvMSMP4fM0VghQ 0h1o4NHJ6ZrN1WK6MIT5t+oWow4r7URomMZ1c8GaNCtOaC423qhwbjmVRXcD/bLZAtzm AbYg== X-Gm-Message-State: AOAM530kVn8HG1mBZR1Lc7n3ywkP4kq4xZBINObVbNx04AA3XfVSC34c 7hls3RhktS/yLQlI1vz5YdxTu7oZnHHD+A== X-Google-Smtp-Source: ABdhPJwMAjCY5wI7fLpbpJq3KudYM+q8VeDSuosH5/u4sYbbuKSOU82kpHsP8yDx4JkuKJuXg+bL5w== X-Received: by 2002:a05:6a00:a88:b029:19e:4ba8:bbe4 with SMTP id b8-20020a056a000a88b029019e4ba8bbe4mr3675085pfl.41.1610050571831; Thu, 07 Jan 2021 12:16:11 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 47/47] tcg: Constify TCGLabelQemuLdst.raddr Date: Thu, 7 Jan 2021 10:14:48 -1000 Message-Id: <20210107201448.1152301-48-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210107201448.1152301-1-richard.henderson@linaro.org> References: <20210107201448.1152301-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x433.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: , Cc: peter.maydell@linaro.org, Joelle van Dyne , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Now that all native tcg hosts support splitwx, make this pointer const. Reviewed-by: Joelle van Dyne Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- tcg/aarch64/tcg-target.c.inc | 3 +-- tcg/arm/tcg-target.c.inc | 3 +-- tcg/i386/tcg-target.c.inc | 3 +-- tcg/mips/tcg-target.c.inc | 3 +-- tcg/ppc/tcg-target.c.inc | 3 +-- tcg/riscv/tcg-target.c.inc | 3 +-- tcg/s390/tcg-target.c.inc | 3 +-- tcg/tcg-ldst.c.inc | 2 +- 8 files changed, 8 insertions(+), 15 deletions(-) diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc index 0b7eb09a27..ab199b143f 100644 --- a/tcg/aarch64/tcg-target.c.inc +++ b/tcg/aarch64/tcg-target.c.inc @@ -1636,8 +1636,7 @@ static void add_qemu_ldst_label(TCGContext *s, bool i= s_ld, TCGMemOpIdx oi, label->type =3D ext; label->datalo_reg =3D data_reg; label->addrlo_reg =3D addr_reg; - /* TODO: Cast goes away when all hosts converted */ - label->raddr =3D (void *)tcg_splitwx_to_rx(raddr); + label->raddr =3D tcg_splitwx_to_rx(raddr); label->label_ptr[0] =3D label_ptr; } =20 diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc index d6cb19ca9f..0fd1126454 100644 --- a/tcg/arm/tcg-target.c.inc +++ b/tcg/arm/tcg-target.c.inc @@ -1340,8 +1340,7 @@ static void add_qemu_ldst_label(TCGContext *s, bool i= s_ld, TCGMemOpIdx oi, label->datahi_reg =3D datahi; label->addrlo_reg =3D addrlo; label->addrhi_reg =3D addrhi; - /* TODO: Cast goes away when all hosts converted */ - label->raddr =3D (void *)tcg_splitwx_to_rx(raddr); + label->raddr =3D tcg_splitwx_to_rx(raddr); label->label_ptr[0] =3D label_ptr; } =20 diff --git a/tcg/i386/tcg-target.c.inc b/tcg/i386/tcg-target.c.inc index 91400d575c..46e856f442 100644 --- a/tcg/i386/tcg-target.c.inc +++ b/tcg/i386/tcg-target.c.inc @@ -1795,8 +1795,7 @@ static void add_qemu_ldst_label(TCGContext *s, bool i= s_ld, bool is_64, label->datahi_reg =3D datahi; label->addrlo_reg =3D addrlo; label->addrhi_reg =3D addrhi; - /* TODO: Cast goes away when all hosts converted */ - label->raddr =3D (void *)tcg_splitwx_to_rx(raddr); + label->raddr =3D tcg_splitwx_to_rx(raddr); label->label_ptr[0] =3D label_ptr[0]; if (TARGET_LONG_BITS > TCG_TARGET_REG_BITS) { label->label_ptr[1] =3D label_ptr[1]; diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc index 18fd474593..add157f6c3 100644 --- a/tcg/mips/tcg-target.c.inc +++ b/tcg/mips/tcg-target.c.inc @@ -1283,8 +1283,7 @@ static void add_qemu_ldst_label(TCGContext *s, int is= _ld, TCGMemOpIdx oi, label->datahi_reg =3D datahi; label->addrlo_reg =3D addrlo; label->addrhi_reg =3D addrhi; - /* TODO: Cast goes away when all hosts converted */ - label->raddr =3D (void *)tcg_splitwx_to_rx(raddr); + label->raddr =3D tcg_splitwx_to_rx(raddr); label->label_ptr[0] =3D label_ptr[0]; if (TCG_TARGET_REG_BITS < TARGET_LONG_BITS) { label->label_ptr[1] =3D label_ptr[1]; diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index 5f191c03d9..19a4a12f15 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -2001,8 +2001,7 @@ static void add_qemu_ldst_label(TCGContext *s, bool i= s_ld, TCGMemOpIdx oi, label->datahi_reg =3D datahi_reg; label->addrlo_reg =3D addrlo_reg; label->addrhi_reg =3D addrhi_reg; - /* TODO: Cast goes away when all hosts converted */ - label->raddr =3D (void *)tcg_splitwx_to_rx(raddr); + label->raddr =3D tcg_splitwx_to_rx(raddr); label->label_ptr[0] =3D lptr; } =20 diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc index c76dc9f9ca..c60b91ba58 100644 --- a/tcg/riscv/tcg-target.c.inc +++ b/tcg/riscv/tcg-target.c.inc @@ -996,8 +996,7 @@ static void add_qemu_ldst_label(TCGContext *s, int is_l= d, TCGMemOpIdx oi, label->datahi_reg =3D datahi; label->addrlo_reg =3D addrlo; label->addrhi_reg =3D addrhi; - /* TODO: Cast goes away when all hosts converted */ - label->raddr =3D (void *)tcg_splitwx_to_rx(raddr); + label->raddr =3D tcg_splitwx_to_rx(raddr); label->label_ptr[0] =3D label_ptr[0]; } =20 diff --git a/tcg/s390/tcg-target.c.inc b/tcg/s390/tcg-target.c.inc index b3660ffedf..d7ef079055 100644 --- a/tcg/s390/tcg-target.c.inc +++ b/tcg/s390/tcg-target.c.inc @@ -1587,8 +1587,7 @@ static void add_qemu_ldst_label(TCGContext *s, bool i= s_ld, TCGMemOpIdx oi, label->oi =3D oi; label->datalo_reg =3D data; label->addrlo_reg =3D addr; - /* TODO: Cast goes away when all hosts converted */ - label->raddr =3D (void *)tcg_splitwx_to_rx(raddr); + label->raddr =3D tcg_splitwx_to_rx(raddr); label->label_ptr[0] =3D label_ptr; } =20 diff --git a/tcg/tcg-ldst.c.inc b/tcg/tcg-ldst.c.inc index 05f9b3ccd6..c3ce88e69d 100644 --- a/tcg/tcg-ldst.c.inc +++ b/tcg/tcg-ldst.c.inc @@ -28,7 +28,7 @@ typedef struct TCGLabelQemuLdst { TCGReg addrhi_reg; /* reg index for high word of guest virtual ad= dr */ TCGReg datalo_reg; /* reg index for low word to be loaded or stor= ed */ TCGReg datahi_reg; /* reg index for high word to be loaded or sto= red */ - tcg_insn_unit *raddr; /* gen code addr of the next IR of qemu_ld/st = IR */ + 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; --=20 2.25.1