From nobody Fri Nov 14 16:56:40 2025 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=1760898573; cv=none; d=zohomail.com; s=zohoarc; b=Aau+9Mjb799pwv1niU3lT1yzsY6AAewaG+di7G1yesQsOXBgcfP7y9uNobDDrm3U4P3/3es3w4WtYclEb/ezR5c9fh0zj/7+Q/oKtWMcZVde6I/UF3HL/+PA4F4YYqb7oex9vFezNLdYWwqOoWzSTwNmT0wc+VM1IP/BsSo/jGA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760898573; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=llxq6qfqlHF5luVrkm+L5VreeqcrRVzoabCRD01R3N4=; b=lu34kEQOBsQg5nw0Rm/6zS9CongkPFMrIumsuX+35wnX4JqmJZ6+D6hwouenAIlWXTsTyIj0TTIqFgufjeRr0r+NHnQLWXdyh8mRaHzy7wW4Yhn+bEK7m4b26Mfi1L2GDCMy8hNXpKnuJ3RNoasoOpJ9/krqzG1xcevjSFCzHZs= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176089857354534.616686860022924; Sun, 19 Oct 2025 11:29:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAY9B-0005BY-HE; Sun, 19 Oct 2025 14:28:49 -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 1vAY93-00058X-SB for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:43 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAY90-0000ZC-M2 for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:41 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-2909448641eso35044915ad.1 for ; Sun, 19 Oct 2025 11:28:37 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29246ebccf3sm58985775ad.1.2025.10.19.11.28.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Oct 2025 11:28:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760898517; x=1761503317; darn=nongnu.org; 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=llxq6qfqlHF5luVrkm+L5VreeqcrRVzoabCRD01R3N4=; b=cBSvh2UnyEPBcyKxz9omWEBIL8Ci4VXD9kDQDCfUwqEv6l4TzoM7HBZ5vg2MZI+6XH fnPbpx+ZnlWTSeC/LHSt3XiaWhAXiGJTEw195O3Ga7QxJD6UvQjmb+s3KkWea0wIW1iG cieb6e5H7vpPJDyNMUMDwZIX4WGA0hwIxN9BfDviq7bNBM+9VSRIYMJF4fhqF8ZUKD7t daXHr88s8vX5avnV+VT1WUYAfd1beC0sYZxm9tFjXU3f813soeGtGO5kHmOYQ/c34BPy SxIPnpdo+xWx4Ahbfh13uBlS1v7B07i5VAOV++Zr42lcNcy7qFAiWIX2xvEn/2B4Xa8T lLKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760898517; x=1761503317; 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=llxq6qfqlHF5luVrkm+L5VreeqcrRVzoabCRD01R3N4=; b=q4ghtNjT6olKVEyyiytvXqWnKBlrLzr/nn0140XmX7tqU/divtJ74UCbRsjenlNDac XiB4Uk4ZfCCJf3P8HIdJ1AgArhOzeycyIqZj+JoNF8E1o39WI4tT02Cwku6fE3xe03qj /8Hx8GmPK9ROwhOj4Xsu8UjPLh91PbKpn0C+FL7acTVS/BtAfel8lHGgBG/UuQz3JKCX 8HgzzfDQ5YVilP0UgtLcz/osgzn1DP2QhVIPoiQcwF/FygV/uNZP2i2TiapnudRbLms8 IDhgpNyS8XFRHv+s0tngO3zxKJpc+G2KMoAn7H7MWxNFQNxQu9U3BchX1ap5rYTg0YXD lpBw== X-Gm-Message-State: AOJu0YwvGpw0L5oFjABMDfvH/IyQxyDyzW6w5nSLkf0v1ET2gyQZv12y BOH+r11jKDQq8FHZAAPhqVk5WCfnKIqxszgo/NhkOlUqkd97uhLiMEuwo9EiSFAlXlAb531vGGH 9/bhKTUY= X-Gm-Gg: ASbGncugFuhtIiCgFsAFv9oqo/jzMsbr38M8xFqV/WqyPrmBiWwxojuGcrRcTfzgvgf k6yVECaiRmM3xJDbZTq18y8Z77P25GZ6gCGLPuMKBbDRCITugYq4HRLIMkfDIVJY7VXMmgAYA7O JvR51URZP9EI+mR+pD7JDptxzx4ri8hAJ/D2yWpxk4BpwiOLA73E3DjtntKl9YaSXCs4+Voj/HU YeFqu9Ga8VDxNnaA3nJKEW9bqcSuZHjQTjYB7He6ucetZH9l/7l+spBEaRxTBmgxlYP6m41EhpC BFXXF8MFdnFQyV2G+yDsGBzYtGjfMaJbVnEn2jCI3LDFhYZcDYwS/kLCQpkZV9anat/gYFj0qSt GcSXhY/a2ISGQNDbfIC069t4F5MJRl0edn2tBjtWgowLDbmtneNVuKcFcTJYxF+0srf0A0f9ueH MMsihQ41tgpQiopBy0 X-Google-Smtp-Source: AGHT+IFOlq3mi7jtou9ldBF1RgvU6BVNJr0IRHHU/F6+ituaEKKiHa2DH7iNdQLLKe9CIiAuMPtQag== X-Received: by 2002:a17:903:2310:b0:290:ad7a:bb50 with SMTP id d9443c01a7336-290ad7abe3amr146387505ad.27.1760898516478; Sun, 19 Oct 2025 11:28:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 1/9] gitlab: Stop cross-testing for 32-bit MIPS hosts Date: Sun, 19 Oct 2025 11:28:26 -0700 Message-ID: <20251019182834.481541-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251019182834.481541-1-richard.henderson@linaro.org> References: <20251019182834.481541-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::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760898576531154100 From: Philippe Mathieu-Daud=C3=A9 32-bit host support is deprecated since commit 6d701c9bac1 ("meson: Deprecate 32-bit host support"). Next commits will remove support for 32-bit MIPS hosts. Stop cross-building QEMU on our CI. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson Message-ID: <20251009195210.33161-3-philmd@linaro.org> --- .gitlab-ci.d/container-cross.yml | 6 ------ .gitlab-ci.d/crossbuilds.yml | 14 -------------- 2 files changed, 20 deletions(-) diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml index 8d3be53b75..0fd7341afa 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -52,12 +52,6 @@ mips64el-debian-cross-container: variables: NAME: debian-mips64el-cross =20 -mipsel-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-mipsel-cross - ppc64el-debian-cross-container: extends: .container_job_template stage: containers diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 8ff0c27f74..99dfa7eea6 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -68,20 +68,6 @@ cross-i686-tci: # would otherwise be using a parallelism of 9. MAKE_CHECK_ARGS: check check-tcg -j2 =20 -cross-mipsel-system: - extends: .cross_system_build_job - needs: - - job: mipsel-debian-cross-container - variables: - IMAGE: debian-mipsel-cross - -cross-mipsel-user: - extends: .cross_user_build_job - needs: - - job: mipsel-debian-cross-container - variables: - IMAGE: debian-mipsel-cross - cross-mips64el-system: extends: .cross_system_build_job needs: --=20 2.43.0 From nobody Fri Nov 14 16:56:40 2025 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=1760898600; cv=none; d=zohomail.com; s=zohoarc; b=FEAdLJXGiJ9eobCdDV/VPVd6xGEeG259HUHrTE59JaUmvdeI9Puk+qufm/aDe4UIOeVgpKQN5pwlVuFTqo+nKcACbWkc566uBFCafb7EjQnlrOouzlhBbB8vxbR6z+aJkPMLwY/k9b/oNOK4aRV8PRsRndXdycH8BUw0js0JJBg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760898600; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=EAYhbIEVnqIpv3UM3lZTlnJP6T433ZQvfgE/KFwrBAE=; b=QFzmr0xQuSkPxP0cySGG0ZEOBzj3HQdJvpcdbi5MNIEGTRCmwkzSlcleeBRiM2xM+vfY0Vl0LoikTYYiJVXTN1JWg8RL2pFUUOISmYRNExlqYaOB6J/BYErsC2tt4OYuM71ziUWrAdvL602KlUuzSQqykFJuyEAOikDQWiGdj0U= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760898600866602.1912806799785; Sun, 19 Oct 2025 11:30:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAY97-0005AO-Rq; Sun, 19 Oct 2025 14:28:46 -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 1vAY95-00058w-NJ for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:43 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAY91-0000ZH-Lv for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:42 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-2698384978dso26385835ad.0 for ; Sun, 19 Oct 2025 11:28:38 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29246ebccf3sm58985775ad.1.2025.10.19.11.28.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Oct 2025 11:28:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760898517; x=1761503317; darn=nongnu.org; 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=EAYhbIEVnqIpv3UM3lZTlnJP6T433ZQvfgE/KFwrBAE=; b=RQfI8GmuC1/KpsGzCsTsqWLPbbbuIzgVRRdXpQHL11KsKOm0sYLAvK4ZqBui/d3qpG nBrfGewY1M2AJqnsoKQUXOyoXWdYw2seNzvXqS5HntidQP9nEiqBazKkwkupjRS3m0WF +wuhRR+Dc7etZCKrC/SmAFsdMHq6v7IC+y5p2MGOtdCcyR/KHSbGsKmVVgC6LGnOYT9g 031ZR4Vif1X7POJiFFRgwSyJwpckrM80MOmotqq4DSz1m+jxP5XFxhRf+6jsdr9pKReF ybro87cECm6nKOp4eutlU3Y8Kk1AVB8HRuk0G2dQkB2A7dKPbjzGclJSyGtmmB1mDG0o LNdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760898517; x=1761503317; 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=EAYhbIEVnqIpv3UM3lZTlnJP6T433ZQvfgE/KFwrBAE=; b=bSu8cgV7/YUc5aCpRCIfwBKEButMFkF1jY+cl2/3qsoor7Ey515wnBlkLnqHtX2mAs ba3bIDbmgjenioMg/+CxiIPDpB8cDgk9ro3dQwgIsw6lAPBUQzJr0j+KGoFnzKdyIFbn EPvPsQNfwTINuY+IuiOxN1oragZ3/0jFgq2V1gMaHI+Ei2lVcV1NYpWU6/eXWXdgL0yR WisuEuaStjPOkzYmELIQbvIpEUPayH6fkEaB+jVk/+FITemaotR2anfYjtlIlx0Punb5 l2AW+0EYa2Ujzmuv/jfr5Q6oVEpVfnbnEojbulhdAKYtVxCIa8AALsxoYRGVh6+hE8On Z6NA== X-Gm-Message-State: AOJu0YwjU4hNX6TqTe6R/adIW2hmOAM39dq3j54+KwXq+BRVhpMDFplU YufgO9nmz1kQqKgK8LcaPuwcLpL7VvLKVmp1hpKSbZYvA6RCSMygH2gRYIcq3vRy0r6SyNi0fd7 g6HqXkV0= X-Gm-Gg: ASbGncvGovPo54zottkpLxHneXiAxlshMLkhDzvTXOOOxZfMGepI2JQP6eSeCPHcjV4 wBskyGaQxKERzrFnj7A4logvlV3da1tUMP5sPXqdKF4DkTicziT3lH07ewgDuVKri+uoTEPfxai oJJpt1rTYtzHgzO/Od7PQPKRXoOkWIA0py2gUmbV4pyFp2EY/eoHlHOrpQnz6Y2ddIeoQM7ku2v LGVpOlMIxmsjIeIINqEx3BIJVG7IAaLqd+DDW8eQo4bv1JbuiiMVH+omFJvkiOlyNmdxhS7teoJ 6okccjbQjKFRvZP7thNEQX0j+yrdJpIPbUFtRxod+wqGTXo2tkEosz3rHtuk9vo6KqH2eyOYCnB IURMAEpcMLY10rMQOJTDv1mxpZwl3csyXf1slIvZmDBFcVrc9Eo9P8q6ZiGXG6XvrdS5kQSn+rO 2O2kNxBW/RG59Sereq X-Google-Smtp-Source: AGHT+IGZye/y9cvU3r+6Vk8P00+ttuOfroBP5EjFw/lvymGB3T04YVW53B/0W72rWissYo+uMd77yA== X-Received: by 2002:a17:903:2306:b0:240:9dd8:219b with SMTP id d9443c01a7336-290cb65b6camr156117885ad.49.1760898517280; Sun, 19 Oct 2025 11:28:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 2/9] buildsys: Remove support for 32-bit MIPS hosts Date: Sun, 19 Oct 2025 11:28:27 -0700 Message-ID: <20251019182834.481541-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251019182834.481541-1-richard.henderson@linaro.org> References: <20251019182834.481541-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::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760898608862158500 From: Philippe Mathieu-Daud=C3=A9 Stop detecting 32-bit MIPS host as supported, update the deprecation document. See previous commit for rationale. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson Message-ID: <20251009195210.33161-8-philmd@linaro.org> --- configure | 7 ------- docs/about/deprecated.rst | 13 +++++-------- docs/about/removed-features.rst | 6 ++++++ 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 461b53dd60..8263f81370 100755 --- a/configure +++ b/configure @@ -404,8 +404,6 @@ elif check_define _ARCH_PPC ; then elif check_define __mips__ ; then if check_define __mips64 ; then cpu=3D"mips64" - else - cpu=3D"mips" fi elif check_define __s390__ ; then if check_define __s390x__ ; then @@ -473,11 +471,6 @@ case "$cpu" in host_arch=3Dmips linux_arch=3Dmips ;; - mips*) - cpu=3Dmips - host_arch=3Dmips - linux_arch=3Dmips - ;; =20 ppc) host_arch=3Dppc diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 98361f5832..dacf2882e4 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -172,17 +172,14 @@ This argument has always been ignored. Host Architectures ------------------ =20 -Big endian MIPS since 7.2; 32-bit little endian MIPS since 9.2, MIPS since= 11.0 -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''= ''''' +MIPS (since 11.0) +''''''''''''''''' =20 -As Debian 10 ("Buster") moved into LTS the big endian 32 bit version of -MIPS moved out of support making it hard to maintain our -cross-compilation CI tests of the architecture. As we no longer have -CI coverage support may bitrot away before the deprecation process +MIPS is not supported by Debian 13 ("Trixie") and newer, making it hard to +maintain our cross-compilation CI tests of the architecture. As we no long= er +have CI coverage support may bitrot away before the deprecation process completes. =20 -Likewise, MIPS is not supported by Debian 13 ("Trixie") and newer. - System emulation on 32-bit x86 hosts (since 8.0) '''''''''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index a5338e44c2..53829f59e6 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -896,6 +896,12 @@ work around the atomicity issues in system mode by run= ning all vCPUs in a single thread context; in user mode atomicity was simply broken. From 10.0, QEMU has disabled configuration of 64-bit guests on 32-bit host= s. =20 +32-bit MIPS (since 11.0) +'''''''''''''''''''''''' + +Debian 12 "Bookworm" removed support for 32-bit MIPS, making it hard to +maintain our cross-compilation CI tests of the architecture. + Guest Emulator ISAs ------------------- =20 --=20 2.43.0 From nobody Fri Nov 14 16:56:40 2025 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=1760898593; cv=none; d=zohomail.com; s=zohoarc; b=UuiJXJBm7isgFeGXIAuCWbBNYWk7hFYfrPXHYE31y5m7qonugvO8vir2/AXv0ohnsObgKw77jf74+7H0qILmw6y7oaAg4k6njMd4vx3FadLzotLjZBjvSRC2wgSwDDB9Idgxbl4BmR62KnAYD0N0X865fUtOsrHFaXQaf8klotg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760898593; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+w5No0Ep1LX3XR7FDPjD+GZNr16ogOShPRDBWgvVMw0=; b=Q3jX714eQoTSeQntz+RDoDWECPn0kWv4WM2aoA2WrJzhv5brmMlwlcEAivAm8ojnOtZLacvIPU1Q7LPcguu1AuTxJoLBdc2sMozJjaAn3MPDK3kP6TX8vbawJCMUQzbjkQkDYDgLdPwJgpsSLpEyvnfXt+tzg+9vSFh1A9LHxA4= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760898593607268.66524682341867; Sun, 19 Oct 2025 11:29:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAY98-0005AU-KA; Sun, 19 Oct 2025 14:28:46 -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 1vAY95-00058v-ND for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:43 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAY91-0000ZL-Jh for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:42 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-26e68904f0eso36671455ad.0 for ; Sun, 19 Oct 2025 11:28:39 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29246ebccf3sm58985775ad.1.2025.10.19.11.28.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Oct 2025 11:28:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760898518; x=1761503318; darn=nongnu.org; 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=+w5No0Ep1LX3XR7FDPjD+GZNr16ogOShPRDBWgvVMw0=; b=bDt4+SzPPKGx2QR27QPUuCHvIATmg/kKmraQMhn+LFRBZGurNVTCwZEmYFc9FZy3vJ gDcDlM2Bh8dtw7Ef8yZuRUAKjSTLw24Fy8UY3s5yZlclp+ZyjDb7k4qOsLUk9fIoe3f+ qHEu8ekHSwQXg1Ad1elzkj+wOhCrrSo03YqeEw6SShY78T2r87RMaIQeTPseHsu+hoM3 qRaefrNpfz8gLJm0Rc/QamE3+DlJ9ojFf4eEpyFKL5Lwy/rfNZWHY+wZ1oof6s9jbhMv CUf00i80fu7YPgjMGhS0fxgAPbCHgJ8imBlIffhb5frS0vq0QIvdv+1kI4EtRYYriUyi zOng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760898518; x=1761503318; 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=+w5No0Ep1LX3XR7FDPjD+GZNr16ogOShPRDBWgvVMw0=; b=Qa/tyzJDCl41Rjrinf/EleQaTXByXXLMzoy29wDHr6qffhvrUsa52LSrxNeGdgJxOT 2sRGUTWrkHZ2q3oYA34v9o/eOs1WocbNTX155HcJW062TzeP4Ylq/2/pnINIpNeuZlbq fiDSHQD0kmup0V6SvVbVFxjj/O47VSv3SOt3XvIpC59fUvKF+GxPH2VWZp2xzx+a58Ys +8fyBe7sdVZPUVfpjzcG1bfV+mBzsKg9M2RpBSzKFcyys3P2WL8OTL1t3Sh1+aMQSONP BXrqXmAtCiPRpZIEt/GrI5vq3/19Y0W1p0JdV95jI7LPOV9TXvIG22zd/r4kiD6wvD8G 5t9g== X-Gm-Message-State: AOJu0YxZ722cO7+jGxd2pFVhATzJc0CNwU6Zh0GnOL9WcOYsU6fbS66u Y8xtnNh6AH9kYqbuiiXnAC+9Q1ORkFCQfyQ34n+S/SM946TfafcRr/WCLc0BQdBmHw/vO+7901d xQp71Fwg= X-Gm-Gg: ASbGncvBwV6YZHor1FNFICRNamQ071r/nKSVIK66LYMiu2lmNeBsAN81p1s11/n0OXU t8wEJX/WLYcHUxTRbSTHtm5m+jq3t3oslzFEn59qGP4Ob8CGY+jhbUfda8pj58ooEU4lREcCJOE BxPQJrsQ9p5FlErEhzalC1IaNEnhKn7UIUktuv8HBFrQl/scIIJnXiyYrwCUnWAjTnWI+Cea0Cj mlJ+dtOFNVCsi4GS+HJDV9QMU+fcoFR8gaA5PXHpPUu0H0G9Rw0LOGwoux5U3h5g2qAmVhR1+EU jKeBTmEH1XR7Gedc71v/5llgxoIpUSoRtNsbzoZoTSuy9HhjTLBHn/IMG+FW3yK1SBbh9RNIMLT iC5WQ/PUgc5qhYJS/4whLNU5HO+pdHVNf55PqKtGX4vROah96daJ85M2UodeDyPeRYHLYX8LQH1 PBH1sxL6BiukuPDjTu X-Google-Smtp-Source: AGHT+IGh+PAbDy2Xo7dzm6WOBjAnX4qq9nK8WzFXW4AAz/ilcDbOeejwCNOLBqUZRkpYgiZI7FHwdg== X-Received: by 2002:a17:903:46c7:b0:28a:8ae7:4034 with SMTP id d9443c01a7336-290c9cd4b1bmr129232225ad.25.1760898517856; Sun, 19 Oct 2025 11:28:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 3/9] kvm/mips: Remove support for 32-bit hosts Date: Sun, 19 Oct 2025 11:28:28 -0700 Message-ID: <20251019182834.481541-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251019182834.481541-1-richard.henderson@linaro.org> References: <20251019182834.481541-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::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760898595688154100 From: Philippe Mathieu-Daud=C3=A9 See previous commit for rationale. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson Message-ID: <20251009195210.33161-7-philmd@linaro.org> --- meson.build | 2 -- 1 file changed, 2 deletions(-) diff --git a/meson.build b/meson.build index afaefa0172..c5710a6a47 100644 --- a/meson.build +++ b/meson.build @@ -295,8 +295,6 @@ elif cpu =3D=3D 'ppc' kvm_targets =3D ['ppc-softmmu'] elif cpu =3D=3D 'ppc64' kvm_targets =3D ['ppc-softmmu', 'ppc64-softmmu'] -elif cpu =3D=3D 'mips' - kvm_targets =3D ['mips-softmmu', 'mipsel-softmmu'] elif cpu =3D=3D 'mips64' kvm_targets =3D ['mips-softmmu', 'mipsel-softmmu', 'mips64-softmmu', 'mi= ps64el-softmmu'] elif cpu =3D=3D 'riscv32' --=20 2.43.0 From nobody Fri Nov 14 16:56:40 2025 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=1760898603; cv=none; d=zohomail.com; s=zohoarc; b=E08bbV0FsUT3TvOyYPVqQaap+caKV9WY4RCActAKcjzOk0Wwif+nOn7ATFjTPkViGZEiuJd6F71veTW77WkKLzzBqHGGFNfcrWSILfYAi9jvxhTOunW6wfqHJHflUWQGAgSmPh/6FX7DeCv6+R9oKaH2tNbcqRaXNMdCsDr3jvc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760898603; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+klw1qSTazAtmpLZcTp4xmaIM2w3pdybISxZjtuBn6w=; b=dNeDkPA5eDZ7wgznDjXpw1vesJiWs6BvaCY6OgQIyarK0pbRVom1m9cZtmj+qxTcU1xQADRY4yvMCTQ/mcszZGhB/odjiASxSJpZRN8FGdilkCDXSm7dmzCXnTOEhllGYNzh3gFj5iaZVB8kC4iS2G3kI8vXVGKQF/g50TpN5lA= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760898603313838.7011959716073; Sun, 19 Oct 2025 11:30:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAY96-00059L-PB; Sun, 19 Oct 2025 14:28:44 -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 1vAY95-00058x-N0 for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:43 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAY92-0000ZP-9S for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:42 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-290ac2ef203so34512245ad.1 for ; Sun, 19 Oct 2025 11:28:39 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29246ebccf3sm58985775ad.1.2025.10.19.11.28.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Oct 2025 11:28:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760898518; x=1761503318; darn=nongnu.org; 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=+klw1qSTazAtmpLZcTp4xmaIM2w3pdybISxZjtuBn6w=; b=HkKKXcCzFnyf6lS070d07NX716Z4wqaZvs1C29hYLKDX5+b9iXbH4PtSHxIfERvkcF W451kuy4wVIka200PiXR+/DboRbbt1U0nJtoMxLXYHQYMgWZzkCvDBIoXMIV5MF61nsi eMrk59MDkYqk2HCuh0mfWF4i3NgkTUzfavGDkQdVoEHYo5lbNjRcj4oe/ht0FegnN2qd 7yfqZBz4y7UfiXUZs/pcRVp5OLnOmsJzxlCXxgtHpiNfsA8GEXTwDUbW6Uoyn41Hxm5C 1TwvUlUNGl0RNGN6Aa+HtnifS5KtTOjbXI+k8tAjoQkBy4yIewtwAU1qxa/Xineb1Ix3 cTcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760898518; x=1761503318; 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=+klw1qSTazAtmpLZcTp4xmaIM2w3pdybISxZjtuBn6w=; b=eLtMk7+y1Sll5vwcIK5NoJDUuOY+HdMBlEACmp3ZSO1ufDJViLuVBqzBOEbNWCvyCm l1sji5mEy5m1U07toSfjnaH3sCqLBY+tSP7JFhA+qpk+4hC+/owKCBOwQhr/oSlzG4yc NHM4DiSZsG0EI1tqzyG6xwrjXPD+yEe6OTl7ISPr8q1CUw5vfc/hEi4MF2H7bEATxGbm HCCdHx+pCzAwTGjKG7pQQTCP4PMedO1K8VLIRZ4RkToUys2qNe/z5A8P7fACIwcevy7p w3Ve+wNw7Lrc6d3eHr7VtV7xOn4oqwH3CR0TwKfm3y9q17bU/G4EbKG6sNvJfA6RHgIi ZPmA== X-Gm-Message-State: AOJu0YzkopU14EUqW2J7o+l6nZGoT41khoXvuTWcbLfXRSLykJ2APa2y uetjUItyqg0p1BqViYEqe0iS6gvsMGSnCYMObc7ZFVaSdEKMJgx3xFUbMT/RjkSQCzubKsaUAxW 4udYuv3M= X-Gm-Gg: ASbGncvuewNYUByR+DPMBNprA5DFn8F0TP4GbaXmtNwVOBOS3uW1IYV/neNfjHRUmj/ uB8Rv6p+3eOrrNU2ndzS3y4dSUVWKylmeCbjiXLrp+rEUT7WMwzdCTP8Qvlxe+m0G97rFCEezgO iVwMsnDZZpmKRUW7w+7iypWjgTKgSNwN9J+FEhalDa+Xu/+k7in5BnOz7McRCnrIzneoQDDWM03 ZpkXJHTE3vSjp0TStw4rRgpHWlbrR2Ce91va0Ccuy2WD/+TvciogwDKsd5jMbk2W0i0Uyvrmq96 b7zSshCzY0ZdxOF8R0EkAv2Jr+/OFhtFYhU4lejgZBHxcDDcQs/beIDYO35PzRn1dCjTQ1dZSnj d9JTM7nXhix6SFEWHdIetKBMPL7/kjbsUZ9a3ny3fffzkIuaHzkKqAMM6s2gsr36WtWNE87/1C7 ltG6dCxcfNVxU75SyO X-Google-Smtp-Source: AGHT+IGo+UP26dFHhUxD2YZmI8pWarIH54DEWupyCvV743y98VsXi1k1YlDHtEH9EBR/kvnKGowZkQ== X-Received: by 2002:a17:903:2408:b0:27e:ea82:5ce8 with SMTP id d9443c01a7336-290c9ca6afbmr141854675ad.14.1760898518513; Sun, 19 Oct 2025 11:28:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 4/9] tcg/mips: Remove support for O32 and N32 ABIs Date: Sun, 19 Oct 2025 11:28:29 -0700 Message-ID: <20251019182834.481541-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251019182834.481541-1-richard.henderson@linaro.org> References: <20251019182834.481541-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::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760898606977158500 From: Philippe Mathieu-Daud=C3=A9 See previous commit for rationale. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson Message-ID: <20251009195210.33161-5-philmd@linaro.org> --- tcg/mips/tcg-target-reg-bits.h | 8 ++---- common-user/host/mips/safe-syscall.inc.S | 35 ------------------------ tcg/mips/tcg-target.c.inc | 26 ++++-------------- 3 files changed, 9 insertions(+), 60 deletions(-) diff --git a/tcg/mips/tcg-target-reg-bits.h b/tcg/mips/tcg-target-reg-bits.h index 56fe0a725e..ee346a3f25 100644 --- a/tcg/mips/tcg-target-reg-bits.h +++ b/tcg/mips/tcg-target-reg-bits.h @@ -7,12 +7,10 @@ #ifndef TCG_TARGET_REG_BITS_H #define TCG_TARGET_REG_BITS_H =20 -#if _MIPS_SIM =3D=3D _ABIO32 -# define TCG_TARGET_REG_BITS 32 -#elif _MIPS_SIM =3D=3D _ABIN32 || _MIPS_SIM =3D=3D _ABI64 -# define TCG_TARGET_REG_BITS 64 -#else +#if !defined(_MIPS_SIM) || _MIPS_SIM !=3D _ABI64 # error "Unknown ABI" #endif =20 +#define TCG_TARGET_REG_BITS 64 + #endif diff --git a/common-user/host/mips/safe-syscall.inc.S b/common-user/host/mi= ps/safe-syscall.inc.S index 6a44614970..3b196cc634 100644 --- a/common-user/host/mips/safe-syscall.inc.S +++ b/common-user/host/mips/safe-syscall.inc.S @@ -30,15 +30,9 @@ * arguments being syscall arguments (also 'long'). */ =20 -#if _MIPS_SIM =3D=3D _ABIO32 -/* 8 * 4 =3D 32 for outgoing parameters; 1 * 4 for s0 save; 1 * 4 for alig= n. */ -#define FRAME 40 -#define OFS_S0 32 -#else /* 1 * 8 for s0 save; 1 * 8 for align. */ #define FRAME 16 #define OFS_S0 0 -#endif =20 =20 NESTED(safe_syscall_base, FRAME, ra) @@ -47,34 +41,6 @@ NESTED(safe_syscall_base, FRAME, ra) .cfi_adjust_cfa_offset FRAME REG_S s0, OFS_S0(sp) .cfi_rel_offset s0, OFS_S0 -#if _MIPS_SIM =3D=3D _ABIO32 - /* - * The syscall calling convention is nearly the same as C: - * we enter with a0 =3D=3D &signal_pending - * a1 =3D=3D syscall number - * a2, a3, stack =3D=3D syscall arguments - * and return the result in a0 - * and the syscall instruction needs - * v0 =3D=3D syscall number - * a0 ... a3, stack =3D=3D syscall arguments - * and returns the result in v0 - * Shuffle everything around appropriately. - */ - move s0, a0 /* signal_pending pointer */ - move v0, a1 /* syscall number */ - move a0, a2 /* syscall arguments */ - move a1, a3 - lw a2, FRAME+16(sp) - lw a3, FRAME+20(sp) - lw t4, FRAME+24(sp) - lw t5, FRAME+28(sp) - lw t6, FRAME+32(sp) - lw t7, FRAME+40(sp) - sw t4, 16(sp) - sw t5, 20(sp) - sw t6, 24(sp) - sw t7, 28(sp) -#else /* * The syscall calling convention is nearly the same as C: * we enter with a0 =3D=3D &signal_pending @@ -95,7 +61,6 @@ NESTED(safe_syscall_base, FRAME, ra) move a3, a5 move a4, a6 move a5, a7 -#endif =20 /* * This next sequence of code works in conjunction with the diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc index 400eafbab4..4d9d029844 100644 --- a/tcg/mips/tcg-target.c.inc +++ b/tcg/mips/tcg-target.c.inc @@ -26,16 +26,10 @@ =20 /* used for function call generation */ #define TCG_TARGET_STACK_ALIGN 16 -#if _MIPS_SIM =3D=3D _ABIO32 -# define TCG_TARGET_CALL_STACK_OFFSET 16 -# define TCG_TARGET_CALL_ARG_I64 TCG_CALL_ARG_EVEN -# define TCG_TARGET_CALL_RET_I128 TCG_CALL_RET_BY_REF -#else -# define TCG_TARGET_CALL_STACK_OFFSET 0 -# define TCG_TARGET_CALL_ARG_I64 TCG_CALL_ARG_NORMAL -# define TCG_TARGET_CALL_RET_I128 TCG_CALL_RET_NORMAL -#endif +#define TCG_TARGET_CALL_STACK_OFFSET 0 #define TCG_TARGET_CALL_ARG_I32 TCG_CALL_ARG_NORMAL +#define TCG_TARGET_CALL_ARG_I64 TCG_CALL_ARG_NORMAL +#define TCG_TARGET_CALL_RET_I128 TCG_CALL_RET_NORMAL #define TCG_TARGET_CALL_ARG_I128 TCG_CALL_ARG_EVEN =20 #if TCG_TARGET_REG_BITS =3D=3D 32 @@ -135,12 +129,10 @@ static const TCGReg tcg_target_call_iarg_regs[] =3D { TCG_REG_A1, TCG_REG_A2, TCG_REG_A3, -#if _MIPS_SIM =3D=3D _ABIN32 || _MIPS_SIM =3D=3D _ABI64 TCG_REG_T0, TCG_REG_T1, TCG_REG_T2, TCG_REG_T3, -#endif }; =20 static TCGReg tcg_target_call_oarg_reg(TCGCallReturnKind kind, int slot) @@ -1053,17 +1045,11 @@ static void tcg_out_call_int(TCGContext *s, const t= cg_insn_unit *arg, bool tail) * Note that __mips_abicalls requires the called function's address * to be loaded into $25 (t9), even if a direct branch is in range. * - * For n64, always drop the pointer into the constant pool. - * We can re-use helper addresses often and do not want any - * of the longer sequences tcg_out_movi may try. + * We can re-use helper addresses often; always drop the pointer + * into the constant pool. */ - if (sizeof(uintptr_t) =3D=3D 8) { - tcg_out_movi_pool(s, TCG_REG_T9, (uintptr_t)arg, TCG_REG_TB); - } else { - tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_T9, (uintptr_t)arg); - } + tcg_out_movi_pool(s, TCG_REG_T9, (uintptr_t)arg, TCG_REG_TB); =20 - /* But do try a direct branch, allowing the cpu better insn prefetch. = */ if (tail) { if (!tcg_out_opc_jmp(s, OPC_J, arg)) { tcg_out_opc_reg(s, OPC_JR, 0, TCG_REG_T9, 0); --=20 2.43.0 From nobody Fri Nov 14 16:56:40 2025 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=1760898573; cv=none; d=zohomail.com; s=zohoarc; b=Nes01Pfi+ic3hM6YBgZiD0d0MYJInjvVOgp8XOZb8jyf8Otf0bJ3MoXpZ6QtBvAcyuUr44BFGvMWJiCdHPW4ZPt09XIyT2KoqhMadFO5hRSxWUetYLi4FMeJuiu7dnxJ6R1t+A52FLYbm8fd+W5gJfkA8GDTYGFRHMgdR53NAdU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760898573; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zZPHG+rU99S38CzFhmJwBnWR59SoKAXZRpLng6h/VHA=; b=RxCbMzppVh38KCyZgAj+Ip7exfVoesWrb9oGO2ObgJtfldlAkLGt6bluVoyKapu5Nv23XhC0ULJGfikMPQqVfPEpi7HjrKcgxMVlFKHddv8ZLYXsE92R8s8NZqF0mhkEDykWxQ+hsXxhI5MGz7+WGh3SrxRiV1r6SwMLnMN/hSg= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176089857382434.73057605906172; Sun, 19 Oct 2025 11:29:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAY9D-0005CE-2k; Sun, 19 Oct 2025 14:28:51 -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 1vAY96-00059K-GT for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:44 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAY93-0000ZX-0k for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:44 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-290aaff555eso34628565ad.2 for ; Sun, 19 Oct 2025 11:28:40 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29246ebccf3sm58985775ad.1.2025.10.19.11.28.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Oct 2025 11:28:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760898520; x=1761503320; darn=nongnu.org; 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=zZPHG+rU99S38CzFhmJwBnWR59SoKAXZRpLng6h/VHA=; b=wVTHJdLxa19AK8Rs2IrFtSivGrT4pFjb9mIwskNTlmm8TDO1QgrR6doEiiym1iENdA /xCdFg+kMlRLPBE+e0wa0WWU8vuGWir7Uyhr1UCHKrQlu78WXBGlMqtAYp7lH07+3xfI V8/rLpHd+sh8brPjB7XtFCtKQZ2iV1SzUiQaUwkSHCl12MA7lufA2fkXv+QVU36iTwou uCDQE3ESH4IGai5caW3MzLbaf8Q1CedWBsTPUmkcwKNPzHyUT1oEPcyiyAiyaoUV3e5z qbfXzglXYk8M1+p3OVOgNNPi/N3rXDnWdreAryEnN2PwAFvAMmcRTDeOHvYhHqohQTgH WRWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760898520; x=1761503320; 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=zZPHG+rU99S38CzFhmJwBnWR59SoKAXZRpLng6h/VHA=; b=dnEWFMtDPkgMNOg5T/PK/ac6m78stOQZ/UuaeYQ9gmO1cX8kqSOEn5PXiwlrx1qn9E rv+uj0+G4Z0XxHIozv/763uw5vyorKiiDpfBZCCO7x1v7NWTwYib9hn0QNsjOy/EeP6H tzS3uTQhO++wfnrYmyROqGdT8chWTY0WShSzeoGBD4M4PSjFjB2limVON6XxB0IU1qdX SYgFZR2buwgp9IDsVnOpsAV51YPe2+57vkjVYYI83mYVDHd4sDgzFk1l4vbBrqgh1PY/ KOSkljIAQ2fzVld6MTlEewxqYSi05yrp1o6hnwCGsQxkrqf/FAwcvC3UtFRva9lneKpA moww== X-Gm-Message-State: AOJu0Ywdc1V+/c6ouwGRjXD1BvOIAg8VbjhBsPJNkjAOg6WDr/o+f/Qx T9HnEiJVQVL4JHBZBd8nasNlbSQFKtrJMypcPQCt26a28++vt1sMzf3Qg9rkgIhWMbT8p3kFS7e 3RjhFLT0= X-Gm-Gg: ASbGncuiM7CyqKx3+6zZEMDMmPcrVhumS97td3Rkce39VZOBki8AyvCO8svqeoctzI/ Uec2G4oUr31dqUO6BcmlQuREzi/2sv7XtMxytVKL7yXjcfQBvejlbJzogCtFcB6YKk9/SjwQKCh wXfvlZyDspQ0VH47ndbaZEh/wwR/XOO1JcpIGLQA4XI+f40MGkrWUkBvrA4H1lCroX4/Bl4LaLR XSTQmJF1B6jshpB3hBiTbYIOotcokhqGI3m/Zd3trK5HLG6wCsS5crlVla/FTWahImyxUJbdLhR 7/KE9k377dRgyePRibHWxTSnetBb7f8UfC7ui5vXFYU0VGFAkVs+aV3O+Biq6Frijkmfhw31JWD UfpTwt59dysp09A88rwFRNp84NaQtt1x/VOrOU+79Hx/aCb/2dxiYMS29zf1cSg361WRl3mriY8 uNm+U8NJJrV6cveywD X-Google-Smtp-Source: AGHT+IFIjsHE5ZkjGwMXB8zz0d7FEZxUbvdibBlsf/HGt83I4zrOkj1pneA1m55K5eNWyj/UYSnbtg== X-Received: by 2002:a17:902:f691:b0:290:bd15:24ae with SMTP id d9443c01a7336-290c9cf34e6mr107176325ad.4.1760898519607; Sun, 19 Oct 2025 11:28:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 5/9] tcg/mips: Remove support for 32-bit hosts Date: Sun, 19 Oct 2025 11:28:30 -0700 Message-ID: <20251019182834.481541-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251019182834.481541-1-richard.henderson@linaro.org> References: <20251019182834.481541-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::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760898576625154100 From: Philippe Mathieu-Daud=C3=A9 32-bit host support is deprecated since commit 6d701c9bac1 ("meson: Deprecate 32-bit host support"), released as v10.0. The next release being v10.2, we can remove the TCG backend for 32-bit MIPS hosts. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson Message-ID: <20251009195210.33161-6-philmd@linaro.org> --- tcg/mips/tcg-target-has.h | 2 - tcg/mips/tcg-target.c.inc | 285 +++++--------------------------------- 2 files changed, 38 insertions(+), 249 deletions(-) diff --git a/tcg/mips/tcg-target-has.h b/tcg/mips/tcg-target-has.h index b9eb338528..88f0145efb 100644 --- a/tcg/mips/tcg-target-has.h +++ b/tcg/mips/tcg-target-has.h @@ -39,11 +39,9 @@ extern bool use_mips32r2_instructions; #endif =20 /* optional instructions */ -#if TCG_TARGET_REG_BITS =3D=3D 64 #define TCG_TARGET_HAS_extr_i64_i32 1 #define TCG_TARGET_HAS_ext32s_i64 1 #define TCG_TARGET_HAS_ext32u_i64 1 -#endif =20 /* optional instructions detected at runtime */ #define TCG_TARGET_HAS_qemu_ldst_i128 0 diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc index 4d9d029844..51a15705cb 100644 --- a/tcg/mips/tcg-target.c.inc +++ b/tcg/mips/tcg-target.c.inc @@ -32,15 +32,6 @@ #define TCG_TARGET_CALL_RET_I128 TCG_CALL_RET_NORMAL #define TCG_TARGET_CALL_ARG_I128 TCG_CALL_ARG_EVEN =20 -#if TCG_TARGET_REG_BITS =3D=3D 32 -# define LO_OFF (HOST_BIG_ENDIAN * 4) -# define HI_OFF (4 - LO_OFF) -#else -/* Assert at compile-time that these values are never used for 64-bit. */ -# define LO_OFF ({ qemu_build_not_reached(); 0; }) -# define HI_OFF ({ qemu_build_not_reached(); 0; }) -#endif - #ifdef CONFIG_DEBUG_TCG static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] =3D { "zero", @@ -84,11 +75,7 @@ static const char * const tcg_target_reg_names[TCG_TARGE= T_NB_REGS] =3D { #define TCG_TMP3 TCG_REG_T7 =20 #define TCG_GUEST_BASE_REG TCG_REG_S7 -#if TCG_TARGET_REG_BITS =3D=3D 64 #define TCG_REG_TB TCG_REG_S6 -#else -#define TCG_REG_TB ({ qemu_build_not_reached(); TCG_REG_ZERO; }) -#endif =20 /* check if we really need so many registers :P */ static const int tcg_target_reg_alloc_order[] =3D { @@ -559,7 +546,7 @@ static void tcg_out_movi_int(TCGContext *s, TCGType typ= e, TCGReg ret, tcg_target_long tmp; int sh, lo; =20 - if (TCG_TARGET_REG_BITS =3D=3D 64 && type =3D=3D TCG_TYPE_I32) { + if (type =3D=3D TCG_TYPE_I32) { arg =3D (int32_t)arg; } =20 @@ -567,7 +554,6 @@ static void tcg_out_movi_int(TCGContext *s, TCGType typ= e, TCGReg ret, if (tcg_out_movi_two(s, ret, arg)) { return; } - assert(TCG_TARGET_REG_BITS =3D=3D 64); =20 /* Load addresses within 2GB of TB with 1 or 3 insns. */ tmp =3D tcg_tbrel_diff(s, (void *)arg); @@ -630,8 +616,7 @@ static void tcg_out_movi_int(TCGContext *s, TCGType typ= e, TCGReg ret, static void tcg_out_movi(TCGContext *s, TCGType type, TCGReg ret, tcg_target_long arg) { - TCGReg tbreg =3D TCG_TARGET_REG_BITS =3D=3D 64 ? TCG_REG_TB : 0; - tcg_out_movi_int(s, type, ret, arg, tbreg); + tcg_out_movi_int(s, type, ret, arg, TCG_REG_TB); } =20 static void tcg_out_ext8s(TCGContext *s, TCGType type, TCGReg rd, TCGReg r= s) @@ -658,7 +643,6 @@ static void tcg_out_ext16u(TCGContext *s, TCGReg rd, TC= GReg rs) =20 static void tcg_out_ext32s(TCGContext *s, TCGReg rd, TCGReg rs) { - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 64); tcg_out_opc_sa(s, OPC_SLL, rd, rs, 0); } =20 @@ -701,7 +685,6 @@ static void tcg_out_bswap_subr(TCGContext *s, const tcg= _insn_unit *sub) =20 static void tcg_out_ext32u(TCGContext *s, TCGReg ret, TCGReg arg) { - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 64); if (use_mips32r2_instructions) { tcg_out_opc_bf(s, OPC_DEXT, ret, arg, 31, 0); } else { @@ -727,20 +710,14 @@ static void tcg_out_ldst(TCGContext *s, MIPSInsn opc,= TCGReg data, static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1, intptr_t arg2) { - MIPSInsn opc =3D OPC_LD; - if (TCG_TARGET_REG_BITS =3D=3D 32 || type =3D=3D TCG_TYPE_I32) { - opc =3D OPC_LW; - } + MIPSInsn opc =3D type =3D=3D TCG_TYPE_I32 ? OPC_LW : OPC_LD; tcg_out_ldst(s, opc, arg, arg1, arg2); } =20 static void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1, intptr_t arg2) { - MIPSInsn opc =3D OPC_SD; - if (TCG_TARGET_REG_BITS =3D=3D 32 || type =3D=3D TCG_TYPE_I32) { - opc =3D OPC_SW; - } + MIPSInsn opc =3D type =3D=3D TCG_TYPE_I32 ? OPC_SW : OPC_SD; tcg_out_ldst(s, opc, arg, arg1, arg2); } =20 @@ -918,72 +895,6 @@ void tcg_out_br(TCGContext *s, TCGLabel *l) tgen_brcond(s, TCG_TYPE_I32, TCG_COND_EQ, TCG_REG_ZERO, TCG_REG_ZERO, = l); } =20 -static int tcg_out_setcond2_int(TCGContext *s, TCGCond cond, TCGReg ret, - TCGReg al, TCGReg ah, TCGReg bl, TCGReg bh) -{ - int flags =3D 0; - - switch (cond) { - case TCG_COND_EQ: - flags |=3D SETCOND_INV; - /* fall through */ - case TCG_COND_NE: - flags |=3D SETCOND_NEZ; - tcg_out_opc_reg(s, OPC_XOR, TCG_TMP0, al, bl); - tcg_out_opc_reg(s, OPC_XOR, TCG_TMP1, ah, bh); - tcg_out_opc_reg(s, OPC_OR, ret, TCG_TMP0, TCG_TMP1); - break; - - default: - tgen_setcond(s, TCG_TYPE_I32, TCG_COND_EQ, TCG_TMP0, ah, bh); - tgen_setcond(s, TCG_TYPE_I32, tcg_unsigned_cond(cond), - TCG_TMP1, al, bl); - tcg_out_opc_reg(s, OPC_AND, TCG_TMP1, TCG_TMP1, TCG_TMP0); - tgen_setcond(s, TCG_TYPE_I32, tcg_high_cond(cond), TCG_TMP0, ah, b= h); - tcg_out_opc_reg(s, OPC_OR, ret, TCG_TMP0, TCG_TMP1); - break; - } - return ret | flags; -} - -static void tgen_setcond2(TCGContext *s, TCGCond cond, TCGReg ret, - TCGReg al, TCGReg ah, - TCGArg bl, bool const_bl, - TCGArg bh, bool const_bh) -{ - int tmpflags =3D tcg_out_setcond2_int(s, cond, ret, al, ah, bl, bh); - tcg_out_setcond_end(s, ret, tmpflags); -} - -#if TCG_TARGET_REG_BITS !=3D 32 -__attribute__((unused)) -#endif -static const TCGOutOpSetcond2 outop_setcond2 =3D { - .base.static_constraint =3D C_O1_I4(r, r, r, rz, rz), - .out =3D tgen_setcond2, -}; - -static void tgen_brcond2(TCGContext *s, TCGCond cond, TCGReg al, TCGReg ah, - TCGArg bl, bool const_bl, - TCGArg bh, bool const_bh, TCGLabel *l) -{ - int tmpflags =3D tcg_out_setcond2_int(s, cond, TCG_TMP0, al, ah, bl, b= h); - TCGReg tmp =3D tmpflags & ~SETCOND_FLAGS; - MIPSInsn b_opc =3D tmpflags & SETCOND_INV ? OPC_BEQ : OPC_BNE; - - tcg_out_reloc(s, s->code_ptr, R_MIPS_PC16, l, 0); - tcg_out_opc_br(s, b_opc, tmp, TCG_REG_ZERO); - tcg_out_nop(s); -} - -#if TCG_TARGET_REG_BITS !=3D 32 -__attribute__((unused)) -#endif -static const TCGOutOpBrcond2 outop_brcond2 =3D { - .base.static_constraint =3D C_O0_I4(r, r, rz, rz), - .out =3D tgen_brcond2, -}; - static void tgen_movcond(TCGContext *s, TCGType type, TCGCond cond, TCGReg ret, TCGReg c1, TCGArg c2, bool const_c2, TCGArg v1, bool const_v1, TCGArg v2, bool const_v= 2) @@ -1183,7 +1094,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext= *s, HostAddress *h, tcg_out_ld(s, TCG_TYPE_PTR, TCG_TMP1, TCG_AREG0, table_off); =20 /* Extract the TLB index from the address into TMP3. */ - if (TCG_TARGET_REG_BITS =3D=3D 32 || addr_type =3D=3D TCG_TYPE_I32= ) { + if (addr_type =3D=3D TCG_TYPE_I32) { tcg_out_opc_sa(s, OPC_SRL, TCG_TMP3, addr, TARGET_PAGE_BITS - CPU_TLB_ENTRY_BITS); } else { @@ -1195,7 +1106,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext= *s, HostAddress *h, tcg_out_opc_reg(s, ALIAS_PADD, TCG_TMP3, TCG_TMP3, TCG_TMP1); =20 /* Load the tlb comparator. */ - if (TCG_TARGET_REG_BITS =3D=3D 64 && addr_type =3D=3D TCG_TYPE_I32= ) { + if (addr_type =3D=3D TCG_TYPE_I32) { tcg_out_ld(s, TCG_TYPE_I32, TCG_TMP0, TCG_TMP3, cmp_off + HOST_BIG_ENDIAN * 4); } else { @@ -1212,8 +1123,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext= *s, HostAddress *h, */ tcg_out_movi(s, addr_type, TCG_TMP1, TARGET_PAGE_MASK | a_mask); if (a_mask < s_mask) { - tcg_out_opc_imm(s, (TCG_TARGET_REG_BITS =3D=3D 32 - || addr_type =3D=3D TCG_TYPE_I32 + tcg_out_opc_imm(s, (addr_type =3D=3D TCG_TYPE_I32 ? OPC_ADDIU : OPC_DADDIU), TCG_TMP2, addr, s_mask - a_mask); tcg_out_opc_reg(s, OPC_AND, TCG_TMP1, TCG_TMP1, TCG_TMP2); @@ -1222,7 +1132,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext= *s, HostAddress *h, } =20 /* Zero extend a 32-bit guest address for a 64-bit host. */ - if (TCG_TARGET_REG_BITS =3D=3D 64 && addr_type =3D=3D TCG_TYPE_I32= ) { + if (addr_type =3D=3D TCG_TYPE_I32) { tcg_out_ext32u(s, TCG_TMP2, addr); addr =3D TCG_TMP2; } @@ -1255,7 +1165,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext= *s, HostAddress *h, } =20 base =3D addr; - if (TCG_TARGET_REG_BITS =3D=3D 64 && addr_type =3D=3D TCG_TYPE_I32= ) { + if (addr_type =3D=3D TCG_TYPE_I32) { tcg_out_ext32u(s, TCG_REG_A0, base); base =3D TCG_REG_A0; } @@ -1291,7 +1201,7 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, TCG= Reg lo, TCGReg hi, tcg_out_opc_imm(s, OPC_LH, lo, base, 0); break; case MO_UL: - if (TCG_TARGET_REG_BITS =3D=3D 64 && type =3D=3D TCG_TYPE_I64) { + if (type =3D=3D TCG_TYPE_I64) { tcg_out_opc_imm(s, OPC_LWU, lo, base, 0); break; } @@ -1300,16 +1210,7 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, TC= GReg lo, TCGReg hi, tcg_out_opc_imm(s, OPC_LW, lo, base, 0); break; case MO_UQ: - /* Prefer to load from offset 0 first, but allow for overlap. */ - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_out_opc_imm(s, OPC_LD, lo, base, 0); - } else if (HOST_BIG_ENDIAN ? hi !=3D base : lo =3D=3D base) { - tcg_out_opc_imm(s, OPC_LW, hi, base, HI_OFF); - tcg_out_opc_imm(s, OPC_LW, lo, base, LO_OFF); - } else { - tcg_out_opc_imm(s, OPC_LW, lo, base, LO_OFF); - tcg_out_opc_imm(s, OPC_LW, hi, base, HI_OFF); - } + tcg_out_opc_imm(s, OPC_LD, lo, base, 0); break; default: g_assert_not_reached(); @@ -1351,21 +1252,14 @@ static void tcg_out_qemu_ld_unalign(TCGContext *s, = TCGReg lo, TCGReg hi, case MO_32: tcg_out_opc_imm(s, lw1, lo, base, 0); tcg_out_opc_imm(s, lw2, lo, base, 3); - if (TCG_TARGET_REG_BITS =3D=3D 64 && type =3D=3D TCG_TYPE_I64 && != sgn) { + if (type =3D=3D TCG_TYPE_I64 && !sgn) { tcg_out_ext32u(s, lo, lo); } break; =20 case MO_64: - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_out_opc_imm(s, ld1, lo, base, 0); - tcg_out_opc_imm(s, ld2, lo, base, 7); - } else { - tcg_out_opc_imm(s, lw1, HOST_BIG_ENDIAN ? hi : lo, base, 0 + 0= ); - tcg_out_opc_imm(s, lw2, HOST_BIG_ENDIAN ? hi : lo, base, 0 + 3= ); - tcg_out_opc_imm(s, lw1, HOST_BIG_ENDIAN ? lo : hi, base, 4 + 0= ); - tcg_out_opc_imm(s, lw2, HOST_BIG_ENDIAN ? lo : hi, base, 4 + 3= ); - } + tcg_out_opc_imm(s, ld1, lo, base, 0); + tcg_out_opc_imm(s, ld2, lo, base, 7); break; =20 default: @@ -1401,36 +1295,8 @@ static const TCGOutOpQemuLdSt outop_qemu_ld =3D { .out =3D tgen_qemu_ld, }; =20 -static void tgen_qemu_ld2(TCGContext *s, TCGType type, TCGReg datalo, - TCGReg datahi, TCGReg addr, MemOpIdx oi) -{ - MemOp opc =3D get_memop(oi); - TCGLabelQemuLdst *ldst; - HostAddress h; - - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 32); - ldst =3D prepare_host_addr(s, &h, addr, oi, true); - - if (use_mips32r6_instructions || h.aa.align >=3D (opc & MO_SIZE)) { - tcg_out_qemu_ld_direct(s, datalo, datahi, h.base, opc, type); - } else { - tcg_out_qemu_ld_unalign(s, datalo, datahi, h.base, opc, type); - } - - if (ldst) { - ldst->type =3D type; - ldst->datalo_reg =3D datalo; - ldst->datahi_reg =3D datahi; - ldst->raddr =3D tcg_splitwx_to_rx(s->code_ptr); - } -} - static const TCGOutOpQemuLdSt2 outop_qemu_ld2 =3D { - /* Ensure that the mips32 code is compiled but discarded for mips64. */ - .base.static_constraint =3D - TCG_TARGET_REG_BITS =3D=3D 32 ? C_O2_I1(r, r, r) : C_NotImplemente= d, - .out =3D - TCG_TARGET_REG_BITS =3D=3D 32 ? tgen_qemu_ld2 : NULL, + .base.static_constraint =3D C_NotImplemented, }; =20 static void tcg_out_qemu_st_direct(TCGContext *s, TCGReg lo, TCGReg hi, @@ -1447,12 +1313,7 @@ static void tcg_out_qemu_st_direct(TCGContext *s, TC= GReg lo, TCGReg hi, tcg_out_opc_imm(s, OPC_SW, lo, base, 0); break; case MO_64: - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_out_opc_imm(s, OPC_SD, lo, base, 0); - } else { - tcg_out_opc_imm(s, OPC_SW, HOST_BIG_ENDIAN ? hi : lo, base, 0); - tcg_out_opc_imm(s, OPC_SW, HOST_BIG_ENDIAN ? lo : hi, base, 4); - } + tcg_out_opc_imm(s, OPC_SD, lo, base, 0); break; default: g_assert_not_reached(); @@ -1480,15 +1341,8 @@ static void tcg_out_qemu_st_unalign(TCGContext *s, T= CGReg lo, TCGReg hi, break; =20 case MO_64: - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_out_opc_imm(s, sd1, lo, base, 0); - tcg_out_opc_imm(s, sd2, lo, base, 7); - } else { - tcg_out_opc_imm(s, sw1, HOST_BIG_ENDIAN ? hi : lo, base, 0 + 0= ); - tcg_out_opc_imm(s, sw2, HOST_BIG_ENDIAN ? hi : lo, base, 0 + 3= ); - tcg_out_opc_imm(s, sw1, HOST_BIG_ENDIAN ? lo : hi, base, 4 + 0= ); - tcg_out_opc_imm(s, sw2, HOST_BIG_ENDIAN ? lo : hi, base, 4 + 3= ); - } + tcg_out_opc_imm(s, sd1, lo, base, 0); + tcg_out_opc_imm(s, sd2, lo, base, 7); break; =20 default: @@ -1524,36 +1378,8 @@ static const TCGOutOpQemuLdSt outop_qemu_st =3D { .out =3D tgen_qemu_st, }; =20 -static void tgen_qemu_st2(TCGContext *s, TCGType type, TCGReg datalo, - TCGReg datahi, TCGReg addr, MemOpIdx oi) -{ - MemOp opc =3D get_memop(oi); - TCGLabelQemuLdst *ldst; - HostAddress h; - - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 32); - ldst =3D prepare_host_addr(s, &h, addr, oi, false); - - if (use_mips32r6_instructions || h.aa.align >=3D (opc & MO_SIZE)) { - tcg_out_qemu_st_direct(s, datalo, datahi, h.base, opc); - } else { - tcg_out_qemu_st_unalign(s, datalo, datahi, h.base, opc); - } - - if (ldst) { - ldst->type =3D type; - ldst->datalo_reg =3D datalo; - ldst->datahi_reg =3D datahi; - ldst->raddr =3D tcg_splitwx_to_rx(s->code_ptr); - } -} - static const TCGOutOpQemuLdSt2 outop_qemu_st2 =3D { - /* Ensure that the mips32 code is compiled but discarded for mips64. */ - .base.static_constraint =3D - TCG_TARGET_REG_BITS =3D=3D 32 ? C_O0_I3(rz, rz, r) : C_NotImplemen= ted, - .out =3D - TCG_TARGET_REG_BITS =3D=3D 32 ? tgen_qemu_st2 : NULL, + .base.static_constraint =3D C_NotImplemented, }; =20 static void tcg_out_mb(TCGContext *s, unsigned a0) @@ -1578,22 +1404,14 @@ static void tcg_out_exit_tb(TCGContext *s, uintptr_= t a0) int16_t lo =3D 0; =20 if (a0) { - intptr_t ofs; - if (TCG_TARGET_REG_BITS =3D=3D 64) { - ofs =3D tcg_tbrel_diff(s, (void *)a0); - lo =3D ofs; - if (ofs =3D=3D lo) { - base =3D TCG_REG_TB; - } else { - base =3D TCG_REG_V0; - tcg_out_movi(s, TCG_TYPE_PTR, base, ofs - lo); - tcg_out_opc_reg(s, ALIAS_PADD, base, base, TCG_REG_TB); - } + intptr_t ofs =3D tcg_tbrel_diff(s, (void *)a0); + lo =3D ofs; + if (ofs =3D=3D lo) { + base =3D TCG_REG_TB; } else { - ofs =3D a0; - lo =3D ofs; base =3D TCG_REG_V0; tcg_out_movi(s, TCG_TYPE_PTR, base, ofs - lo); + tcg_out_opc_reg(s, ALIAS_PADD, base, base, TCG_REG_TB); } } if (!tcg_out_opc_jmp(s, OPC_J, tb_ret_addr)) { @@ -1610,35 +1428,24 @@ static void tcg_out_goto_tb(TCGContext *s, int whic= h) TCGReg base, dest; =20 /* indirect jump method */ - if (TCG_TARGET_REG_BITS =3D=3D 64) { - dest =3D TCG_REG_TB; - base =3D TCG_REG_TB; - ofs =3D tcg_tbrel_diff(s, (void *)ofs); - } else { - dest =3D TCG_TMP0; - base =3D TCG_REG_ZERO; - } + dest =3D TCG_REG_TB; + base =3D TCG_REG_TB; + ofs =3D tcg_tbrel_diff(s, (void *)ofs); tcg_out_ld(s, TCG_TYPE_PTR, dest, base, ofs); tcg_out_opc_reg(s, OPC_JR, 0, dest, 0); /* delay slot */ tcg_out_nop(s); =20 set_jmp_reset_offset(s, which); - if (TCG_TARGET_REG_BITS =3D=3D 64) { - /* For the unlinked case, need to reset TCG_REG_TB. */ - tcg_out_ldst(s, ALIAS_PADDI, TCG_REG_TB, TCG_REG_TB, - -tcg_current_code_size(s)); - } + /* For the unlinked case, need to reset TCG_REG_TB. */ + tcg_out_ldst(s, ALIAS_PADDI, TCG_REG_TB, TCG_REG_TB, + -tcg_current_code_size(s)); } =20 static void tcg_out_goto_ptr(TCGContext *s, TCGReg a0) { tcg_out_opc_reg(s, OPC_JR, 0, a0, 0); - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_TB, a0); - } else { - tcg_out_nop(s); - } + tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_TB, a0); } =20 void tb_target_set_jmp_target(const TranslationBlock *tb, int n, @@ -1833,7 +1640,6 @@ static const TCGOutOpBinary outop_eqv =3D { .base.static_constraint =3D C_NotImplemented, }; =20 -#if TCG_TARGET_REG_BITS =3D=3D 64 static void tgen_extrh_i64_i32(TCGContext *s, TCGType t, TCGReg a0, TCGReg= a1) { tcg_out_dsra(s, a0, a1, 32); @@ -1843,7 +1649,6 @@ static const TCGOutOpUnary outop_extrh_i64_i32 =3D { .base.static_constraint =3D C_O1_I1(r, r), .out_rr =3D tgen_extrh_i64_i32, }; -#endif =20 static void tgen_mul(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1, TCGReg a2) @@ -2232,7 +2037,6 @@ static const TCGOutOpBswap outop_bswap32 =3D { .out_rr =3D tgen_bswap32, }; =20 -#if TCG_TARGET_REG_BITS =3D=3D 64 static void tgen_bswap64(TCGContext *s, TCGType type, TCGReg ret, TCGReg a= rg) { if (use_mips32r2_instructions) { @@ -2250,7 +2054,6 @@ static const TCGOutOpUnary outop_bswap64 =3D { .base.static_constraint =3D C_O1_I1(r, r), .out_rr =3D tgen_bswap64, }; -#endif /* TCG_TARGET_REG_BITS =3D=3D 64 */ =20 static void tgen_neg(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1) { @@ -2378,7 +2181,6 @@ static const TCGOutOpLoad outop_ld16s =3D { .out =3D tgen_ld16s, }; =20 -#if TCG_TARGET_REG_BITS =3D=3D 64 static void tgen_ld32u(TCGContext *s, TCGType type, TCGReg dest, TCGReg base, ptrdiff_t offset) { @@ -2400,7 +2202,6 @@ static const TCGOutOpLoad outop_ld32s =3D { .base.static_constraint =3D C_O1_I1(r, r), .out =3D tgen_ld32s, }; -#endif =20 static void tgen_st8_r(TCGContext *s, TCGType type, TCGReg data, TCGReg base, ptrdiff_t offset) @@ -2539,7 +2340,7 @@ static tcg_insn_unit *align_code_ptr(TCGContext *s) } =20 /* Stack frame parameters. */ -#define REG_SIZE (TCG_TARGET_REG_BITS / 8) +#define REG_SIZE 8 #define SAVE_SIZE ((int)ARRAY_SIZE(tcg_target_callee_save_regs) * REG_SIZ= E) #define TEMP_SIZE (CPU_TEMP_BUF_NLONGS * (int)sizeof(long)) =20 @@ -2571,17 +2372,15 @@ static void tcg_target_qemu_prologue(TCGContext *s) * with the address of the prologue, so we can use that instead * of TCG_REG_TB. */ -#if TCG_TARGET_REG_BITS =3D=3D 64 && !defined(__mips_abicalls) +#if !defined(__mips_abicalls) # error "Unknown mips abi" #endif tcg_out_movi_int(s, TCG_TYPE_PTR, TCG_GUEST_BASE_REG, guest_base, - TCG_TARGET_REG_BITS =3D=3D 64 ? TCG_REG_T9 : 0); + TCG_REG_T9); tcg_regset_set_reg(s->reserved_regs, TCG_GUEST_BASE_REG); } =20 - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_TB, tcg_target_call_iarg_regs= [1]); - } + tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_TB, tcg_target_call_iarg_regs[1]); =20 /* Call generated code */ tcg_out_opc_reg(s, OPC_JR, 0, tcg_target_call_iarg_regs[1], 0); @@ -2637,10 +2436,6 @@ static void tcg_target_qemu_prologue(TCGContext *s) /* t3 =3D dcba -- delay slot */ tcg_out_opc_reg(s, OPC_OR, TCG_TMP3, TCG_TMP3, TCG_TMP1); =20 - if (TCG_TARGET_REG_BITS =3D=3D 32) { - return; - } - /* * bswap32u -- unsigned 32-bit swap. a0 =3D ....abcd. */ @@ -2735,9 +2530,7 @@ static void tcg_target_init(TCGContext *s) { tcg_target_detect_isa(); tcg_target_available_regs[TCG_TYPE_I32] =3D 0xffffffff; - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_target_available_regs[TCG_TYPE_I64] =3D 0xffffffff; - } + tcg_target_available_regs[TCG_TYPE_I64] =3D 0xffffffff; =20 tcg_target_call_clobber_regs =3D 0; tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_V0); @@ -2768,9 +2561,7 @@ static void tcg_target_init(TCGContext *s) tcg_regset_set_reg(s->reserved_regs, TCG_REG_RA); /* return address = */ tcg_regset_set_reg(s->reserved_regs, TCG_REG_SP); /* stack pointer */ tcg_regset_set_reg(s->reserved_regs, TCG_REG_GP); /* global pointer = */ - if (TCG_TARGET_REG_BITS =3D=3D 64) { - tcg_regset_set_reg(s->reserved_regs, TCG_REG_TB); /* tc->tc_ptr */ - } + tcg_regset_set_reg(s->reserved_regs, TCG_REG_TB); /* tc->tc_ptr */ } =20 typedef struct { @@ -2788,7 +2579,7 @@ static const DebugFrame debug_frame =3D { .h.cie.id =3D -1, .h.cie.version =3D 1, .h.cie.code_align =3D 1, - .h.cie.data_align =3D -(TCG_TARGET_REG_BITS / 8) & 0x7f, /* sleb128 */ + .h.cie.data_align =3D -REG_SIZE & 0x7f, /* sleb128 */ .h.cie.return_column =3D TCG_REG_RA, =20 /* Total FDE size does not include the "len" member. */ --=20 2.43.0 From nobody Fri Nov 14 16:56:40 2025 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=1760898576; cv=none; d=zohomail.com; s=zohoarc; b=VCGVpFMDGam5Wa0HJzwIXLx2PlT6fjiuNYKdR2PT9gzAjXQS1j8RIduIUdGJDwvzx15dyPJDDOw/3oGJzfZtwGJ2+klSB0rLC8Ttw2vHO5tuERGrEQYORrUx8Pvn2RzSgT3pm4vtn8/ul3BUQh9eeKXy3CIIwz5LYgW9ehv1pgQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760898576; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FHn1R3ZF55YJWZfpnAUbmLtJwg62Lau4AKHNQr6hxkg=; b=EkIxODMz6OytAcnE8p8pD+o/y/yRnkvAICqlAQ66irs++xHKOVjATDcY8MoGC+U0z0J2oulwwCxosvyV32QohTepF9UsPPw7GLy9D2LoBHG3cyveiqb4I6wJlXVUhBbpSWCqJk4Gdgg753/4vXLa7GVb6Y5D71PZHXK7zeUnGAw= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760898576019629.2447142698728; Sun, 19 Oct 2025 11:29:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAY99-0005B6-7J; Sun, 19 Oct 2025 14:28:47 -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 1vAY96-00059J-Fl for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:44 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAY93-0000Zc-QF for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:44 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-290c2b6a6c2so30700875ad.1 for ; Sun, 19 Oct 2025 11:28:41 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29246ebccf3sm58985775ad.1.2025.10.19.11.28.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Oct 2025 11:28:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760898520; x=1761503320; darn=nongnu.org; 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=FHn1R3ZF55YJWZfpnAUbmLtJwg62Lau4AKHNQr6hxkg=; b=oemWtCMdLv3ofmBMJkLsLK2ucXAdXLW5FyxRGq3zy9e2Gy1rq40O3A94ChiQJO7klu 5fZ7kNSFx1q0I7RfBe6fQp2m2lMSUjdbQOUIL9diK4vunKsq73LXDR14q2CUYg//oVk6 JsXzcCoffCpoFNuEqN0wFEfVdpVXkBqhbQpXX2LExlJBt5OLzQjzugcog8QCNVBGboBz GQ4u9H2+Aj8xKyjOxPtzHx+LCGXFvP+R+6F+BdsGCFlLHBceF8g5LDuaaaUxaHfeBg/F deNTotcoajH21+R8hyZMLaBYQt2adR9apDCsSv4hzeDITS1DYym3jeW3MkQIP3b/s1lV PISQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760898520; x=1761503320; 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=FHn1R3ZF55YJWZfpnAUbmLtJwg62Lau4AKHNQr6hxkg=; b=mBOP58l/rw6T9cWpg4sG9gMab6JUeHk3W7D9ROJkWYx3Z2yDXKHbqHa4Z4ZfGDhr3Y rkaPznPvdvaDGUjKKf3CBPV9aXwSVC8TbEYaVVXM/2kpcCYmE4K7RdBkKufOYLuXyskd lvXWXuCrMLw9NsPZ1TdsH7C9ky2e7pdbRBl4ZhyXOTh07BvRvB73dXbemveb+HiVE4ur EBpQFEYxDd6vOCgS+00Id1nGf/wU9Nqfvr8aNF+crxPIweAUNZp27j9WirFhlm95eBID 63/NzUbjgdY4ImrtaDIO8U49opJVR+eCmGG0ApcV0EtdDkPGFn5JKS6soakrsUpU+DXD +CJA== X-Gm-Message-State: AOJu0YzhKd1CkpgGxBgrwR34k3KFsoOfoBwazqtKPzEW6TwvjLW77eMO +O4KEr12es3Wz/YNLWROCcQnl7dVRbBbVH+o2Ip2RY+KFC/kViah0XHs8qZzo5Q21XnDhw+J6ca 6A2+22+c= X-Gm-Gg: ASbGncuVcCkRBbd2140YwCnc4Ek+zGw820IzZLd+Wp3q16onuvWHBtJXtjdZ0axBYEZ xYW+1B4qQHYlRUTwUuUjvyKovSel4EcRFGZ+ZEbUpRWbfGCZzsTECMG7tjmnjcMKc2WAmRk/zwk ovaNxhEFegN0Y54tlZcaG7WuWChuLG6/HRFdhw6a5853rHOA1LamBkzSjCW5B8+3JBehT2/UBDF HPSMuD2hagdZEH6f1Cng2sYVtWF7fMiqUJ5qsRqVgj+XEDenXt/zoBl7RF5D6HcHvuUpEUR0nuv WaUKUWGauASq4LHUigFMpmwmzuIDZBieLAQE8nkr+UpTFpStK+ZvKIeVXS1WttdYdcMkedRonHn MEDm9j+mGdWoN/nbsSoW5IXvYU7M4cP9Zc6WSCf4ln8rIeN2GSHQO/wJmwwHxq3Ye4xJHWI2xQh m5X6Wzog== X-Google-Smtp-Source: AGHT+IFzfINuDZJtChvPqsJiYrGE3UAZhvBoEbANvvkD3gx+OozwLX0k5sId5W4w5t6Sd/5IlvebOw== X-Received: by 2002:a17:902:ce0e:b0:264:befb:829c with SMTP id d9443c01a7336-290c9c8a738mr128099595ad.9.1760898520318; Sun, 19 Oct 2025 11:28:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 6/9] tcg/mips: Remove ALIAS_PADD, ALIAS_PADDI Date: Sun, 19 Oct 2025 11:28:31 -0700 Message-ID: <20251019182834.481541-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251019182834.481541-1-richard.henderson@linaro.org> References: <20251019182834.481541-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::633; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x633.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760898580846158500 These aliases existed to simplify code for O32 and N32. Now that the 64-bit abi is the only one supported, we can use the DADD* instructions directly. Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- tcg/mips/tcg-target.c.inc | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc index 51a15705cb..60c703a093 100644 --- a/tcg/mips/tcg-target.c.inc +++ b/tcg/mips/tcg-target.c.inc @@ -340,10 +340,6 @@ typedef enum { OPC_SYNC_ACQUIRE =3D OPC_SYNC | 0x11 << 6, OPC_SYNC_RELEASE =3D OPC_SYNC | 0x12 << 6, OPC_SYNC_RMB =3D OPC_SYNC | 0x13 << 6, - - /* Aliases for convenience. */ - ALIAS_PADD =3D sizeof(void *) =3D=3D 4 ? OPC_ADDU : OPC_DADDU, - ALIAS_PADDI =3D sizeof(void *) =3D=3D 4 ? OPC_ADDIU : OPC_DADDIU, } MIPSInsn; =20 /* @@ -700,7 +696,7 @@ static void tcg_out_ldst(TCGContext *s, MIPSInsn opc, T= CGReg data, if (ofs !=3D lo) { tcg_out_movi(s, TCG_TYPE_PTR, TCG_TMP0, ofs - lo); if (addr !=3D TCG_REG_ZERO) { - tcg_out_opc_reg(s, ALIAS_PADD, TCG_TMP0, TCG_TMP0, addr); + tcg_out_opc_reg(s, OPC_DADDU, TCG_TMP0, TCG_TMP0, addr); } addr =3D TCG_TMP0; } @@ -1103,7 +1099,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext= *s, HostAddress *h, tcg_out_opc_reg(s, OPC_AND, TCG_TMP3, TCG_TMP3, TCG_TMP0); =20 /* Add the tlb_table pointer, creating the CPUTLBEntry address. */ - tcg_out_opc_reg(s, ALIAS_PADD, TCG_TMP3, TCG_TMP3, TCG_TMP1); + tcg_out_opc_reg(s, OPC_DADDU, TCG_TMP3, TCG_TMP3, TCG_TMP1); =20 /* Load the tlb comparator. */ if (addr_type =3D=3D TCG_TYPE_I32) { @@ -1142,7 +1138,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext= *s, HostAddress *h, =20 /* delay slot */ base =3D TCG_TMP3; - tcg_out_opc_reg(s, ALIAS_PADD, base, TCG_TMP3, addr); + tcg_out_opc_reg(s, OPC_DADDU, base, TCG_TMP3, addr); } else { if (a_mask && (use_mips32r6_instructions || a_bits !=3D s_bits)) { ldst =3D new_ldst_label(s); @@ -1171,9 +1167,9 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext= *s, HostAddress *h, } if (guest_base) { if (guest_base =3D=3D (int16_t)guest_base) { - tcg_out_opc_imm(s, ALIAS_PADDI, TCG_REG_A0, base, guest_ba= se); + tcg_out_opc_imm(s, OPC_DADDIU, TCG_REG_A0, base, guest_bas= e); } else { - tcg_out_opc_reg(s, ALIAS_PADD, TCG_REG_A0, base, + tcg_out_opc_reg(s, OPC_DADDU, TCG_REG_A0, base, TCG_GUEST_BASE_REG); } base =3D TCG_REG_A0; @@ -1411,7 +1407,7 @@ static void tcg_out_exit_tb(TCGContext *s, uintptr_t = a0) } else { base =3D TCG_REG_V0; tcg_out_movi(s, TCG_TYPE_PTR, base, ofs - lo); - tcg_out_opc_reg(s, ALIAS_PADD, base, base, TCG_REG_TB); + tcg_out_opc_reg(s, OPC_DADDU, base, base, TCG_REG_TB); } } if (!tcg_out_opc_jmp(s, OPC_J, tb_ret_addr)) { @@ -1419,7 +1415,7 @@ static void tcg_out_exit_tb(TCGContext *s, uintptr_t = a0) tcg_out_opc_reg(s, OPC_JR, 0, TCG_TMP0, 0); } /* delay slot */ - tcg_out_opc_imm(s, ALIAS_PADDI, TCG_REG_V0, base, lo); + tcg_out_opc_imm(s, OPC_DADDIU, TCG_REG_V0, base, lo); } =20 static void tcg_out_goto_tb(TCGContext *s, int which) @@ -1438,7 +1434,7 @@ static void tcg_out_goto_tb(TCGContext *s, int which) =20 set_jmp_reset_offset(s, which); /* For the unlinked case, need to reset TCG_REG_TB. */ - tcg_out_ldst(s, ALIAS_PADDI, TCG_REG_TB, TCG_REG_TB, + tcg_out_ldst(s, OPC_DADDIU, TCG_REG_TB, TCG_REG_TB, -tcg_current_code_size(s)); } =20 @@ -2360,7 +2356,7 @@ static void tcg_target_qemu_prologue(TCGContext *s) tcg_set_frame(s, TCG_REG_SP, TCG_STATIC_CALL_ARGS_SIZE, TEMP_SIZE); =20 /* TB prologue */ - tcg_out_opc_imm(s, ALIAS_PADDI, TCG_REG_SP, TCG_REG_SP, -FRAME_SIZE); + tcg_out_opc_imm(s, OPC_DADDIU, TCG_REG_SP, TCG_REG_SP, -FRAME_SIZE); for (i =3D 0; i < ARRAY_SIZE(tcg_target_callee_save_regs); i++) { tcg_out_st(s, TCG_TYPE_REG, tcg_target_callee_save_regs[i], TCG_REG_SP, SAVE_OFS + i * REG_SIZE); @@ -2403,7 +2399,7 @@ static void tcg_target_qemu_prologue(TCGContext *s) =20 tcg_out_opc_reg(s, OPC_JR, 0, TCG_REG_RA, 0); /* delay slot */ - tcg_out_opc_imm(s, ALIAS_PADDI, TCG_REG_SP, TCG_REG_SP, FRAME_SIZE); + tcg_out_opc_imm(s, OPC_DADDIU, TCG_REG_SP, TCG_REG_SP, FRAME_SIZE); =20 if (use_mips32r2_instructions) { return; --=20 2.43.0 From nobody Fri Nov 14 16:56:40 2025 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=1760898638; cv=none; d=zohomail.com; s=zohoarc; b=N0KqyeB9wHuCYX2xKO/SaokNUL0tH0SsQgp52ucDloRo/J3sYLJ00JdsnBXCiyAepqe506LLduhrdF++vo8aaBIHucL7rHgGouPhpyNUc6FKS+s29zdJU8yK3RxrhD1V/4FR2c9J7e+AVkf3q7KfW9WQylPTu/upExyPG40L81U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760898638; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=m+6QxrQ2Grf7WmLsUxgCW2QmJGtF5cs8k5PSTxarhNg=; b=Rzzka9J8ZFxNjYVFFLvdTHp3MIeFmGK7mRkiqoFMwSNIQntZq0is23YXEywo+XSEuuyrKDgyPdruZb5UU+K/IgiNHxWiyWRQF4FRaqaqUhEktLRzFCzGnGi+/DmoGRrocD8c2vbgyvQptOVdk82IVBO/jVBALJmf97k1Qf2i2ks= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760898638346139.74360741929206; Sun, 19 Oct 2025 11:30:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAY9A-0005BZ-I5; Sun, 19 Oct 2025 14:28:48 -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 1vAY97-0005A3-Dj for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:45 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAY94-0000a5-V0 for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:45 -0400 Received: by mail-pg1-x52b.google.com with SMTP id 41be03b00d2f7-b49c1c130c9so2186584a12.0 for ; Sun, 19 Oct 2025 11:28:42 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29246ebccf3sm58985775ad.1.2025.10.19.11.28.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Oct 2025 11:28:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760898521; x=1761503321; darn=nongnu.org; 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=m+6QxrQ2Grf7WmLsUxgCW2QmJGtF5cs8k5PSTxarhNg=; b=KoSmEnLWQ9VlySBJAJryIB/1S4/D7/jMa3wgxXE7R3OuqO0qRdFJ3GsMkZR//QiBvc BgIo6cF33twAuggpXBkscatUmd1Muec33ENnlZ6MNYJzVnTL0gHQF9s6XKJVAg8lNZuh XpKjr6oDrF97SKvvVr+EeLRSSJAokCG6U3JuKP6fh4ov2vDxX10NuhwMp116Asv4034l M8zBSCuPi1J2RDUOObw2330Wi5ljg69KHRXgerY2PZ3FOE/33pQ0fwDyYhKAxyYDYuNN nOIB+2RnM2S+aINL/F5a4EcHYjncUYEekcUd2uBCrxhKbIC73nWXQia402IuDB8JMBwj o60A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760898521; x=1761503321; 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=m+6QxrQ2Grf7WmLsUxgCW2QmJGtF5cs8k5PSTxarhNg=; b=vT1Ki0jheLSZvJmVHwshSU8C/yYQGiClNAHAzYKvhru52hpyBVsvHo37j4PBk88Yhs GQNO1gaf8dc4tDetRszt1ho1ZQ3akzx0w3qlNrPUcL8tZgmWVHGd8lMyvAJXswmLnZ5C ubVMNG9WOn/3FNBZ4KXG726LDuebLw2ZA8lpyR+fq472DnGDlH+YoomRm/zaNOfX2wIx QNlbnh8zfpdd18XJKI83aP600yAFk2A1w9sQ40mrTbuSv+5Hs4IOjyIvk1rCCobC7T1P s4cwBwnO32NyM90Up1Sax5LoOVpffCLK4SuYNL9RIlT/G97YjPKkhCj6IGjfsHRciIt/ T4ng== X-Gm-Message-State: AOJu0Yz5cTece3sCcu9XFprbKwyCOJTI+cz5CGFzQ6HPzL3UMnSfkBzA 1L/Ys48LoVND4ari+E0PCmnDHBvpG00NxyNO8IxO/xPK2HQLdxLjrLMoGTxFlZR4jES44swAnkV rBMoHqZ0= X-Gm-Gg: ASbGncs70fT3a07AtWQPr607NvELdfyNcv9no7urIQDCCwohORZ7ELmESjJ+IBa9Y0U DLcMNtAYOehGPFpOueVRs+2o6lPev5GGH/JHf4liC+loGgS46oePSYv9Fw0r2nwtFTxwa3rFjCX BtMpx0mJyxHSCUPxoZvbgker7LR01e60Wm0P4LFSewtUX5MMbJoMZzg5g+5dF2a3AYppw8IcsfO pY0ZgkwMOOstg8FwYfeckZnHKAzZa0KTtw+wgjYZA+jL3llB5ni23TxJP9eieAkSqqfut3ZlOZ/ GQqSXEnRY/kmtfHBxFDoNY2/QQX0WaIug9U4kCiBHi3qbWpWKvVx4Kxsvelarvl7DuzIs1JXJ1k QbfyXFSc5DD3i5ov1JkBXm+sJq0004OYM203o9hNce3IYq2bUdskqcCCAvRSrISS9L6Q6kKbSEw 7ikG1eUtkSQUpVv9wt X-Google-Smtp-Source: AGHT+IHeltuXUntrSR8pI7fDhXAnJinTVYbyajvNUaB6HGYn8fcg7XnlrL347RJIwtLnOX/FkbHJfw== X-Received: by 2002:a17:902:db11:b0:28e:a70f:e879 with SMTP id d9443c01a7336-290c9c8cc5bmr145108855ad.1.1760898520999; Sun, 19 Oct 2025 11:28:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 7/9] buildsys: Remove support for 32-bit PPC hosts Date: Sun, 19 Oct 2025 11:28:32 -0700 Message-ID: <20251019182834.481541-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251019182834.481541-1-richard.henderson@linaro.org> References: <20251019182834.481541-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::52b; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52b.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760898641362158501 From: Philippe Mathieu-Daud=C3=A9 Stop detecting 32-bit PPC host as supported. See previous commit for rationale. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 [rth: Retain _ARCH_PPC64 check in udiv_qrnnd] Signed-off-by: Richard Henderson Message-ID: <20251014173900.87497-4-philmd@linaro.org> --- include/qemu/timer.h | 13 +------------ disas/disas-host.c | 4 +--- util/cacheflush.c | 4 ++-- configure | 19 +++++-------------- 4 files changed, 9 insertions(+), 31 deletions(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index aec730ac25..406d741120 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -850,12 +850,11 @@ static inline int64_t get_clock(void) /*******************************************/ /* host CPU ticks (if available) */ =20 -#if defined(_ARCH_PPC) +#if defined(_ARCH_PPC64) =20 static inline int64_t cpu_get_host_ticks(void) { int64_t retval; -#ifdef _ARCH_PPC64 /* This reads timebase in one 64bit go and includes Cell workaround fr= om: http://ozlabs.org/pipermail/linuxppc-dev/2006-October/027052.html */ @@ -863,16 +862,6 @@ static inline int64_t cpu_get_host_ticks(void) "cmpwi %0,0\n\t" "beq- $-8" : "=3Dr" (retval)); -#else - /* http://ozlabs.org/pipermail/linuxppc-dev/1999-October/003889.html */ - unsigned long junk; - __asm__ __volatile__ ("mfspr %1,269\n\t" /* mftbu */ - "mfspr %L0,268\n\t" /* mftb */ - "mfspr %0,269\n\t" /* mftbu */ - "cmpw %0,%1\n\t" - "bne $-16" - : "=3Dr" (retval), "=3Dr" (junk)); -#endif return retval; } =20 diff --git a/disas/disas-host.c b/disas/disas-host.c index 8146fafe80..4b06f41fa6 100644 --- a/disas/disas-host.c +++ b/disas/disas-host.c @@ -56,11 +56,9 @@ static void initialize_debug_host(CPUDebug *s) s->info.cap_mode =3D CS_MODE_64; s->info.cap_insn_unit =3D 1; s->info.cap_insn_split =3D 8; -#elif defined(_ARCH_PPC) +#elif defined(_ARCH_PPC64) s->info.cap_arch =3D CS_ARCH_PPC; -# ifdef _ARCH_PPC64 s->info.cap_mode =3D CS_MODE_64; -# endif #elif defined(__riscv) #if defined(_ILP32) || (__riscv_xlen =3D=3D 32) s->info.print_insn =3D print_insn_riscv32; diff --git a/util/cacheflush.c b/util/cacheflush.c index 17c58918de..69c9614e2c 100644 --- a/util/cacheflush.c +++ b/util/cacheflush.c @@ -153,7 +153,7 @@ static void arch_cache_info(int *isize, int *dsize) } } =20 -#elif defined(_ARCH_PPC) && defined(__linux__) +#elif defined(_ARCH_PPC64) && defined(__linux__) # include "elf.h" =20 static void arch_cache_info(int *isize, int *dsize) @@ -187,7 +187,7 @@ static void fallback_cache_info(int *isize, int *dsize) } else if (*dsize) { *isize =3D *dsize; } else { -#if defined(_ARCH_PPC) +#if defined(_ARCH_PPC64) /* * For PPC, we're going to use the cache sizes computed for * flush_idcache_range. Which means that we must use the diff --git a/configure b/configure index 8263f81370..a2f66f7ff9 100755 --- a/configure +++ b/configure @@ -391,15 +391,11 @@ elif check_define __sparc__ ; then else cpu=3D"sparc" fi -elif check_define _ARCH_PPC ; then - if check_define _ARCH_PPC64 ; then - if check_define _LITTLE_ENDIAN ; then - cpu=3D"ppc64le" - else - cpu=3D"ppc64" - fi +elif check_define _ARCH_PPC64 ; then + if check_define _LITTLE_ENDIAN ; then + cpu=3D"ppc64le" else - cpu=3D"ppc" + cpu=3D"ppc64" fi elif check_define __mips__ ; then if check_define __mips64 ; then @@ -472,11 +468,6 @@ case "$cpu" in linux_arch=3Dmips ;; =20 - ppc) - host_arch=3Dppc - linux_arch=3Dpowerpc - CPU_CFLAGS=3D"-m32" - ;; ppc64) host_arch=3Dppc64 linux_arch=3Dpowerpc @@ -1471,7 +1462,7 @@ probe_target_compiler() { container_image=3Ddebian-all-test-cross container_cross_prefix=3Dmips64-linux-gnuabi64- ;; - ppc|ppc64|ppc64le) + ppc64|ppc64le) container_image=3Ddebian-all-test-cross container_cross_prefix=3Dpowerpc${target_arch#ppc}-linux-gnu- ;; --=20 2.43.0 From nobody Fri Nov 14 16:56:40 2025 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=1760898636; cv=none; d=zohomail.com; s=zohoarc; b=LeRTwTP/STiuEin/GMr72A1jkElwIsTk8b8Oc+bbgFZySzw/E10R5dCWDet3Ng2BijWyZ4U3HBnRBZ7rUTcPP/IxK3hfrf7VdII5F7AjniDgC6/zJXqTfoPSwS+oLI42e0DUlGcdckMXg/f/BAdPej3u1iE5ZYQyBVfkwOVfpqQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760898636; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=sCA4lO39TZ+W18kn7Yc3OzkHymFkx8JhkJlKEUl0Maw=; b=hwxlWRgSmJqr8uTYTdLHLxNl7p4xlDbi2+ZyxgA1c2klRBCdNSmrCzfa0p8CER8Ps0iGAmf1tJ3JXARTmiXu3vLNWx2kmwlX/zG32bNUo20zF8giSXNqC3eYw6xWjd+uvGDphEZPU+/YYLOHQ4C6Tju79vmeNefE8etnhOoni8A= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760898636429875.8773125976953; Sun, 19 Oct 2025 11:30:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAY9A-0005Ba-MB; Sun, 19 Oct 2025 14:28:48 -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 1vAY97-00059b-01 for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:45 -0400 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAY95-0000aB-Ft for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:44 -0400 Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-33bbc4e81dfso3729711a91.1 for ; Sun, 19 Oct 2025 11:28:42 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29246ebccf3sm58985775ad.1.2025.10.19.11.28.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Oct 2025 11:28:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760898522; x=1761503322; darn=nongnu.org; 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=sCA4lO39TZ+W18kn7Yc3OzkHymFkx8JhkJlKEUl0Maw=; b=xc/3cQCr6uo5Uy3hx6hpt1EOgEDstRFwUErJMq204ln52mPvnRZkOFk6nO51UC2S4z nBdmYjokX4897OHXs1aaDdFAktvc+iDo6F56AM7iOVM7wPnQboPn/J9/uFla9znHfV5G IzwN7tQv/i3DCKUoQslcktXMcyYDkyq0aVUXmxLb9kjlBPTLtruJcMf8KQVDJ/JAnRYL GyRdjA9k8OuV1CwAsbc+tsj9xfxGREOqR2d0/W4FYNTXLHU6jJn7KWP0S/SUa/XD4B+9 GwORSDc/dqfKLmxwvVlNEo+pD3fP/Lh5W1as5ONodMm5WEIKymxm1NFqzzX24FS0lmMo HRSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760898522; x=1761503322; 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=sCA4lO39TZ+W18kn7Yc3OzkHymFkx8JhkJlKEUl0Maw=; b=L8Dp/yy/ph9uaone9qEQR454iAj30ifudwEISVR8HAqc+Qxhd/lC9ImNYxYnfxOOGp hnkk3/Aq/a7GGEERMmJBnyTw9AyUxxP7CFUroegLK22y4wEwy4zcw4qhfIVUoMPQkeWW wW0/momIvjznujWiZe2PQA0M3o8RDo6++CThgyzNr/Iz/M4oYY/pw7JdvlQpJtFCU1vQ oxORRLSTk85UpsrjlZFYbbhq8O0h7/znzwuYG9Ek0SsF8XkdU93WbaVxAJiYwnre4ydl sCVhLfkDURV7O4/QwKTLaFOJDcegp/XkPO9R+D4RoiQoiw3rONj+ASC9fX8c/l5/6AD3 LOJA== X-Gm-Message-State: AOJu0Yy6HmgJgxw7URJJ62yuhfZ4Km2gtaCpRan3Os0GZ5rVqb+TY9cC r6s97LVjOFokOXBpyu65Kcm8jX4sGdccvifYz6COPNo6eAzKjXn3US7jD+lb20oFMBny2jVrdVC S44IQ4vc= X-Gm-Gg: ASbGncv4CXec8+dkUEqJpbrL5XIOopNIuyumVyozSsulABlsEaYIj8k+Ol4D+/kYzIf wCaMl3DU3GSLNOiO/Z0pnjQejO+VJ1jMik2poXsGeg96Mn2rnF4k9BSJWNtIKTQ9t3t9QCETYer 9ZXEHAWgsh2vg/hf31N2P4SLVjMuzhp/vzAZF3YqJaBFXjW0GZFlI4xnYGIfp29vTdo7Z7J0q+l oDnXusOYene4IkAhunZ5lzagfauUxB4tqo2V3jPFwhRo9jO6Z906jBA9Yr0Jv+ouNbkmTTq5/Gx nz9wcn2wrgRFDTzAa6TtC9GiFIWANj0pMPZaowqRLj192K3+jANDmx/XEJ6hps2ii7gYzBGf7Zd Wl/oObMR5cqiaPsMcBR+0uEKu04/yKAIDXptQYEDP1C9EhBCUk47Q4HW8jBR2kMzpi0aMcd2vPc PV5w+VAbA3CwzM92WO X-Google-Smtp-Source: AGHT+IFNYzBmy4kDrlDRix3VYVJamW8OtR/x+DG0CcMPRnZDB3yf5t7llpqJ/B1/XGpVlq6vkH4OHA== X-Received: by 2002:a17:903:350d:b0:28b:4ca5:d522 with SMTP id d9443c01a7336-290cb94765fmr147777345ad.39.1760898521762; Sun, 19 Oct 2025 11:28:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 8/9] tcg/ppc: Remove dead cases from tcg_target_op_def Date: Sun, 19 Oct 2025 11:28:33 -0700 Message-ID: <20251019182834.481541-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251019182834.481541-1-richard.henderson@linaro.org> References: <20251019182834.481541-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::1036; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1036.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760898639234158500 Missed some lines when converting to TCGOutOpQemuLdSt*. Fixes: 86fe5c2597c ("tcg: Convert qemu_st{2} to TCGOutOpLdSt{2}") Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.c.inc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index b8b23d44d5..cd2b68f9e1 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -4435,12 +4435,6 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags) { switch (op) { - case INDEX_op_qemu_st: - return C_O0_I2(r, r); - case INDEX_op_qemu_st2: - return TCG_TARGET_REG_BITS =3D=3D 64 - ? C_O0_I3(o, m, r) : C_O0_I3(r, r, r); - case INDEX_op_add_vec: case INDEX_op_sub_vec: case INDEX_op_mul_vec: --=20 2.43.0 From nobody Fri Nov 14 16:56:40 2025 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=1760898573; cv=none; d=zohomail.com; s=zohoarc; b=MDpZaH2ZaXIdQctQ4B0LMiJzwRfzwPrYPYrowYCKedXSv5iFQ37jPk+S/4ifaK7TOYn1oLi/Tuc5Q0VkMQ/SiQiv8Shnu4oUkB8qiVqLE83rOXRvR8eTP+c2mrKvzoKWvtlmGFJx03oD8eo+43qOpbD58toOi8sq7SmadG8rc5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760898573; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+vPqycgqeHYP9wqVvXLdWY9Rm0HF5lWr6/dZ0KCgJxg=; b=g0EtQZRgpWX0ArUmpbbnGeiLUfAKc8upCZe3vjYUi/rHNhtXqp3iJ+eg5jOnO97uGgZW6QAEUox+zl/Ii6MyMuT/m4aClBXe2kAa6mQI1yjY+pp+dKulWs+cIUsSGBV+mfxfxh90vSy8zep5DcaBxNZV6rftLQ3vrThQbOegRnI= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760898573587252.1029708782528; Sun, 19 Oct 2025 11:29:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAY9F-0005Ci-Gl; Sun, 19 Oct 2025 14:28:53 -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 1vAY99-0005B8-DA for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:47 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAY96-0000aM-9V for qemu-devel@nongnu.org; Sun, 19 Oct 2025 14:28:47 -0400 Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-b55517e74e3so3745963a12.2 for ; Sun, 19 Oct 2025 11:28:43 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29246ebccf3sm58985775ad.1.2025.10.19.11.28.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Oct 2025 11:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760898523; x=1761503323; darn=nongnu.org; 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=+vPqycgqeHYP9wqVvXLdWY9Rm0HF5lWr6/dZ0KCgJxg=; b=WTZXsu2/ozW/+cxFsnrxo2ZWy4iO2iCFccgoCkQnST6nNj1KcipESscu20OEutrEGQ j8obrT9ANBhUyj45Sommov3+j9AESlGOVkiO98nWgkeZpmy/yj8oDLHt7J3Q/f0ESBwP 4B7FSWYnfP2Li7I+h1si881r9ma6XrlBdxuCNrp1mZofaaoa+kTJI9DCJH/eHGYGEv5W SLgGRLHajBke0fp9qGYIE44IYWXrYqwYdGasgfxyf/IoejQ/505c2BS5kP/UYrcz+Cm+ WaYuIagAvS1twn/eLFwDSL3b1cEPGvf4ICOZzgL2XA8E3X8Ec2dRu6z36CR36wx6DUf0 cDGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760898523; x=1761503323; 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=+vPqycgqeHYP9wqVvXLdWY9Rm0HF5lWr6/dZ0KCgJxg=; b=tqlbxtX5TSfXjKQE9bunD4hi5f0JBILUxfBW4jI8er3N2Xo/Li8+JQlbt3waW43kuZ jkOnumUZgKB01ZjB/yi1xvT4lBo1VndvsS0y0z6cx/9+gR8SXl/eCkpnqCj6cwzVTbks MHaEu3+TqINQ2cm2BMS5I1xch+BluoS8mFJXw5onJAO4LFkE8El6Rag7ezf6BhjaDusN JSbylgkqFjqRdzhjbPayQGBX3Y13MImACzq6oBT87C80/Up9xwK2T1iEKTvYz9no07KQ UXNp1NBz1N0dI3VngP9Mcj49AH38Eip6VNCUjtDIDOBgxXPUdtcGG46aCElLj71hSAol nmgA== X-Gm-Message-State: AOJu0YzB2KVEdU0wpD5cpwMErxH7sRSagzz8ErErc3F66JIvX4CXzhGB /RnJvhDCvYk7kPwaw4PZq6VPATxYw98SfGvCpeWH136nR6GOS/RKOqWjkvaJqXnVZ89nRkBBD+W EAD3NBqw= X-Gm-Gg: ASbGncvAfuPHkhrz78m3rTnBHfcYFebiyahex1Z1lESFiUgAp75AA9Y+Ofp7A5pfcgR hGKXKWdtIXuRR/xgztqXvkyCdKIFEVPE9Y5ougeFSsJbVs1RhnrDnXCLxo2MZI04Qp06kApfO2l uS/VeKVJoPR5cCx7zkyCxt8JrbxpYp+BWjP4w1EqTwUhKXnWwwbLr+z7pPrPRjTCDyd6fWy0zr2 OCNor5bnHayvabKAiBdNOy5AeY7lhpFZMh+Igoi6XwFsO9Q3ZSAFh2M2ee4v7UEz6ysOES3HmH6 eC6jdpnxCbrOUzNE7QbXUFQa/c3jSVUaXdwK7zEaRYh7/e7J5za+TJTg1mZAwVnEKMNwTAsLniX dKETEXILfhVAf21DYH6ny8WTr0evu9PvRdKYOBteMc3jp+VzfR5ole28f0y+sXrQ80Ihm8Z4wgG jjywSiZw== X-Google-Smtp-Source: AGHT+IEgp4izNpnMmxvgGEdPwu0QTrIhDikKgR0Ur20NkqoTX4XacTTzWrSohfwNggTiX1dkfiLwCA== X-Received: by 2002:a17:902:e546:b0:269:91b2:e9d6 with SMTP id d9443c01a7336-290cb65c529mr138388435ad.46.1760898522434; Sun, 19 Oct 2025 11:28:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 9/9] tcg/ppc: Remove support for 32-bit hosts Date: Sun, 19 Oct 2025 11:28:34 -0700 Message-ID: <20251019182834.481541-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251019182834.481541-1-richard.henderson@linaro.org> References: <20251019182834.481541-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::535; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x535.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760898576632154100 From: Philippe Mathieu-Daud=C3=A9 32-bit host support is deprecated since commit 6d701c9bac1 ("meson: Deprecate 32-bit host support"), released as v10.0. The next release being v10.2, we can remove the TCG backend for 32-bit PPC hosts. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Message-ID: <20251014173900.87497-2-philmd@linaro.org> --- tcg/ppc/tcg-target-has.h | 5 +- tcg/ppc/tcg-target-reg-bits.h | 8 +- tcg/ppc/tcg-target.c.inc | 385 +++++++--------------------------- 3 files changed, 79 insertions(+), 319 deletions(-) diff --git a/tcg/ppc/tcg-target-has.h b/tcg/ppc/tcg-target-has.h index 81ec5aece7..a3711feeae 100644 --- a/tcg/ppc/tcg-target-has.h +++ b/tcg/ppc/tcg-target-has.h @@ -17,12 +17,9 @@ #define have_vsx (cpuinfo & CPUINFO_VSX) =20 /* optional instructions */ -#if TCG_TARGET_REG_BITS =3D=3D 64 #define TCG_TARGET_HAS_extr_i64_i32 0 -#endif =20 -#define TCG_TARGET_HAS_qemu_ldst_i128 \ - (TCG_TARGET_REG_BITS =3D=3D 64 && have_isa_2_07) +#define TCG_TARGET_HAS_qemu_ldst_i128 have_isa_2_07 =20 #define TCG_TARGET_HAS_tst 1 =20 diff --git a/tcg/ppc/tcg-target-reg-bits.h b/tcg/ppc/tcg-target-reg-bits.h index 0efa80e7e0..3a15d7bee4 100644 --- a/tcg/ppc/tcg-target-reg-bits.h +++ b/tcg/ppc/tcg-target-reg-bits.h @@ -7,10 +7,10 @@ #ifndef TCG_TARGET_REG_BITS_H #define TCG_TARGET_REG_BITS_H =20 -#ifdef _ARCH_PPC64 -# define TCG_TARGET_REG_BITS 64 -#else -# define TCG_TARGET_REG_BITS 32 +#ifndef _ARCH_PPC64 +# error Expecting 64-bit host architecture #endif =20 +#define TCG_TARGET_REG_BITS 64 + #endif diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index cd2b68f9e1..3c36b26f25 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -29,35 +29,18 @@ * Apple XCode does not define _CALL_DARWIN. * Clang defines _CALL_ELF (64-bit) but not _CALL_SYSV or _CALL_AIX. */ -#if TCG_TARGET_REG_BITS =3D=3D 64 -# ifdef _CALL_AIX +#ifdef _CALL_AIX /* ok */ -# elif defined(_CALL_ELF) && _CALL_ELF =3D=3D 1 +#elif defined(_CALL_ELF) && _CALL_ELF =3D=3D 1 # define _CALL_AIX -# elif defined(_CALL_ELF) && _CALL_ELF =3D=3D 2 +#elif defined(_CALL_ELF) && _CALL_ELF =3D=3D 2 /* ok */ -# else -# error "Unknown ABI" -# endif #else -# if defined(_CALL_SYSV) || defined(_CALL_DARWIN) - /* ok */ -# elif defined(__APPLE__) -# define _CALL_DARWIN -# elif defined(__ELF__) -# define _CALL_SYSV -# else # error "Unknown ABI" -# endif #endif =20 -#if TCG_TARGET_REG_BITS =3D=3D 64 -# define TCG_TARGET_CALL_ARG_I32 TCG_CALL_ARG_EXTEND -# define TCG_TARGET_CALL_RET_I128 TCG_CALL_RET_NORMAL -#else -# define TCG_TARGET_CALL_ARG_I32 TCG_CALL_ARG_NORMAL -# define TCG_TARGET_CALL_RET_I128 TCG_CALL_RET_BY_REF -#endif +#define TCG_TARGET_CALL_ARG_I32 TCG_CALL_ARG_EXTEND +#define TCG_TARGET_CALL_RET_I128 TCG_CALL_RET_NORMAL #ifdef _CALL_SYSV # define TCG_TARGET_CALL_ARG_I64 TCG_CALL_ARG_EVEN # define TCG_TARGET_CALL_ARG_I128 TCG_CALL_ARG_BY_REF @@ -81,7 +64,7 @@ #define TCG_VEC_TMP2 TCG_REG_V1 =20 #define TCG_REG_TB TCG_REG_R31 -#define USE_REG_TB (TCG_TARGET_REG_BITS =3D=3D 64 && !have_isa_3_00) +#define USE_REG_TB !have_isa_3_00 =20 /* Shorthand for size of a pointer. Avoid promotion to unsigned. */ #define SZP ((int)sizeof(void *)) @@ -327,8 +310,7 @@ static bool tcg_target_const_match(int64_t sval, int ct, if (uval =3D=3D (uint32_t)uval && mask_operand(uval, &mb, &me)= ) { return 1; } - if (TCG_TARGET_REG_BITS =3D=3D 64 && - mask64_operand(uval << clz64(uval), &mb, &me)) { + if (mask64_operand(uval << clz64(uval), &mb, &me)) { return 1; } return 0; @@ -857,10 +839,8 @@ static bool tcg_out_mov(TCGContext *s, TCGType type, T= CGReg ret, TCGReg arg) return true; } switch (type) { - case TCG_TYPE_I64: - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 64); - /* fallthru */ case TCG_TYPE_I32: + case TCG_TYPE_I64: if (ret < TCG_REG_V0) { if (arg < TCG_REG_V0) { tcg_out32(s, OR | SAB(arg, ret, arg)); @@ -898,7 +878,6 @@ static bool tcg_out_mov(TCGContext *s, TCGType type, TC= GReg ret, TCGReg arg) static void tcg_out_rld_rc(TCGContext *s, int op, TCGReg ra, TCGReg rs, int sh, int mb, bool rc) { - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 64); sh =3D SH(sh & 0x1f) | (((sh >> 5) & 1) << 1); mb =3D MB64((mb >> 5) | ((mb << 1) & 0x3f)); tcg_out32(s, op | RA(ra) | RS(rs) | sh | mb | rc); @@ -946,13 +925,11 @@ static void tcg_out_ext16u(TCGContext *s, TCGReg dst,= TCGReg src) =20 static void tcg_out_ext32s(TCGContext *s, TCGReg dst, TCGReg src) { - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 64); tcg_out32(s, EXTSW | RA(dst) | RS(src)); } =20 static void tcg_out_ext32u(TCGContext *s, TCGReg dst, TCGReg src) { - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 64); tcg_out_rld(s, RLDICL, dst, src, 0, 32); } =20 @@ -968,7 +945,6 @@ static void tcg_out_extu_i32_i64(TCGContext *s, TCGReg = dst, TCGReg src) =20 static void tcg_out_extrl_i64_i32(TCGContext *s, TCGReg rd, TCGReg rn) { - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 64); tcg_out_mov(s, TCG_TYPE_I32, rd, rn); } =20 @@ -1037,9 +1013,7 @@ static void tcg_out_movi_int(TCGContext *s, TCGType t= ype, TCGReg ret, tcg_target_long tmp; int shift; =20 - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 64 || type =3D=3D TCG_TYPE= _I32); - - if (TCG_TARGET_REG_BITS =3D=3D 64 && type =3D=3D TCG_TYPE_I32) { + if (type =3D=3D TCG_TYPE_I32) { arg =3D (int32_t)arg; } =20 @@ -1076,7 +1050,7 @@ static void tcg_out_movi_int(TCGContext *s, TCGType t= ype, TCGReg ret, =20 /* Load 32-bit immediates with two insns. Note that we've already eliminated bare ADDIS, so we know both insns are required. */ - if (TCG_TARGET_REG_BITS =3D=3D 32 || arg =3D=3D (int32_t)arg) { + if (arg =3D=3D (int32_t)arg) { tcg_out32(s, ADDIS | TAI(ret, 0, arg >> 16)); tcg_out32(s, ORI | SAI(ret, ret, arg)); return; @@ -1227,19 +1201,10 @@ static void tcg_out_dupi_vec(TCGContext *s, TCGType= type, unsigned vece, if (have_vsx) { load_insn =3D type =3D=3D TCG_TYPE_V64 ? LXSDX : LXVDSX; load_insn |=3D VRT(ret) | RB(TCG_REG_TMP1); - if (TCG_TARGET_REG_BITS =3D=3D 64) { - new_pool_label(s, val, rel, s->code_ptr, add); - } else { - new_pool_l2(s, rel, s->code_ptr, add, val >> 32, val); - } + new_pool_label(s, val, rel, s->code_ptr, add); } else { load_insn =3D LVX | VRT(ret) | RB(TCG_REG_TMP1); - if (TCG_TARGET_REG_BITS =3D=3D 64) { - new_pool_l2(s, rel, s->code_ptr, add, val, val); - } else { - new_pool_l4(s, rel, s->code_ptr, add, - val >> 32, val, val >> 32, val); - } + new_pool_l2(s, rel, s->code_ptr, add, val, val); } =20 if (USE_REG_TB) { @@ -1351,7 +1316,6 @@ static void tcg_out_andi64(TCGContext *s, TCGReg dst,= TCGReg src, uint64_t c) { int mb, me; =20 - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 64); if (mask64_operand(c, &mb, &me)) { if (mb =3D=3D 0) { tcg_out_rld(s, RLDICR, dst, src, 0, me); @@ -1543,7 +1507,6 @@ static void tcg_out_ld(TCGContext *s, TCGType type, T= CGReg ret, break; case TCG_TYPE_I64: if (ret < TCG_REG_V0) { - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 64); tcg_out_mem_long(s, LD, LDX, ret, base, offset); break; } @@ -1598,7 +1561,6 @@ static void tcg_out_st(TCGContext *s, TCGType type, T= CGReg arg, break; case TCG_TYPE_I64: if (arg < TCG_REG_V0) { - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 64); tcg_out_mem_long(s, STD, STDX, arg, base, offset); break; } @@ -1641,7 +1603,7 @@ static inline bool tcg_out_sti(TCGContext *s, TCGType= type, TCGArg val, static void tcg_out_test(TCGContext *s, TCGReg dest, TCGReg arg1, TCGArg a= rg2, bool const_arg2, TCGType type, bool rc) { - int mb, me; + int mb, me, sh; =20 if (!const_arg2) { tcg_out32(s, AND | SAB(arg1, dest, arg2) | rc); @@ -1664,12 +1626,10 @@ static void tcg_out_test(TCGContext *s, TCGReg dest= , TCGReg arg1, TCGArg arg2, tcg_out_rlw_rc(s, RLWINM, dest, arg1, 0, mb, me, rc); return; } - if (TCG_TARGET_REG_BITS =3D=3D 64) { - int sh =3D clz64(arg2); - if (mask64_operand(arg2 << sh, &mb, &me)) { - tcg_out_rld_rc(s, RLDICR, dest, arg1, sh, me, rc); - return; - } + sh =3D clz64(arg2); + if (mask64_operand(arg2 << sh, &mb, &me)) { + tcg_out_rld_rc(s, RLDICR, dest, arg1, sh, me, rc); + return; } /* Constraints should satisfy this. */ g_assert_not_reached(); @@ -1680,8 +1640,6 @@ static void tcg_out_cmp(TCGContext *s, int cond, TCGA= rg arg1, TCGArg arg2, { uint32_t op; =20 - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 64 || type =3D=3D TCG_TYPE= _I32); - /* * Simplify the comparisons below wrt CMPI. * All of the tests are 16-bit, so a 32-bit sign extend always works. @@ -1747,7 +1705,7 @@ static void tcg_out_cmp(TCGContext *s, int cond, TCGA= rg arg1, TCGArg arg2, static void tcg_out_setcond_eq0(TCGContext *s, TCGType type, TCGReg dst, TCGReg src, bool neg) { - if (neg && (TCG_TARGET_REG_BITS =3D=3D 32 || type =3D=3D TCG_TYPE_I64)= ) { + if (neg && type =3D=3D TCG_TYPE_I64) { /* * X !=3D 0 implies X + -1 generates a carry. * RT =3D (~X + X) + CA @@ -1774,7 +1732,7 @@ static void tcg_out_setcond_eq0(TCGContext *s, TCGTyp= e type, static void tcg_out_setcond_ne0(TCGContext *s, TCGType type, TCGReg dst, TCGReg src, bool neg) { - if (!neg && (TCG_TARGET_REG_BITS =3D=3D 32 || type =3D=3D TCG_TYPE_I64= )) { + if (!neg && type =3D=3D TCG_TYPE_I64) { /* * X !=3D 0 implies X + -1 generates a carry. Extra addition * trickery means: R =3D X-1 + ~X + C =3D X-1 + (-X+1) + C =3D C. @@ -1814,8 +1772,6 @@ static void tcg_out_setcond(TCGContext *s, TCGType ty= pe, TCGCond cond, int sh; bool inv; =20 - tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 64 || type =3D=3D TCG_TYPE= _I32); - /* Ignore high bits of a potential constant arg2. */ if (type =3D=3D TCG_TYPE_I32) { arg2 =3D (uint32_t)arg2; @@ -2117,109 +2073,6 @@ static void tcg_out_cntxz(TCGContext *s, TCGType ty= pe, uint32_t opc, } } =20 -static void tcg_out_cmp2(TCGContext *s, TCGCond cond, TCGReg al, TCGReg ah, - TCGArg bl, bool blconst, TCGArg bh, bool bhconst) -{ - static const struct { uint8_t bit1, bit2; } bits[] =3D { - [TCG_COND_LT ] =3D { CR_LT, CR_LT }, - [TCG_COND_LE ] =3D { CR_LT, CR_GT }, - [TCG_COND_GT ] =3D { CR_GT, CR_GT }, - [TCG_COND_GE ] =3D { CR_GT, CR_LT }, - [TCG_COND_LTU] =3D { CR_LT, CR_LT }, - [TCG_COND_LEU] =3D { CR_LT, CR_GT }, - [TCG_COND_GTU] =3D { CR_GT, CR_GT }, - [TCG_COND_GEU] =3D { CR_GT, CR_LT }, - }; - - TCGCond cond2; - int op, bit1, bit2; - - switch (cond) { - case TCG_COND_EQ: - op =3D CRAND; - goto do_equality; - case TCG_COND_NE: - op =3D CRNAND; - do_equality: - tcg_out_cmp(s, cond, al, bl, blconst, 6, TCG_TYPE_I32); - tcg_out_cmp(s, cond, ah, bh, bhconst, 7, TCG_TYPE_I32); - tcg_out32(s, op | BT(0, CR_EQ) | BA(6, CR_EQ) | BB(7, CR_EQ)); - break; - - case TCG_COND_TSTEQ: - case TCG_COND_TSTNE: - if (blconst) { - tcg_out_andi32(s, TCG_REG_R0, al, bl); - } else { - tcg_out32(s, AND | SAB(al, TCG_REG_R0, bl)); - } - if (bhconst) { - tcg_out_andi32(s, TCG_REG_TMP1, ah, bh); - } else { - tcg_out32(s, AND | SAB(ah, TCG_REG_TMP1, bh)); - } - tcg_out32(s, OR | SAB(TCG_REG_R0, TCG_REG_R0, TCG_REG_TMP1) | 1); - break; - - case TCG_COND_LT: - case TCG_COND_LE: - case TCG_COND_GT: - case TCG_COND_GE: - case TCG_COND_LTU: - case TCG_COND_LEU: - case TCG_COND_GTU: - case TCG_COND_GEU: - bit1 =3D bits[cond].bit1; - bit2 =3D bits[cond].bit2; - op =3D (bit1 !=3D bit2 ? CRANDC : CRAND); - cond2 =3D tcg_unsigned_cond(cond); - - tcg_out_cmp(s, cond, ah, bh, bhconst, 6, TCG_TYPE_I32); - tcg_out_cmp(s, cond2, al, bl, blconst, 7, TCG_TYPE_I32); - tcg_out32(s, op | BT(0, CR_EQ) | BA(6, CR_EQ) | BB(7, bit2)); - tcg_out32(s, CROR | BT(0, CR_EQ) | BA(6, bit1) | BB(0, CR_EQ)); - break; - - default: - g_assert_not_reached(); - } -} - -static void tgen_setcond2(TCGContext *s, TCGCond cond, TCGReg ret, - TCGReg al, TCGReg ah, - TCGArg bl, bool const_bl, - TCGArg bh, bool const_bh) -{ - tcg_out_cmp2(s, cond, al, ah, bl, const_bl, bh, const_bh); - tcg_out32(s, MFOCRF | RT(TCG_REG_R0) | FXM(0)); - tcg_out_rlw(s, RLWINM, ret, TCG_REG_R0, CR_EQ + 0*4 + 1, 31, 31); -} - -#if TCG_TARGET_REG_BITS !=3D 32 -__attribute__((unused)) -#endif -static const TCGOutOpSetcond2 outop_setcond2 =3D { - .base.static_constraint =3D C_O1_I4(r, r, r, rU, rC), - .out =3D tgen_setcond2, -}; - -static void tgen_brcond2(TCGContext *s, TCGCond cond, TCGReg al, TCGReg ah, - TCGArg bl, bool const_bl, - TCGArg bh, bool const_bh, TCGLabel *l) -{ - assert(TCG_TARGET_REG_BITS =3D=3D 32); - tcg_out_cmp2(s, cond, al, ah, bl, const_bl, bh, const_bh); - tcg_out_bc_lab(s, TCG_COND_EQ, l); -} - -#if TCG_TARGET_REG_BITS !=3D 32 -__attribute__((unused)) -#endif -static const TCGOutOpBrcond2 outop_brcond2 =3D { - .base.static_constraint =3D C_O0_I4(r, r, rU, rC), - .out =3D tgen_brcond2, -}; - static void tcg_out_mb(TCGContext *s, unsigned a0) { uint32_t insn; @@ -2438,13 +2291,8 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContex= t *s, HostAddress *h, tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_TMP2, TCG_AREG0, table_off); =20 /* Extract the page index, shifted into place for tlb index. */ - if (TCG_TARGET_REG_BITS =3D=3D 32) { - tcg_out_shri32(s, TCG_REG_R0, addr, - TARGET_PAGE_BITS - CPU_TLB_ENTRY_BITS); - } else { - tcg_out_shri64(s, TCG_REG_R0, addr, - TARGET_PAGE_BITS - CPU_TLB_ENTRY_BITS); - } + tcg_out_shri64(s, TCG_REG_R0, addr, + TARGET_PAGE_BITS - CPU_TLB_ENTRY_BITS); tcg_out32(s, AND | SAB(TCG_REG_TMP1, TCG_REG_TMP1, TCG_REG_R0)); =20 /* @@ -2453,8 +2301,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext= *s, HostAddress *h, * We will ignore the high bits with tcg_out_cmp(..., addr_type). */ if (cmp_off =3D=3D 0) { - tcg_out32(s, (TCG_TARGET_REG_BITS =3D=3D 64 ? LDUX : LWZUX) - | TAB(TCG_REG_TMP2, TCG_REG_TMP1, TCG_REG_TMP2)); + tcg_out32(s, LDUX | TAB(TCG_REG_TMP2, TCG_REG_TMP1, TCG_REG_TM= P2)); } else { tcg_out32(s, ADD | TAB(TCG_REG_TMP1, TCG_REG_TMP1, TCG_REG_TMP= 2)); tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_TMP2, TCG_REG_TMP1, cmp_of= f); @@ -2464,51 +2311,36 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGConte= xt *s, HostAddress *h, * Load the TLB addend for use on the fast path. * Do this asap to minimize any load use delay. */ - if (TCG_TARGET_REG_BITS =3D=3D 64 || addr_type =3D=3D TCG_TYPE_I32= ) { - tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_TMP1, TCG_REG_TMP1, - offsetof(CPUTLBEntry, addend)); - } + tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_TMP1, TCG_REG_TMP1, + offsetof(CPUTLBEntry, addend)); =20 /* Clear the non-page, non-alignment bits from the address in R0. = */ - if (TCG_TARGET_REG_BITS =3D=3D 32) { - /* - * We don't support unaligned accesses on 32-bits. - * Preserve the bottom bits and thus trigger a comparison - * failure on unaligned accesses. - */ - if (a_bits < s_bits) { - a_bits =3D s_bits; - } - tcg_out_rlw(s, RLWINM, TCG_REG_R0, addr, 0, + TCGReg t =3D addr; + + /* + * If the access is unaligned, we need to make sure we fail if we + * cross a page boundary. The trick is to add the access size-1 + * to the address before masking the low bits. That will make the + * address overflow to the next page if we cross a page boundary, + * which will then force a mismatch of the TLB compare. + */ + if (a_bits < s_bits) { + unsigned a_mask =3D (1 << a_bits) - 1; + unsigned s_mask =3D (1 << s_bits) - 1; + tcg_out32(s, ADDI | TAI(TCG_REG_R0, t, s_mask - a_mask)); + t =3D TCG_REG_R0; + } + + /* Mask the address for the requested alignment. */ + if (addr_type =3D=3D TCG_TYPE_I32) { + tcg_out_rlw(s, RLWINM, TCG_REG_R0, t, 0, (32 - a_bits) & 31, 31 - TARGET_PAGE_BITS); + } else if (a_bits =3D=3D 0) { + tcg_out_rld(s, RLDICR, TCG_REG_R0, t, 0, 63 - TARGET_PAGE_BITS= ); } else { - TCGReg t =3D addr; - - /* - * If the access is unaligned, we need to make sure we fail if= we - * cross a page boundary. The trick is to add the access size= -1 - * to the address before masking the low bits. That will make= the - * address overflow to the next page if we cross a page bounda= ry, - * which will then force a mismatch of the TLB compare. - */ - if (a_bits < s_bits) { - unsigned a_mask =3D (1 << a_bits) - 1; - unsigned s_mask =3D (1 << s_bits) - 1; - tcg_out32(s, ADDI | TAI(TCG_REG_R0, t, s_mask - a_mask)); - t =3D TCG_REG_R0; - } - - /* Mask the address for the requested alignment. */ - if (addr_type =3D=3D TCG_TYPE_I32) { - tcg_out_rlw(s, RLWINM, TCG_REG_R0, t, 0, - (32 - a_bits) & 31, 31 - TARGET_PAGE_BITS); - } else if (a_bits =3D=3D 0) { - tcg_out_rld(s, RLDICR, TCG_REG_R0, t, 0, 63 - TARGET_PAGE_= BITS); - } else { - tcg_out_rld(s, RLDICL, TCG_REG_R0, t, - 64 - TARGET_PAGE_BITS, TARGET_PAGE_BITS - a_bi= ts); - tcg_out_rld(s, RLDICL, TCG_REG_R0, TCG_REG_R0, TARGET_PAGE= _BITS, 0); - } + tcg_out_rld(s, RLDICL, TCG_REG_R0, t, + 64 - TARGET_PAGE_BITS, TARGET_PAGE_BITS - a_bits); + tcg_out_rld(s, RLDICL, TCG_REG_R0, TCG_REG_R0, TARGET_PAGE_BIT= S, 0); } =20 /* Full comparison into cr0. */ @@ -2537,7 +2369,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext= *s, HostAddress *h, h->base =3D guest_base ? TCG_GUEST_BASE_REG : 0; } =20 - if (TCG_TARGET_REG_BITS =3D=3D 64 && addr_type =3D=3D TCG_TYPE_I32) { + if (addr_type =3D=3D TCG_TYPE_I32) { /* Zero-extend the guest address for use in the host address. */ tcg_out_ext32u(s, TCG_REG_TMP2, addr); h->index =3D TCG_REG_TMP2; @@ -2554,40 +2386,22 @@ static void tcg_out_qemu_ld(TCGContext *s, TCGReg d= atalo, TCGReg datahi, MemOp opc =3D get_memop(oi); TCGLabelQemuLdst *ldst; HostAddress h; + uint32_t insn =3D qemu_ldx_opc[opc & (MO_BSWAP | MO_SSIZE)]; =20 ldst =3D prepare_host_addr(s, &h, addr, oi, true); =20 - if (TCG_TARGET_REG_BITS =3D=3D 32 && (opc & MO_SIZE) =3D=3D MO_64) { - if (opc & MO_BSWAP) { - tcg_out32(s, ADDI | TAI(TCG_REG_R0, h.index, 4)); - tcg_out32(s, LWBRX | TAB(datalo, h.base, h.index)); - tcg_out32(s, LWBRX | TAB(datahi, h.base, TCG_REG_R0)); - } else if (h.base !=3D 0) { - tcg_out32(s, ADDI | TAI(TCG_REG_R0, h.index, 4)); - tcg_out32(s, LWZX | TAB(datahi, h.base, h.index)); - tcg_out32(s, LWZX | TAB(datalo, h.base, TCG_REG_R0)); - } else if (h.index =3D=3D datahi) { - tcg_out32(s, LWZ | TAI(datalo, h.index, 4)); - tcg_out32(s, LWZ | TAI(datahi, h.index, 0)); - } else { - tcg_out32(s, LWZ | TAI(datahi, h.index, 0)); - tcg_out32(s, LWZ | TAI(datalo, h.index, 4)); - } + if (!have_isa_2_06 && insn =3D=3D LDBRX) { + tcg_out32(s, ADDI | TAI(TCG_REG_R0, h.index, 4)); + tcg_out32(s, LWBRX | TAB(datalo, h.base, h.index)); + tcg_out32(s, LWBRX | TAB(TCG_REG_R0, h.base, TCG_REG_R0)); + tcg_out_rld(s, RLDIMI, datalo, TCG_REG_R0, 32, 0); + } else if (insn) { + tcg_out32(s, insn | TAB(datalo, h.base, h.index)); } else { - uint32_t insn =3D qemu_ldx_opc[opc & (MO_BSWAP | MO_SSIZE)]; - if (!have_isa_2_06 && insn =3D=3D LDBRX) { - tcg_out32(s, ADDI | TAI(TCG_REG_R0, h.index, 4)); - tcg_out32(s, LWBRX | TAB(datalo, h.base, h.index)); - tcg_out32(s, LWBRX | TAB(TCG_REG_R0, h.base, TCG_REG_R0)); - tcg_out_rld(s, RLDIMI, datalo, TCG_REG_R0, 32, 0); - } else if (insn) { - tcg_out32(s, insn | TAB(datalo, h.base, h.index)); - } else { - insn =3D qemu_ldx_opc[opc & (MO_SIZE | MO_BSWAP)]; - tcg_out32(s, insn | TAB(datalo, h.base, h.index)); - tcg_out_movext(s, TCG_TYPE_REG, datalo, - TCG_TYPE_REG, opc & MO_SSIZE, datalo); - } + insn =3D qemu_ldx_opc[opc & (MO_SIZE | MO_BSWAP)]; + tcg_out32(s, insn | TAB(datalo, h.base, h.index)); + tcg_out_movext(s, TCG_TYPE_REG, datalo, + TCG_TYPE_REG, opc & MO_SSIZE, datalo); } =20 if (ldst) { @@ -2604,32 +2418,17 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg d= atalo, TCGReg datahi, MemOp opc =3D get_memop(oi); TCGLabelQemuLdst *ldst; HostAddress h; + uint32_t insn =3D qemu_stx_opc[opc & (MO_BSWAP | MO_SIZE)]; =20 ldst =3D prepare_host_addr(s, &h, addr, oi, false); =20 - if (TCG_TARGET_REG_BITS =3D=3D 32 && (opc & MO_SIZE) =3D=3D MO_64) { - if (opc & MO_BSWAP) { - tcg_out32(s, ADDI | TAI(TCG_REG_R0, h.index, 4)); - tcg_out32(s, STWBRX | SAB(datalo, h.base, h.index)); - tcg_out32(s, STWBRX | SAB(datahi, h.base, TCG_REG_R0)); - } else if (h.base !=3D 0) { - tcg_out32(s, ADDI | TAI(TCG_REG_R0, h.index, 4)); - tcg_out32(s, STWX | SAB(datahi, h.base, h.index)); - tcg_out32(s, STWX | SAB(datalo, h.base, TCG_REG_R0)); - } else { - tcg_out32(s, STW | TAI(datahi, h.index, 0)); - tcg_out32(s, STW | TAI(datalo, h.index, 4)); - } + if (!have_isa_2_06 && insn =3D=3D STDBRX) { + tcg_out32(s, STWBRX | SAB(datalo, h.base, h.index)); + tcg_out32(s, ADDI | TAI(TCG_REG_TMP2, h.index, 4)); + tcg_out_shri64(s, TCG_REG_R0, datalo, 32); + tcg_out32(s, STWBRX | SAB(TCG_REG_R0, h.base, TCG_REG_TMP2)); } else { - uint32_t insn =3D qemu_stx_opc[opc & (MO_BSWAP | MO_SIZE)]; - if (!have_isa_2_06 && insn =3D=3D STDBRX) { - tcg_out32(s, STWBRX | SAB(datalo, h.base, h.index)); - tcg_out32(s, ADDI | TAI(TCG_REG_TMP2, h.index, 4)); - tcg_out_shri64(s, TCG_REG_R0, datalo, 32); - tcg_out32(s, STWBRX | SAB(TCG_REG_R0, h.base, TCG_REG_TMP2)); - } else { - tcg_out32(s, insn | SAB(datalo, h.base, h.index)); - } + tcg_out32(s, insn | SAB(datalo, h.base, h.index)); } =20 if (ldst) { @@ -2709,16 +2508,11 @@ static const TCGOutOpQemuLdSt outop_qemu_ld =3D { static void tgen_qemu_ld2(TCGContext *s, TCGType type, TCGReg datalo, TCGReg datahi, TCGReg addr, MemOpIdx oi) { - if (TCG_TARGET_REG_BITS =3D=3D 32) { - tcg_out_qemu_ld(s, datalo, datahi, addr, oi, type); - } else { - tcg_out_qemu_ldst_i128(s, datalo, datahi, addr, oi, true); - } + tcg_out_qemu_ldst_i128(s, datalo, datahi, addr, oi, true); } =20 static const TCGOutOpQemuLdSt2 outop_qemu_ld2 =3D { - .base.static_constraint =3D - TCG_TARGET_REG_BITS =3D=3D 64 ? C_N1O1_I1(o, m, r) : C_O2_I1(r, r,= r), + .base.static_constraint =3D C_N1O1_I1(o, m, r), .out =3D tgen_qemu_ld2, }; =20 @@ -2736,16 +2530,11 @@ static const TCGOutOpQemuLdSt outop_qemu_st =3D { static void tgen_qemu_st2(TCGContext *s, TCGType type, TCGReg datalo, TCGReg datahi, TCGReg addr, MemOpIdx oi) { - if (TCG_TARGET_REG_BITS =3D=3D 32) { - tcg_out_qemu_st(s, datalo, datahi, addr, oi, type); - } else { - tcg_out_qemu_ldst_i128(s, datalo, datahi, addr, oi, false); - } + tcg_out_qemu_ldst_i128(s, datalo, datahi, addr, oi, false); } =20 static const TCGOutOpQemuLdSt2 outop_qemu_st2 =3D { - .base.static_constraint =3D - TCG_TARGET_REG_BITS =3D=3D 64 ? C_O0_I3(o, m, r) : C_O0_I3(r, r, r= ), + .base.static_constraint =3D C_O0_I3(o, m, r), .out =3D tgen_qemu_st2, }; =20 @@ -2767,16 +2556,11 @@ static void tcg_out_nop_fill(tcg_insn_unit *p, int = count) #elif defined(_CALL_DARWIN) # define LINK_AREA_SIZE (6 * SZR) # define LR_OFFSET (2 * SZR) -#elif TCG_TARGET_REG_BITS =3D=3D 64 +#else # if defined(_CALL_ELF) && _CALL_ELF =3D=3D 2 # define LINK_AREA_SIZE (4 * SZR) # define LR_OFFSET (1 * SZR) # endif -#else /* TCG_TARGET_REG_BITS =3D=3D 32 */ -# if defined(_CALL_SYSV) -# define LINK_AREA_SIZE (2 * SZR) -# define LR_OFFSET (1 * SZR) -# endif #endif #ifndef LR_OFFSET # error "Unhandled abi" @@ -3107,7 +2891,6 @@ static void tgen_eqv(TCGContext *s, TCGType type, tcg_out32(s, EQV | SAB(a1, a0, a2)); } =20 -#if TCG_TARGET_REG_BITS =3D=3D 64 static void tgen_extrh_i64_i32(TCGContext *s, TCGType t, TCGReg a0, TCGReg= a1) { tcg_out_shri64(s, a0, a1, 32); @@ -3117,7 +2900,6 @@ static const TCGOutOpUnary outop_extrh_i64_i32 =3D { .base.static_constraint =3D C_O1_I1(r, r), .out_rr =3D tgen_extrh_i64_i32, }; -#endif =20 static void tgen_divs(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1, TCGReg a2) @@ -3596,7 +3378,6 @@ static const TCGOutOpBswap outop_bswap32 =3D { .out_rr =3D tgen_bswap32, }; =20 -#if TCG_TARGET_REG_BITS =3D=3D 64 static void tgen_bswap64(TCGContext *s, TCGType type, TCGReg dst, TCGReg s= rc) { TCGReg t0 =3D dst =3D=3D src ? TCG_REG_R0 : dst; @@ -3639,7 +3420,6 @@ static const TCGOutOpUnary outop_bswap64 =3D { .base.static_constraint =3D C_O1_I1(r, r), .out_rr =3D tgen_bswap64, }; -#endif /* TCG_TARGET_REG_BITS =3D=3D 64 */ =20 static void tgen_neg(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1) { @@ -3776,7 +3556,6 @@ static const TCGOutOpLoad outop_ld16s =3D { .out =3D tgen_ld16s, }; =20 -#if TCG_TARGET_REG_BITS =3D=3D 64 static void tgen_ld32u(TCGContext *s, TCGType type, TCGReg dest, TCGReg base, ptrdiff_t offset) { @@ -3798,7 +3577,6 @@ static const TCGOutOpLoad outop_ld32s =3D { .base.static_constraint =3D C_O1_I1(r, r), .out =3D tgen_ld32s, }; -#endif =20 static void tgen_st8(TCGContext *s, TCGType type, TCGReg data, TCGReg base, ptrdiff_t offset) @@ -4278,14 +4056,6 @@ static void tcg_out_vec_op(TCGContext *s, TCGOpcode = opc, tcg_out_bitsel_vec(s, a0, a1, a2, args[3]); return; =20 - case INDEX_op_dup2_vec: - assert(TCG_TARGET_REG_BITS =3D=3D 32); - /* With inputs a1 =3D xLxx, a2 =3D xHxx */ - tcg_out32(s, VMRGHW | VRT(a0) | VRA(a2) | VRB(a1)); /* a0 =3D xx= HL */ - tcg_out_vsldoi(s, TCG_VEC_TMP1, a0, a0, 8); /* tmp =3D HL= xx */ - tcg_out_vsldoi(s, a0, a0, TCG_VEC_TMP1, 8); /* a0 =3D HL= HL */ - return; - case INDEX_op_ppc_mrgh_vec: insn =3D mrgh_op[vece]; break; @@ -4465,7 +4235,6 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigne= d flags) case INDEX_op_ppc_muleu_vec: case INDEX_op_ppc_mulou_vec: case INDEX_op_ppc_pkum_vec: - case INDEX_op_dup2_vec: return C_O1_I2(v, v, v); =20 case INDEX_op_not_vec: @@ -4543,9 +4312,7 @@ static void tcg_target_init(TCGContext *s) #if defined(_CALL_SYSV) tcg_regset_set_reg(s->reserved_regs, TCG_REG_R2); /* toc pointer */ #endif -#if defined(_CALL_SYSV) || TCG_TARGET_REG_BITS =3D=3D 64 tcg_regset_set_reg(s->reserved_regs, TCG_REG_R13); /* thread pointer */ -#endif tcg_regset_set_reg(s->reserved_regs, TCG_REG_TMP1); tcg_regset_set_reg(s->reserved_regs, TCG_REG_TMP2); tcg_regset_set_reg(s->reserved_regs, TCG_VEC_TMP1); @@ -4566,11 +4333,7 @@ typedef struct { /* We're expecting a 2 byte uleb128 encoded value. */ QEMU_BUILD_BUG_ON(FRAME_SIZE >=3D (1 << 14)); =20 -#if TCG_TARGET_REG_BITS =3D=3D 64 -# define ELF_HOST_MACHINE EM_PPC64 -#else -# define ELF_HOST_MACHINE EM_PPC -#endif +#define ELF_HOST_MACHINE EM_PPC64 =20 static DebugFrame debug_frame =3D { .cie.len =3D sizeof(DebugFrameCIE)-4, /* length after .len member */ --=20 2.43.0