From nobody Sat May 30 17:44:36 2026 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=1779305067; cv=none; d=zohomail.com; s=zohoarc; b=ewJFvt3xRozHaeQHf0EvDH9BZnH3/bBoBlqSs/WvFQWxmwYTjEt3xAwkcJRiZnyHngcCleSiuMaFK9+GmIeEXUgdYnN2E3HG59Nwu2ZHVsVe/2m7Jwlyv/GEPJ6zB/qa2PBhWmc/yfaZnLlpXyTgDLfig5LY3h3k+0Gpyze1CNw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305067; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=pzFene+XPTuBXmA2I8ll8nMg8ewupOG9aMP0/WLLdZg=; b=Pqnp/td+j0lQmi4hoxRqi5jGug0S/zx0YPKzB1GvAdh/jCd7AHWaVxai4w9p0jcwO9X6y4c4DqhpZCs0As3ktPaIa8fxGayuabH3t2hotCP4ewVYeuww3Fnpwkusnvnp5xwMRF1Yryj3YKhbWD96mzKDhLmVf478SlkcecXaxa8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305067040314.57416163316066; Wed, 20 May 2026 12:24:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmWK-00079Q-7F; Wed, 20 May 2026 15:23:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmWG-00078Q-G0 for qemu-devel@nongnu.org; Wed, 20 May 2026 15:23:53 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmWD-0001gp-VO for qemu-devel@nongnu.org; Wed, 20 May 2026 15:23:52 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4891e5b9c1fso46718675e9.2 for ; Wed, 20 May 2026 12:23:49 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49033d2fd6bsm11667585e9.1.2026.05.20.12.23.46 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:23:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305027; x=1779909827; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pzFene+XPTuBXmA2I8ll8nMg8ewupOG9aMP0/WLLdZg=; b=ZN9fzmDTZvIBChMVhrxsJW7yRuXNkMZjRxrM1Nk4aepIjumink882uvu0+6LiCWqfa fK9debCxCZqpTYI/ZRuK92pcWnPujYxhcZ0Ow5/okzT9kqwdhMYfNGToZ2T0KqLx3g6g qnNun1S4R5ASENZijkdGv76SIQoTkPmQIbI3KzYlTE3uROZXDj0V4swORKkVUyPch8it uilhMsOAZg2XgjW+q/lHAw6sbPKV2vin4O67qEDMORI+rRizqtPd9uOJt/t305L1ueDr tFX2EZbdrT1GZ6otaKSRSH/7s5crrDLmDkJL9ob5PBDBflXuP38yngE/rZ0zHOUpLcRq 5rYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305027; x=1779909827; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=pzFene+XPTuBXmA2I8ll8nMg8ewupOG9aMP0/WLLdZg=; b=AmM9JJRRO4npXNq4chJgLTZl7Vk+oDCQ3nKzHm0YZnjFk38iRQsaGWuep16C2rncdo eJSZdMY4CFMeZ2Kkff34Ic8FzJtEpOyRYqhoMtizkYzLE2/30PjXIDQGGqPay0a1yyQQ gWMBvsMeulQ2vFPLof1S3eITmRuLEPvVzJwxLCoQj/d3/MZMpuRO9g1cu4ijUp9+Hesv Cf+SJtBjxI+6RuJ8gGN05NLsnXSoWhdXs9+sbQ3oT9pthj7FwqZYhTTmkiYyzt71gl4y pDKRSYg9K4m4gwO2fhOOmY3mnRK80vB8GeKIIMhd5gmV66moeHUj2l2IVhnKzdmeQlJg Ok/w== X-Gm-Message-State: AOJu0YxgAzKwi2/gz1t5zssZih+oSU+LZ/uZIbBnqENnVwwO2hIcGni7 t0kSsCqUL88cfhfVcswvBZ5Hqumm7288MFSSGpJt8BJD5uzRrmqs4YgM5WoVITEQd22IJZ7Me4a m7OWu+8E= X-Gm-Gg: Acq92OHk3uWM09JI8+j87Imqk0ntC42c8qIrOjvGCJ6W61XAOyUy+DK2JbiOU3N7tOg Ys2ut0CyhB2ZsH4sLFc8ftCuIA/hWL4qwQ06sNMcKLP6oc7LHrgjdjPqT5EjGHmctmDRQDrQBT0 yz5TCmEgg2Xspj4FgtxWFJMKb9thLh7+2vU4he25AnaPQIKaJC/38K41sOFY5dRdoBHtGeSwDts lMQj8gPOJLDAN8+ii/Z9h+bXIlL6/5GYRTsMLI71Rmj2rGi0BSgOJpy3wJrq5+sd6sbkfD2rtEP XcXv7VC9UXSzM3T0URJI1gMuiwtqcDVAWKMljZYgnIKEc8mgcBW6BA6KC/8uoDKIRFFsJagqd+7 bRdWPPy8lhPNuNUot3EdaFMbkYrk05RDTHMV0Ha85X0jEIvd637qNuCbHj/ZnPtnDmZvxImrKwS Rn3L5DmMvdumlyiAi/dtEdsGSWbNisxbV6JM0jbHISQ1K+wa5v2wO+vBckZ/QAcocDdOLxo/46 X-Received: by 2002:a05:600c:5ca:b0:48f:e6de:1cb9 with SMTP id 5b1f17b1804b1-48fe6de1dd2mr243248675e9.19.1779305027450; Wed, 20 May 2026 12:23:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 01/33] docker: Remove LegacyKeyValueFormat warnings in non-generated files Date: Wed, 20 May 2026 21:23:06 +0200 Message-ID: <20260520192338.40036-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: qemu development 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: 1779305068017158500 Manually update Dockerfiles to not use legacy 'ENV key value' format: https://docs.docker.com/reference/build-checks/legacy-key-value-format/ This removes warnings when building / using the containers: - LegacyKeyValueFormat: "ENV key=3Dvalue" should be used instead of legacy= "ENV key value" format (line 98) - LegacyKeyValueFormat: "ENV key=3Dvalue" should be used instead of legacy= "ENV key value" format (line 64) - LegacyKeyValueFormat: "ENV key=3Dvalue" should be used instead of legacy= "ENV key value" format (line 97) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Brian Cain Message-ID: <20260518102222.80735-7-philmd@linaro.org> Signed-off-by: Alex Benn=C3=A9e --- .../docker/dockerfiles/debian-hexagon-cross.docker | 14 +++++++------- .../dockerfiles/debian-loongarch-cross.docker | 10 +++++----- .../docker/dockerfiles/debian-tricore-cross.docker | 6 +++--- .../docker/dockerfiles/debian-xtensa-cross.docker | 8 ++++---- tests/docker/dockerfiles/python.docker | 5 +++-- scripts/coverity-scan/coverity-scan.docker | 12 ++++++------ 6 files changed, 28 insertions(+), 27 deletions(-) diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/d= ocker/dockerfiles/debian-hexagon-cross.docker index 91d4b71ac95..3c94f040b81 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -39,15 +39,15 @@ RUN apt-get update && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt =20 -ENV TOOLCHAIN_INSTALL /opt -ENV TOOLCHAIN_RELEASE 12.Dec.2023 -ENV TOOLCHAIN_BASENAME "clang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unkn= own-linux-musl" -ENV TOOLCHAIN_URL https://codelinaro.jfrog.io/artifactory/codelinaro-toolc= hain-for-hexagon/${TOOLCHAIN_RELEASE}/${TOOLCHAIN_BASENAME}.tar.xz -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV TOOLCHAIN_INSTALL=3D/opt +ENV TOOLCHAIN_RELEASE=3D12.Dec.2023 +ENV TOOLCHAIN_BASENAME=3Dclang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unk= nown-linux-musl +ENV TOOLCHAIN_URL=3Dhttps://codelinaro.jfrog.io/artifactory/codelinaro-too= lchain-for-hexagon/${TOOLCHAIN_RELEASE}/${TOOLCHAIN_BASENAME}.tar.xz +ENV CCACHE_WRAPPERSDIR=3D/usr/libexec/ccache-wrappers =20 RUN curl -#SL "$TOOLCHAIN_URL" | tar -xJC "$TOOLCHAIN_INSTALL" -ENV PATH $PATH:${TOOLCHAIN_INSTALL}/${TOOLCHAIN_BASENAME}/x86_64-linux-gnu= /bin -ENV MAKE /usr/bin/make +ENV PATH=3D$PATH:${TOOLCHAIN_INSTALL}/${TOOLCHAIN_BASENAME}/x86_64-linux-g= nu/bin +ENV MAKE=3D/usr/bin/make # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests= /docker/dockerfiles/debian-loongarch-cross.docker index 55b3dbe4510..d2ba07972ce 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -40,12 +40,12 @@ RUN apt-get update && \ RUN curl -#SL https://github.com/loongson/build-tools/releases/download/20= 23.08.08/CLFS-loongarch64-8.1-x86_64-cross-tools-gcc-glibc.tar.xz \ | tar -xJC /opt =20 -ENV PATH $PATH:/opt/cross-tools/bin -ENV LD_LIBRARY_PATH /opt/cross-tools/lib:/opt/cross-tools/loongarch64-unkn= own-linux-gnu/lib:$LD_LIBRARY_PATH +ENV PATH=3D$PATH:/opt/cross-tools/bin +ENV LD_LIBRARY_PATH=3D/opt/cross-tools/lib:/opt/cross-tools/loongarch64-un= known-linux-gnu/lib:$LD_LIBRARY_PATH =20 -ENV QEMU_CONFIGURE_OPTS --disable-docs --disable-tools -ENV DEF_TARGET_LIST loongarch64-linux-user,loongarch64-softmmu -ENV MAKE /usr/bin/make +ENV QEMU_CONFIGURE_OPTS=3D"--disable-docs --disable-tools" +ENV DEF_TARGET_LIST=3Dloongarch64-linux-user,loongarch64-softmmu +ENV MAKE=3D/usr/bin/make =20 # As a final step configure the user (if env is defined) ARG USER diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/d= ocker/dockerfiles/debian-tricore-cross.docker index fd797dc7ee4..9e7ff321677 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -40,9 +40,9 @@ RUN curl -#SL https://github.com/bkoppelmann/package_940/= releases/download/trico | tar -xzC /usr/local/ =20 # This image can only build a very minimal QEMU as well as the tests -ENV DEF_TARGET_LIST tricore-softmmu -ENV QEMU_CONFIGURE_OPTS --disable-user --disable-tools --disable-fdt -ENV MAKE /usr/bin/make +ENV DEF_TARGET_LIST=3Dtricore-softmmu +ENV QEMU_CONFIGURE_OPTS=3D"--disable-user --disable-tools --disable-fdt" +ENV MAKE=3D/usr/bin/make # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/do= cker/dockerfiles/debian-xtensa-cross.docker index ef63e44e2ef..d9130fc3378 100644 --- a/tests/docker/dockerfiles/debian-xtensa-cross.docker +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker @@ -19,16 +19,16 @@ RUN apt-get update && \ python3-minimal && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt =20 -ENV CPU_LIST dc232b dc233c de233_fpu dsp3400 -ENV TOOLCHAIN_RELEASE 2020.07 +ENV CPU_LIST=3D"dc232b dc233c de233_fpu dsp3400" +ENV TOOLCHAIN_RELEASE=3D2020.07 =20 RUN for cpu in $CPU_LIST; do \ curl -#SL http://github.com/foss-xtensa/toolchain/releases/downloa= d/$TOOLCHAIN_RELEASE/x86_64-$TOOLCHAIN_RELEASE-xtensa-$cpu-elf.tar.gz \ | tar -xzC /opt; \ done =20 -ENV PATH $PATH:/opt/$TOOLCHAIN_RELEASE/xtensa-dc232b-elf/bin:/opt/$TOOLCHA= IN_RELEASE/xtensa-dc233c-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-de233_fpu-e= lf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-dsp3400-elf/bin -ENV MAKE /usr/bin/make +ENV PATH=3D$PATH:/opt/$TOOLCHAIN_RELEASE/xtensa-dc232b-elf/bin:/opt/$TOOLC= HAIN_RELEASE/xtensa-dc233c-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-de233_fpu= -elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-dsp3400-elf/bin +ENV MAKE=3D/usr/bin/make # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/python.docker b/tests/docker/dockerfi= les/python.docker index 59e70a02484..79c554a2d87 100644 --- a/tests/docker/dockerfiles/python.docker +++ b/tests/docker/dockerfiles/python.docker @@ -4,7 +4,7 @@ FROM fedora:latest MAINTAINER John Snow =20 # Please keep this list sorted alphabetically -ENV PACKAGES \ +ENV PACKAGES=3D"\ gcc \ make \ python3 \ @@ -15,7 +15,8 @@ ENV PACKAGES \ python3.11 \ python3.12 \ python3.13 \ - python3.9 + python3.9 \ + " =20 RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt diff --git a/scripts/coverity-scan/coverity-scan.docker b/scripts/coverity-= scan/coverity-scan.docker index 93e558c8623..30d154c0d86 100644 --- a/scripts/coverity-scan/coverity-scan.docker +++ b/scripts/coverity-scan/coverity-scan.docker @@ -152,12 +152,12 @@ exec "$@"' > /usr/bin/nosync && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV QEMU_CONFIGURE_OPTS --meson=3Dinternal +ENV CCACHE_WRAPPERSDIR=3D/usr/libexec/ccache-wrappers +ENV LANG=3Den_US.UTF-8 +ENV MAKE=3D/usr/bin/make +ENV NINJA=3D/usr/bin/ninja +ENV PYTHON=3D/usr/bin/python3 +ENV QEMU_CONFIGURE_OPTS=3D--meson=3Dinternal =20 RUN dnf install -y curl wget ENV COVERITY_TOOL_BASE=3D/coverity-tools --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305095; cv=none; d=zohomail.com; s=zohoarc; b=C7Uh4785ZEonee0OISMVfuxM15CHpi4zImTrDzlgxS9KRiPNPikISlbuuTWaqM68AmAaEVW241F/kGVPTgwef7HLp5/XcGjxiWPULESj875ZoDIv/sMe0rO9WbGBVDRHXobpHLmtsUA4lkJyk+3YaTYOIWx++Txbvi+2l5GNRpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305095; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=K7o1REZCIRQjP6nGv0AU1D9abS0hPdsXD8frplxvXTQ=; b=ntqE2y4YFQ1qL3WIwGijBF/9qukKbqnCAIV5z+Efaj0CoNAJb1DQ4y4nxGyQ57CLhgVV6XVMvlOBnMNYVwdIZbrqxKCvUboucyLUlkBQHRhyshEzxGHVwvsF2gorVuZgLBy7eDhCWTHrERO2b9vVkAmqTr4vzh/56Vdl9jubJ3A= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305095802641.0318978256932; Wed, 20 May 2026 12:24:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmWT-0007Cg-Al; Wed, 20 May 2026 15:24:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmWP-0007BJ-Ml for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:03 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmWL-0001hd-Ej for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:00 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-48d146705b4so58507915e9.3 for ; Wed, 20 May 2026 12:23:56 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49033d52a0bsm10744165e9.7.2026.05.20.12.23.53 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305034; x=1779909834; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=K7o1REZCIRQjP6nGv0AU1D9abS0hPdsXD8frplxvXTQ=; b=FrRI+k0PgY25Fv71IChh5mnP3iGthO2HG4vM03VslYY/hBekWXpa6S2XxpNKJJkJTs uaHATUG1zRkJ8ViN5/+1pHHFUt51THQ1/Mkm7CbmGpYoA97PS3RJPSaDVbM6wTuV+YVD Yo5QnwXFQKHOvAVpJwwjGQwfnX/bXOXWeYc8Yo5rRXC+9piO4Bf2x2vPykcVBrDftKyL wy/i4zm2ByPypgSkCkvPKssTm/pLayr+goLUaLb7bhS8rrP7P4PQLI0BS+6tGI4b+B+J Vc+ru4lAuBy85zFbJQB5OyEaE7tkXHHtLkoXYm/6i4ZwM6FyvryRsT6dmcKeNouWY7YL zY/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305034; x=1779909834; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=K7o1REZCIRQjP6nGv0AU1D9abS0hPdsXD8frplxvXTQ=; b=sfguVdkqqk/DaOjOvyKnHfbUYWDRYSh+7yqHBt2iEfRglr7oDJUftBBSrIjVOiIat5 ILzHKUFcilUIC6EKTn0vw2ACw6sO67AYtPCqslNllM0cDuyKks7OrXccQBwe2N/DgScF D/0NJYzULLTKPb/nUAUYYQger0bAi+2oeTc2tc01d/3iIsEjlUKO9OVWO4DIqUdWb1PT BDGHE8aNWuVS0e+pnrYIf9mJCslHW4t+LnQ0qKJ/krqqW+tHr0xJOe8l8oY8tgp+2q0M Si5S/+1rJnfQ7wZa3VTSDNAOeBjuRqI2SPfDD2kM9rOU6zGvXS69qzKgkJ7pigYYbjgR m6pQ== X-Gm-Message-State: AOJu0YyJQDsUarDMngFjE4RM5BofFoh6qQi/z6iO1dYRQm56W6G1BqXY SJm18xIE73fDyUHMwp9uELgCxr4ZfsK+TpzxXHZk8wY6j9NbrS0hfXeYp2H0j0OqNZ1LukwLtkL no2hJ9cI= X-Gm-Gg: Acq92OGKhCT7htQoe6C0WTMLLTcKiSIgGq0ETyD86LPxDNNUBTQE5WR8AOf0UHwY6Zu r7Xv+T+zVQ6w9NrOs1qGeKJQJF28VuTE41vCncMeKmGiMw+G31Y7r5cVe9ZJMuhVL/gwtaVgyt+ hFd40OrlxCHMj/d/XPA+Qz6Hbn7R5wcHS2wchDcwiE7uLlDwWv4LNXzJBco/p/9yA3jLng+3deB LlW/moC9k0Ug8euIjOfjiPWHsjmmTVHWjMTdrQS9ZxeuElUH7COwb6EEVYd5+VLWJldfXErE828 u5cvMvrT27ctOcgqJDR5leaw3EIMUqZooY565lbSPec9aUx8fP/ngBoFv2kD1B5aZeh8MORKkVO 5QDnZqgPSU7AUL/OQGmH2w4f7/yLuHbE/0SPCjLbolG9j+w1TNknM0Q7z2XtpIhdgJYDGW+CFrM kz6G+YJG/Aw5JSTrXrzA/t600w+JmFwecTijYKKpKFF21qDEY4OhMFbdgXe7dnVRSfjlCk+vpp X-Received: by 2002:a05:600c:a406:b0:487:1fb4:7e1 with SMTP id 5b1f17b1804b1-48fe632a02fmr323172625e9.22.1779305034338; Wed, 20 May 2026 12:23:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 02/33] docker: Remove LegacyKeyValueFormat warnings in generated files Date: Wed, 20 May 2026 21:23:07 +0200 Message-ID: <20260520192338.40036-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: qemu development 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: 1779305096983154100 Display lcitool changes before generated ones. Update lcitool refresh script to not use legacy 'ENV key value' format: https://docs.docker.com/reference/build-checks/legacy-key-value-format/ Run "make lcitool-refresh" to update the generated container files. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-ID: <20260518102222.80735-8-philmd@linaro.org> Signed-off-by: Alex Benn=C3=A9e --- tests/lcitool/refresh | 12 +++++++----- tests/docker/dockerfiles/alpine.docker | 2 +- tests/docker/dockerfiles/centos9.docker | 2 +- .../docker/dockerfiles/debian-all-test-cross.docker | 10 ++++++---- tests/docker/dockerfiles/debian-amd64-cross.docker | 2 +- tests/docker/dockerfiles/debian-arm64-cross.docker | 2 +- tests/docker/dockerfiles/debian-armhf-cross.docker | 2 +- tests/docker/dockerfiles/debian-i686-cross.docker | 2 +- .../docker/dockerfiles/debian-mips64el-cross.docker | 2 +- tests/docker/dockerfiles/debian-mipsel-cross.docker | 2 +- tests/docker/dockerfiles/debian-ppc64el-cross.docker | 2 +- tests/docker/dockerfiles/debian-riscv64-cross.docker | 2 +- tests/docker/dockerfiles/debian-s390x-cross.docker | 2 +- tests/docker/dockerfiles/debian.docker | 2 +- tests/docker/dockerfiles/fedora-rust-nightly.docker | 2 +- tests/docker/dockerfiles/fedora-win64-cross.docker | 2 +- tests/docker/dockerfiles/fedora.docker | 2 +- tests/docker/dockerfiles/opensuse-leap.docker | 2 +- scripts/git.orderfile | 4 ++++ 19 files changed, 33 insertions(+), 25 deletions(-) diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index e4d01d792b7..a736f7f0ae6 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -77,7 +77,7 @@ def generate_dockerfile(host, target, project=3D"qemu", c= ross=3DNone, trailer=3DNone, trailer =3D "\n".join(add_user_mapping) =20 if enable_rust: - trailer +=3D "\nENV ENABLE_RUST 1\n" + trailer +=3D "\nENV ENABLE_RUST=3D1\n" generate(filename, cmd, trailer) =20 =20 @@ -169,7 +169,8 @@ debian_all_test_cross_compilers =3D [ " dpkg-dev\\\n", " gdb-multiarch\\\n", " libclang-rt-dev\n", - "ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \\\n", + "ENV AVAILABLE_COMPILERS=3D\"\\\n", + " gcc-aarch64-linux-gnu \\\n", " libc6-dev-arm64-cross \\\n", " gcc-arm-linux-gnueabihf \\\n", " libc6-dev-armhf-cross \\\n", @@ -190,7 +191,8 @@ debian_all_test_cross_compilers =3D [ " gcc-s390x-linux-gnu \\\n", " libc6-dev-s390x-cross\\\n", " gcc-sh4-linux-gnu \\\n", - " libc6-dev-sh4-cross\n", + " libc6-dev-sh4-cross \\\n", + " \"\n", "RUN if dpkg-architecture -e amd64; then \\\n", " export AVAILABLE_COMPILERS=3D\"${AVAILABLE_COMPILERS} gcc-hppa-linu= x-gnu libc6-dev-hppa-cross\"; \\\n", " export AVAILABLE_COMPILERS=3D\"${AVAILABLE_COMPILERS} gcc-m68k-linu= x-gnu libc6-dev-m68k-cross\"; \\\n", @@ -202,8 +204,8 @@ debian_all_test_cross_compilers =3D [ "apt install -y --no-install-recommends \\\n", "${AVAILABLE_COMPILERS} && \\\n", "dpkg-query --showformat '${Package}_${Version}_${Architecture}' --sho= w > /packages.txt\n", - "ENV QEMU_CONFIGURE_OPTS --disable-docs\n", - "ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-use= r,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-li= nux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-u= ser,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,s= parc64-linux-user\n", + "ENV QEMU_CONFIGURE_OPTS=3D--disable-docs\n", + "ENV DEF_TARGET_LIST=3Daarch64-linux-user,alpha-linux-user,arm-linux-u= ser,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-= linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux= -user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user= ,sparc64-linux-user\n", ] =20 def cross_build(prefix, targets): diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/alpine.docker index a7ee85fcda7..118c6e8eeaf 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -141,4 +141,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerf= iles/centos9.docker index 41a1225856e..0d5b5fa7f59 100644 --- a/tests/docker/dockerfiles/centos9.docker +++ b/tests/docker/dockerfiles/centos9.docker @@ -145,4 +145,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/= docker/dockerfiles/debian-all-test-cross.docker index 287770a995a..a10ffc73500 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -61,7 +61,8 @@ RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ dpkg-dev\ gdb-multiarch\ libclang-rt-dev -ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \ +ENV AVAILABLE_COMPILERS=3D"\ + gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-arm-linux-gnueabihf \ libc6-dev-armhf-cross \ @@ -82,7 +83,8 @@ ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \ gcc-s390x-linux-gnu \ libc6-dev-s390x-cross\ gcc-sh4-linux-gnu \ - libc6-dev-sh4-cross + libc6-dev-sh4-cross \ + " RUN if dpkg-architecture -e amd64; then \ export AVAILABLE_COMPILERS=3D"${AVAILABLE_COMPILERS} gcc-hppa-linux-gnu = libc6-dev-hppa-cross"; \ export AVAILABLE_COMPILERS=3D"${AVAILABLE_COMPILERS} gcc-m68k-linux-gnu = libc6-dev-m68k-cross"; \ @@ -94,8 +96,8 @@ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt install -y --no-install-recommends \ ${AVAILABLE_COMPILERS} && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /= packages.txt -ENV QEMU_CONFIGURE_OPTS --disable-docs -ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-user,hpp= a-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-u= ser,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,p= pc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc6= 4-linux-user +ENV QEMU_CONFIGURE_OPTS=3D--disable-docs +ENV DEF_TARGET_LIST=3Daarch64-linux-user,alpha-linux-user,arm-linux-user,h= ppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux= -user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user= ,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,spar= c64-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/doc= ker/dockerfiles/debian-amd64-cross.docker index 35c593502fc..061cd8e9b82 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -188,4 +188,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/doc= ker/dockerfiles/debian-arm64-cross.docker index d188d538365..3dfa60fdfd7 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -187,4 +187,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/doc= ker/dockerfiles/debian-armhf-cross.docker index 988c87075f6..401c64269c1 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -185,4 +185,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/dock= er/dockerfiles/debian-i686-cross.docker index d720ebb0bca..8b60c7b085f 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -185,4 +185,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/= docker/dockerfiles/debian-mips64el-cross.docker index d139c10c555..fc83fc0c00b 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -183,4 +183,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker index 2cfc33e8249..5f105b1d687 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -183,4 +183,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/d= ocker/dockerfiles/debian-ppc64el-cross.docker index 7198036380b..2a7e8cba056 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -186,4 +186,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/d= ocker/dockerfiles/debian-riscv64-cross.docker index eb49da9781a..349de3a0bbb 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -186,4 +186,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/doc= ker/dockerfiles/debian-s390x-cross.docker index f4c7896a75f..8bc42b1e00b 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -185,4 +185,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfi= les/debian.docker index 85b78f7e5f8..ee8b313d654 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -175,4 +175,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/fedora-rust-nightly.docker b/tests/do= cker/dockerfiles/fedora-rust-nightly.docker index 5e88354f133..4f84b803798 100644 --- a/tests/docker/dockerfiles/fedora-rust-nightly.docker +++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker @@ -185,4 +185,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index 751789e849b..c1e63feb46f 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -120,4 +120,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 393ac0cce73..a6996917c4b 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -162,4 +162,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 4b126b7e7de..fc363c647cd 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -149,4 +149,4 @@ ARG UID RUN if [ "${USER}" ]; then \ id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi =20 -ENV ENABLE_RUST 1 +ENV ENABLE_RUST=3D1 diff --git a/scripts/git.orderfile b/scripts/git.orderfile index 8edac0380ba..4b693c9deec 100644 --- a/scripts/git.orderfile +++ b/scripts/git.orderfile @@ -39,3 +39,7 @@ qga/*.json # code *.c *.c.inc + +# Generated Dockerfiles +tests/lcitool/refresh +tests/docker/dockerfiles/* --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305065; cv=none; d=zohomail.com; s=zohoarc; b=eyiw3rBvMGPc8LN9PceLtKu/QKsQ97+dPNPxkU5EcbMvzEAtI9fLP+NaeX6XV/phma9VpSUzq+aZxpxZr+/Oqtf+pCmgq4qC+fEeEGDEFGFkv9+Q2VAbRHI56XFBzBN90Ma0bS6ky/S4aPPD9dSGg/lbj4qLOBdmNTic04a2OGA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305065; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=E4CfQXJoQyoLDqw5WN9SuDrrk8uGV9nwZb+vJpsJUR0=; b=JM8nFA0K9760j7ZsvHyrK0cNa/2cKSDayMPO7COsSa2e/GGFh3wvFr5GUuXyWpnGZ8XhcXVU8FxbSDmVHnD8Uqtb2gZAj3ExkesWEtpR6FJTEzFZVxJtHybs85OSmPSjXObPrzv9AtEEPPFnO6jRnbjZTRV+tN9W/q8zE06hh/M= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305065485702.2779309896497; Wed, 20 May 2026 12:24:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmWb-0007FX-2s; Wed, 20 May 2026 15:24:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmWW-0007Da-3r for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:08 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmWT-0001jQ-1a for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:07 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4893940bb5eso29571725e9.3 for ; Wed, 20 May 2026 12:24:04 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48febe7543asm138508445e9.28.2026.05.20.12.24.00 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305042; x=1779909842; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=E4CfQXJoQyoLDqw5WN9SuDrrk8uGV9nwZb+vJpsJUR0=; b=QsKp+JpO4NydDwH5lBO4Lj39vPuqy6nu1dnK4I7X3HC9oahyF+u52nEvP/uzKO5CyJ /cGnVm+nhyuHXOt2+4+0RQDG9FzCQ+z2/+AlxhvXPYCAlwt65ozXyLYji6Brj2P4hWCO SxBPGpvrZIgVuur0yOk9x+R2ykjnjff8kXcyGFh56pjVVikjL4ooph2e6KQJzH9yfluV i7e0lAodCb2uqN0D51qB3Up0r7PwrDUopBuk2REHjQ0YDhYCVFaXUiK6CUO2OmfczSFn TKYPXIn0MCIYmDCkI6flvDTNQuTT+sE0D86sSAPo/cDch9DAil8SciDd9W17XukEvjlG W/PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305042; x=1779909842; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=E4CfQXJoQyoLDqw5WN9SuDrrk8uGV9nwZb+vJpsJUR0=; b=I7lwQ42n5RE4JOEEJQgl24MO33x0aLDlqJh2NLYZJyAcxamNMFOdUjHOjDqLJK34Mn qJFrbDfZUJl+cZQUB/VNcVd8TjLHN4u7hdPOIy55SBRz0etOMX4B4Utl0R4xbKm4Q6P8 ZL2G86AtC8b75UpvWM0SVM1AftOAOJsRSMjxR6Y8gRWbn0OtYjkVmRIOkzTIBKdSlGR5 rrGaVBa1wQJuftP1eHTAvcLiCrvji1i1fG17KyyLUeORryXP9UN/fGnrG1bg7WQQ+qwk HQ7waapVxiLBZ4tm3lm71qX3sGRNk5RUB/FjJbSrO7wJM4vt6SR7fSEMyG0tFM1XvQ5H W5eg== X-Gm-Message-State: AOJu0Yznx6mowWfbCxmeRdp3hQqJBC3671nYEq4c/zr+kY0GD7njLg5T j8QEWlmL+CvDTdho1fLGmG+xyntTGkNgeEjNT4BtjeVe/Oi2rHVwbZQQyJVPsWYnPLR603Cc2Xj rrhabbmI= X-Gm-Gg: Acq92OF4i95PGmKI6Gw/PR6gr9/OxYDJpmroYpdGRv5l0QZsdfzDURKLE1SyDIDsfup CDCDwfWRahRRVSvDDXsYDBYJVGsQEddFoKH4swWJVzcsSfZUUhtmFPjKh55Z6i2++iFn6ZKeBoc +Z8Cc+W/rYrwKw4S5FzSlCKh+cTNvIcf1OhnSgjAQ4hwpEIXNAHtOamyWF1m1E90JyyqGw7sppy 8n1wh5r8z0OSM/jISwZZaX44xpocIhBV5fofYry6/LwcK5KDBTfdBNlQUxNRdp5imsVXR6vgURH 8sVhPcNjvVY0xDoiSTh8uUrRfUOL4Mkh4CNhVX9NXAJdxQEl0iyrWYOmtPeEa2uQIyQFQohiH+p RsxR2odPHOQ4K/zUNROv7G7lPZrjtd5QQHSswIhFy3oNWRzDzsHXBnyh4abFpdUyWlc2467cC3f AQGlYVwoJ7f13FiRbLiSEHCxIGs/oAdYKBv5fuXJGcNLZ35j2Whq03klFx6KnlH6mvvjvAUoUO X-Received: by 2002:a05:600c:4fc5:b0:48a:525b:e148 with SMTP id 5b1f17b1804b1-48fe5fd4b5cmr383860295e9.4.1779305042026; Wed, 20 May 2026 12:24:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 03/33] buildsys: Remove MIPS cross containers Date: Wed, 20 May 2026 21:23:08 +0200 Message-ID: <20260520192338.40036-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: qemu development 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: 1779305067863158500 As mentioned in commit 269ffaabc84 ("buildsys: Remove support for 32-bit MIPS hosts"), Debian 13 "Trixie" removed support for MIPS. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260511135312.38705-2-philmd@linaro.org> --- configure | 1 - tests/lcitool/refresh | 12 -- .../dockerfiles/debian-mips64el-cross.docker | 186 ------------------ .../dockerfiles/debian-mipsel-cross.docker | 186 ------------------ .gitlab-ci.d/container-cross.yml | 6 - .gitlab-ci.d/containers.yml | 1 - .gitlab-ci.d/crossbuilds.yml | 22 --- tests/docker/Makefile.include | 1 - 8 files changed, 415 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-mips64el-cross.docker delete mode 100644 tests/docker/dockerfiles/debian-mipsel-cross.docker diff --git a/configure b/configure index eea90306728..b6dd797de5b 100755 --- a/configure +++ b/configure @@ -1525,7 +1525,6 @@ probe_target_compiler() { aarch64_be:aarch64 | \ armeb:arm | \ i386:x86_64 | \ - mips*:mips64 | \ ppc*:ppc64 | \ sparc:sparc64 | \ "$cpu:$cpu") diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index a736f7f0ae6..365435b0d70 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -265,18 +265,6 @@ try: trailer=3Dcross_build("i686-linux-gnu-", "i386-softmmu,i386-linux-user"= )) =20 - # mips no longer supported in debian-13 - # https://www.debian.org/releases/trixie/release-notes/issues.html#mip= s-architectures-removed - generate_dockerfile("debian-mips64el-cross", "debian-12", - cross=3D"mips64el", - trailer=3Dcross_build("mips64el-linux-gnuabi64-", - "mips64el-softmmu,mips64el-lin= ux-user")) - - generate_dockerfile("debian-mipsel-cross", "debian-12", - cross=3D"mipsel", - trailer=3Dcross_build("mipsel-linux-gnu-", - "mipsel-softmmu,mipsel-linux-u= ser")) - generate_dockerfile("debian-ppc64el-cross", "debian-13", cross=3D"ppc64le", trailer=3Dcross_build("powerpc64le-linux-gnu-", diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/= docker/dockerfiles/debian-mips64el-cross.docker deleted file mode 100644 index fc83fc0c00b..00000000000 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ /dev/null @@ -1,186 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross-arch mips64el debian-12 qemu -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:12-slim - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bindgen \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - coreutils \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcc \ - gcovr \ - gettext \ - git \ - hostname \ - libclang-rt-dev \ - libglib2.0-dev \ - llvm \ - locales \ - make \ - mtools \ - ninja-build \ - openssh-client \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-setuptools \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-wheel \ - python3-yaml \ - rpm2cpio \ - rustc-web \ - sed \ - socat \ - sparse \ - swtpm \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - vulkan-tools \ - xorriso \ - zstd && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - -RUN /usr/bin/pip3 install meson=3D=3D1.8.1 - -ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" -ENV LANG=3D"en_US.UTF-8" -ENV MAKE=3D"/usr/bin/make" -ENV NINJA=3D"/usr/bin/ninja" -ENV PYTHON=3D"/usr/bin/python3" - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - dpkg --add-architecture mips64el && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-mips64el-linux-gnuabi64 \ - libaio-dev:mips64el \ - libasound2-dev:mips64el \ - libattr1-dev:mips64el \ - libbpf-dev:mips64el \ - libbrlapi-dev:mips64el \ - libbz2-dev:mips64el \ - libc6-dev:mips64el \ - libcacard-dev:mips64el \ - libcap-ng-dev:mips64el \ - libcapstone-dev:mips64el \ - libcbor-dev:mips64el \ - libcmocka-dev:mips64el \ - libcurl4-gnutls-dev:mips64el \ - libdaxctl-dev:mips64el \ - libdrm-dev:mips64el \ - libepoxy-dev:mips64el \ - libfdt-dev:mips64el \ - libffi-dev:mips64el \ - libfuse3-dev:mips64el \ - libgbm-dev:mips64el \ - libgcrypt20-dev:mips64el \ - libglib2.0-dev:mips64el \ - libgnutls28-dev:mips64el \ - libgtk-3-dev:mips64el \ - libgtk-vnc-2.0-dev:mips64el \ - libibverbs-dev:mips64el \ - libiscsi-dev:mips64el \ - libjemalloc-dev:mips64el \ - libjpeg62-turbo-dev:mips64el \ - libjson-c-dev:mips64el \ - liblttng-ust-dev:mips64el \ - liblzo2-dev:mips64el \ - libncursesw5-dev:mips64el \ - libnfs-dev:mips64el \ - libnuma-dev:mips64el \ - libpam0g-dev:mips64el \ - libpcre2-dev:mips64el \ - libpipewire-0.3-dev:mips64el \ - libpixman-1-dev:mips64el \ - libpng-dev:mips64el \ - libpulse-dev:mips64el \ - librbd-dev:mips64el \ - librdmacm-dev:mips64el \ - libsasl2-dev:mips64el \ - libsdl2-dev:mips64el \ - libsdl2-image-dev:mips64el \ - libseccomp-dev:mips64el \ - libselinux1-dev:mips64el \ - libslirp-dev:mips64el \ - libsnappy-dev:mips64el \ - libsndio-dev:mips64el \ - libspice-protocol-dev:mips64el \ - libspice-server-dev:mips64el \ - libssh-dev:mips64el \ - libstd-rust-dev:mips64el \ - libsystemd-dev:mips64el \ - libtasn1-6-dev:mips64el \ - libudev-dev:mips64el \ - liburing-dev:mips64el \ - libusb-1.0-0-dev:mips64el \ - libusbredirhost-dev:mips64el \ - libvdeplug-dev:mips64el \ - libvirglrenderer-dev:mips64el \ - libvte-2.91-dev:mips64el \ - libxdp-dev:mips64el \ - libzstd-dev:mips64el \ - nettle-dev:mips64el \ - systemtap-sdt-dev:mips64el \ - zlib1g-dev:mips64el && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - printf "[binaries]\n\ -c =3D '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ -ar =3D '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ -strip =3D '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ -pkgconfig =3D '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ -\n\ -[host_machine]\n\ -system =3D 'linux'\n\ -cpu_family =3D 'mips64'\n\ -cpu =3D 'mips64el'\n\ -endian =3D 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuab= i64 && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-gcc - -ENV ABI=3D"mips64el-linux-gnuabi64" -ENV MESON_OPTS=3D"--cross-file=3Dmips64el-linux-gnuabi64" -ENV RUST_TARGET=3D"mips64el-unknown-linux-gnuabi64" -ENV QEMU_CONFIGURE_OPTS=3D--cross-prefix=3Dmips64el-linux-gnuabi64- -ENV DEF_TARGET_LIST=3Dmips64el-softmmu,mips64el-linux-user -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi - -ENV ENABLE_RUST=3D1 diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker deleted file mode 100644 index 5f105b1d687..00000000000 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ /dev/null @@ -1,186 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross-arch mipsel debian-12 qemu -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:12-slim - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bindgen \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - coreutils \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcc \ - gcovr \ - gettext \ - git \ - hostname \ - libclang-rt-dev \ - libglib2.0-dev \ - llvm \ - locales \ - make \ - mtools \ - ninja-build \ - openssh-client \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-setuptools \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-wheel \ - python3-yaml \ - rpm2cpio \ - rustc-web \ - sed \ - socat \ - sparse \ - swtpm \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - vulkan-tools \ - xorriso \ - zstd && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - -RUN /usr/bin/pip3 install meson=3D=3D1.8.1 - -ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" -ENV LANG=3D"en_US.UTF-8" -ENV MAKE=3D"/usr/bin/make" -ENV NINJA=3D"/usr/bin/ninja" -ENV PYTHON=3D"/usr/bin/python3" - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - dpkg --add-architecture mipsel && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-mipsel-linux-gnu \ - libaio-dev:mipsel \ - libasound2-dev:mipsel \ - libattr1-dev:mipsel \ - libbpf-dev:mipsel \ - libbrlapi-dev:mipsel \ - libbz2-dev:mipsel \ - libc6-dev:mipsel \ - libcacard-dev:mipsel \ - libcap-ng-dev:mipsel \ - libcapstone-dev:mipsel \ - libcbor-dev:mipsel \ - libcmocka-dev:mipsel \ - libcurl4-gnutls-dev:mipsel \ - libdaxctl-dev:mipsel \ - libdrm-dev:mipsel \ - libepoxy-dev:mipsel \ - libfdt-dev:mipsel \ - libffi-dev:mipsel \ - libfuse3-dev:mipsel \ - libgbm-dev:mipsel \ - libgcrypt20-dev:mipsel \ - libglib2.0-dev:mipsel \ - libgnutls28-dev:mipsel \ - libgtk-3-dev:mipsel \ - libgtk-vnc-2.0-dev:mipsel \ - libibverbs-dev:mipsel \ - libiscsi-dev:mipsel \ - libjemalloc-dev:mipsel \ - libjpeg62-turbo-dev:mipsel \ - libjson-c-dev:mipsel \ - liblttng-ust-dev:mipsel \ - liblzo2-dev:mipsel \ - libncursesw5-dev:mipsel \ - libnfs-dev:mipsel \ - libnuma-dev:mipsel \ - libpam0g-dev:mipsel \ - libpcre2-dev:mipsel \ - libpipewire-0.3-dev:mipsel \ - libpixman-1-dev:mipsel \ - libpng-dev:mipsel \ - libpulse-dev:mipsel \ - librbd-dev:mipsel \ - librdmacm-dev:mipsel \ - libsasl2-dev:mipsel \ - libsdl2-dev:mipsel \ - libsdl2-image-dev:mipsel \ - libseccomp-dev:mipsel \ - libselinux1-dev:mipsel \ - libslirp-dev:mipsel \ - libsnappy-dev:mipsel \ - libsndio-dev:mipsel \ - libspice-protocol-dev:mipsel \ - libspice-server-dev:mipsel \ - libssh-dev:mipsel \ - libstd-rust-dev:mipsel \ - libsystemd-dev:mipsel \ - libtasn1-6-dev:mipsel \ - libudev-dev:mipsel \ - liburing-dev:mipsel \ - libusb-1.0-0-dev:mipsel \ - libusbredirhost-dev:mipsel \ - libvdeplug-dev:mipsel \ - libvirglrenderer-dev:mipsel \ - libvte-2.91-dev:mipsel \ - libxdp-dev:mipsel \ - libzstd-dev:mipsel \ - nettle-dev:mipsel \ - systemtap-sdt-dev:mipsel \ - zlib1g-dev:mipsel && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - printf "[binaries]\n\ -c =3D '/usr/bin/mipsel-linux-gnu-gcc'\n\ -ar =3D '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ -strip =3D '/usr/bin/mipsel-linux-gnu-strip'\n\ -pkgconfig =3D '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system =3D 'linux'\n\ -cpu_family =3D 'mips'\n\ -cpu =3D 'mipsel'\n\ -endian =3D 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc= && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc - -ENV ABI=3D"mipsel-linux-gnu" -ENV MESON_OPTS=3D"--cross-file=3Dmipsel-linux-gnu" -ENV RUST_TARGET=3D"mipsel-unknown-linux-gnu" -ENV QEMU_CONFIGURE_OPTS=3D--cross-prefix=3Dmipsel-linux-gnu- -ENV DEF_TARGET_LIST=3Dmipsel-softmmu,mipsel-linux-user -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi - -ENV ENABLE_RUST=3D1 diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml index 92a7f1c1b47..ab06083d754 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -28,12 +28,6 @@ loongarch-debian-cross-container: variables: NAME: debian-loongarch-cross =20 -mips64el-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-mips64el-cross - ppc64el-debian-cross-container: extends: .container_job_template stage: containers diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index c8b8e44ad86..515e7382f26 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -48,7 +48,6 @@ weekly-container-builds: - arm64-debian-cross-container - hexagon-cross-container - loongarch-debian-cross-container - - mips64el-debian-cross-container - ppc64el-debian-cross-container - riscv64-debian-cross-container - s390x-debian-cross-container diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index cf977dfefb1..eaeeb533cee 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -23,20 +23,6 @@ cross-arm64-kvm-only: IMAGE: debian-arm64-cross EXTRA_CONFIGURE_OPTS: --disable-tcg --without-default-features =20 -cross-mips64el-system: - extends: .cross_system_build_job - needs: - - job: mips64el-debian-cross-container - variables: - IMAGE: debian-mips64el-cross - -cross-mips64el-user: - extends: .cross_user_build_job - needs: - - job: mips64el-debian-cross-container - variables: - IMAGE: debian-mips64el-cross - cross-ppc64el-system: extends: .cross_system_build_job needs: @@ -95,14 +81,6 @@ cross-s390x-kvm-only: IMAGE: debian-s390x-cross EXTRA_CONFIGURE_OPTS: --disable-tcg --enable-trace-backends=3Dftrace =20 -cross-mips64el-kvm-only: - extends: .cross_accel_build_job - needs: - - job: mips64el-debian-cross-container - variables: - IMAGE: debian-mips64el-cross - EXTRA_CONFIGURE_OPTS: --disable-tcg --target-list=3Dmips64el-softmmu - cross-win64-system: extends: .cross_system_build_job needs: diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index df14538c0f5..4725c39807b 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -94,7 +94,6 @@ endif =20 # For non-x86 hosts not all cross-compilers have been packaged ifneq ($(HOST_ARCH),x86_64) -DOCKER_PARTIAL_IMAGES +=3D debian-mipsel-cross debian-mips64el-cross DOCKER_PARTIAL_IMAGES +=3D debian-ppc64el-cross DOCKER_PARTIAL_IMAGES +=3D debian-s390x-cross DOCKER_PARTIAL_IMAGES +=3D fedora --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305083; cv=none; d=zohomail.com; s=zohoarc; b=VslUPtjcB0FxSAvrJ2u5OKXY5HTZA2N0DOhPpFgMhbsNKDw9ypb9g3AURQhw+G+PdphC/arUVsg/p3BKCTln+9UfJ+gp1H7GOVL0525umC4LyASuXZRGUXhHd0Gl1TnphbUIJ92ynnbZYQRWQPEZRJuaq03oIhH1LQj8PdmoUsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305083; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=m4CFVBuY5FpXniBNOFBvMmlKaStuGCYzJte6nly+p94=; b=T8FnOh1AYQXsp2CvDD2srZXGUKrli1TlumCl5Y2HRY3BSaUYLCIm2BVpX93WY0ETnd9CdHyxIIXmsBpTHZzxqYtLkdTWBDotaR+xxdSyydHwQLEmtgyW860mkpXJkhKvbS1me9a8Rdn44QJWwQVzlnDe2t2X23vW79t4aDdgEQE= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305082962704.6339330515727; Wed, 20 May 2026 12:24:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmWi-0007LT-Sx; Wed, 20 May 2026 15:24:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmWb-0007H4-Aa for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:13 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmWZ-0001oU-AL for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:13 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-44e1860558fso3355679f8f.0 for ; Wed, 20 May 2026 12:24:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0fe2464sm57095865f8f.32.2026.05.20.12.24.08 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:24:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305049; x=1779909849; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=m4CFVBuY5FpXniBNOFBvMmlKaStuGCYzJte6nly+p94=; b=WSj/ixCmatIib9sUkwwFhDM31X9SSDRGDaKFJDHhW9495xZAyifrIVsT+9vRhTf46I FhhxzBCRRuqBSt7pWhffOmPXO7g5DXuBSRfcd1bDYu0NenickSwitJ7GY4Tg0mk4VHli +fO4bc8HoQYHRiuuX1VqW4VwbQKOn/A4RFWp1E6MMwkxO5+QIrm0lqMo4eIe0Fy5CC69 XJZOgfjvLSzlui4UsQIDbyOZ1CAcOw/DzAWjShnsM2y9PgeecKoPAwodFTeZFok5vpSw l1H32OCoX+hRFt3KYBCu5xVya04g8KWB3THz1prvdVn2JKjDsGxPSeLRwJG6cubOTeRt qv3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305049; x=1779909849; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=m4CFVBuY5FpXniBNOFBvMmlKaStuGCYzJte6nly+p94=; b=F+rMQaQ0yYJuEbcGKxubK+XE5iorFjB5gF5lFTBgdVr95oOlDNQGTlDCjanF9lVGdt KKSw2W4jpO5dRGlzIVwy5qWnIbqAxJPro2vrue0+qTSe4r1Dnoy8X7oC0fuXUP7jhndm xqbBaEOTKpMIick92XTVWic/Bz3UhJF2/zs50f/W8Ij9muZde6+CcEdA6z5BWRBW4qkJ 8xsmXpNgiSDvDB9WzpcdHQguy26CfdZNabpUXXTDSnte14hx7qDw7PUl5mFGGzQTvfLX vaUSGDf0JHvdw77cAkqr4PzlJ8R5csOTlkZZ4P64L+pQWl6xz1Fhu4xBGIetFAGX+STn Gwcw== X-Gm-Message-State: AOJu0YwbQbvTR9wkd/4cIdVeRBxRLV+RTHZlB1a4GqD5vwKttrOVPe18 txQgFOrPG/8fWkQ6410dqej8RgmQtu0H/s0uLQyfp6J3hwnkHKhrFWCNC2Q9e91VlntEs/hUGun 4sPwaCQc= X-Gm-Gg: Acq92OFpDojDGD3jISHOiaDzMCCO6SHSVwjNxwr+G3xlvnFOqKSaAhg/KSSnIeAbCEp J0p5eWzDxy8xpzVsDolTn88XNoQKK4KM0gYBKw62mDTPUNrC2GQKvlFA91EErmbaWm6uDqvOJfv fxRxHifEfAaYyraCduT4XZlSg8IiRRxR+m051KmhBVVJ2b10+mlZ4+grEzgwVDPIVRG2aaz0I7N o3AnX8wq6BbEbCyNJ9trp2HyRpbD5QobissNhYTu+3l6UjDD7oMIGm0Ecx347XiEOFDcMBLDkA5 1H2IueZ7yWR+6bJwON7Dg1AfHhfeQQhMfXZR9BGuSQlIUhRBVWe5p8ZLuL2BAJsu113yrbL/7rk YMH99jU+WMLCSg8rc6k5jZz+whHDEGew4oUEeL7vDDtzJVDt+nL0Qs8nacP+nm/Bg5u5WZ8+vdY x9XpeiL0+G5Svz4COH+/PuDMlNo40oZ4d7pe7vEkRFb6P242YNqpQ2plJg4sYzyVUEuJx3gEXs/ 5rGpR9+5kA= X-Received: by 2002:a5d:6311:0:b0:45e:73a5:e7f4 with SMTP id ffacd0b85a97d-45e73a61c59mr20779238f8f.37.1779305049040; Wed, 20 May 2026 12:24:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 04/33] buildsys: Remove support for MIPS hosts Date: Wed, 20 May 2026 21:23:09 +0200 Message-ID: <20260520192338.40036-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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: qemu development 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: 1779305085042154100 MIPS host support is deprecated since commit 269ffaabc84 ("buildsys: Remove support for 32-bit MIPS hosts"). Time to remove. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260511135312.38705-3-philmd@linaro.org> --- docs/about/deprecated.rst | 8 -------- docs/about/removed-features.rst | 6 ++++++ configure | 19 ------------------- meson.build | 10 +--------- include/qemu/timer.h | 30 ------------------------------ util/cacheflush.c | 16 ---------------- 6 files changed, 7 insertions(+), 82 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index e64328c5b2b..95bf7613295 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -177,14 +177,6 @@ The ``info capture`` command is deprecated and will be= removed in a future relea Host Architectures ------------------ =20 -MIPS (since 10.2) -''''''''''''''''' - -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. - TCG Plugin support not enabled by default with TCI (since 9.2) '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 1ee4ab07944..2021e85f56a 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -938,6 +938,12 @@ From 10.0, QEMU has disabled configuration of 64-bit g= uests on 32-bit hosts. Debian 12 "Bookworm" removed support for 32-bit MIPS, making it hard to maintain our cross-compilation CI tests of the architecture. =20 +64-bit MIPS (removed in 11.1) +''''''''''''''''''''''''''''' + +Debian 13 "Trixie" removed support for MIPS, making it hard to maintain our +cross-compilation CI tests of the architecture. + 32-bit PPC (removed in 10.2) '''''''''''''''''''''''''''' =20 diff --git a/configure b/configure index b6dd797de5b..e138d83bc9f 100755 --- a/configure +++ b/configure @@ -399,8 +399,6 @@ elif check_define _ARCH_PPC64 ; then else cpu=3D"ppc64" fi -elif check_define __mips64 ; then - cpu=3D"mips64" elif check_define __s390__ ; then if check_define __s390x__ ; then cpu=3D"s390x" @@ -446,12 +444,6 @@ case "$cpu" in linux_arch=3Dloongarch ;; =20 - mips64*|mipsisa64*) - cpu=3Dmips64 - host_arch=3Dmips64 - linux_arch=3Dmips - ;; - ppc64) host_arch=3Dppc64 linux_arch=3Dpowerpc @@ -1244,11 +1236,6 @@ EOF rust_osvariant=3D${rust_osvariant}eabi fi ;; - - mips64) - # e.g. mips64-unknown-linux-gnuabi64 - rust_osvariant=3D${rust_osvariant}abi64 - ;; esac ;; =20 @@ -1281,12 +1268,6 @@ EOF test "$rust_arch" =3D arm && test "$rust_os" !=3D linux && rust_arch= =3Darmv7 ;; =20 - mips) - # preserve ISA version (mipsisa64r6 etc.) and include endianness - rust_arch=3D${raw_cpu%el} - test "$bigendian" =3D no && rust_arch=3D${rust_arch}el - ;; - riscv64) # e.g. riscv64gc-unknown-linux-gnu, but riscv64-linux-android test "$android" =3D no && rust_arch=3D${rust_arch}gc diff --git a/meson.build b/meson.build index 70613bf4afc..fe5211b2122 100644 --- a/meson.build +++ b/meson.build @@ -55,7 +55,7 @@ qapi_trace_events =3D [] bsd_oses =3D ['gnu/kfreebsd', 'freebsd', 'netbsd', 'openbsd', 'dragonfly',= 'darwin'] supported_oses =3D ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', '= sunos', 'linux', 'emscripten'] supported_cpus =3D ['ppc64', 's390x', 'riscv64', 'x86_64', - 'aarch64', 'loongarch64', 'mips64', 'sparc64', 'wasm64'] + 'aarch64', 'loongarch64', 'sparc64', 'wasm64'] =20 cpu =3D host_machine.cpu_family() =20 @@ -5013,14 +5013,6 @@ if host_arch =3D=3D 'unknown' message('configure has succeeded and you can continue to build, but') message('QEMU will use a slow interpreter to emulate the target CPU.') endif -elif host_arch =3D=3D 'mips' - message() - warning('DEPRECATED HOST CPU') - message() - message('Support for CPU host architecture ' + cpu + ' is going to be') - message('dropped as soon as the QEMU project stops supporting Debian 12') - message('("Bookworm"). Going forward, the QEMU project will not guarante= e') - message('that QEMU will compile or work on this host CPU.') endif =20 if not supported_oses.contains(host_os) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index b931181f53d..ec03635dd34 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -922,36 +922,6 @@ static inline int64_t cpu_get_host_ticks (void) #endif } =20 -#elif defined(__mips__) && \ - ((defined(__mips_isa_rev) && __mips_isa_rev >=3D 2) || defined(__linux= __)) -/* - * binutils wants to use rdhwr only on mips32r2 - * but as linux kernel emulate it, it's fine - * to use it. - * - */ -#define MIPS_RDHWR(rd, value) { \ - __asm__ __volatile__ (".set push\n\t" \ - ".set mips32r2\n\t" \ - "rdhwr %0, "rd"\n\t" \ - ".set pop" \ - : "=3Dr" (value)); \ - } - -static inline int64_t cpu_get_host_ticks(void) -{ - /* On kernels >=3D 2.6.25 rdhwr , $2 and $3 are emulated */ - uint32_t count; - static uint32_t cyc_per_count =3D 0; - - if (!cyc_per_count) { - MIPS_RDHWR("$3", cyc_per_count); - } - - MIPS_RDHWR("$2", count); - return (int64_t)(count * cyc_per_count); -} - #elif defined(__alpha__) =20 static inline int64_t cpu_get_host_ticks(void) diff --git a/util/cacheflush.c b/util/cacheflush.c index c043c5f881a..247c4ce2980 100644 --- a/util/cacheflush.c +++ b/util/cacheflush.c @@ -301,22 +301,6 @@ void flush_idcache_range(uintptr_t rx, uintptr_t rw, s= ize_t len) } #endif /* CONFIG_DARWIN */ =20 -#elif defined(__mips__) - -#ifdef __OpenBSD__ -#include -#else -#include -#endif - -void flush_idcache_range(uintptr_t rx, uintptr_t rw, size_t len) -{ - if (rx !=3D rw) { - cacheflush((void *)rw, len, DCACHE); - } - cacheflush((void *)rx, len, ICACHE); -} - #elif defined(__powerpc__) =20 void flush_idcache_range(uintptr_t rx, uintptr_t rw, size_t len) --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305105; cv=none; d=zohomail.com; s=zohoarc; b=aeC18BbC3D+2VuBwQOYGC/ZDY+jhearw2APz30xIINBd6VeW2NBticLpm2h0doIhUVKQBEPPfXaIpTaCN7eXzQnwaeNE0QvLmVt2+u9QZsoo+mFR5HdvdS6yRtC56NkwW9ZdRHdvd7kVO4j6S7gi40Sc3CmX9KK0A2pARVsxxC8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305105; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=rsFCTUwzPo869q+hRCPooHsKqF8me+mFMwy9EFrvmCE=; b=iAiwSZF7NxhyjITQUFSG4Hz3CGcdpiqyZRUynGVJmNh4wlajwMefOhG0fTtLXC0R59e65D7oSvC+8kC+zGV5UpIJIi14IogeICbw0yA3ZxIXGjEJrcvnd5WhTAIZX6vIHRogj3tAvxtr3aEs52xXN2Di5eqUaA+WDrNSW1vYZnI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305105019867.0046200164948; Wed, 20 May 2026 12:25:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmX6-0007hN-Ud; Wed, 20 May 2026 15:24:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmWk-0007MA-1q for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:22 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmWi-0001qu-Gr for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:21 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-48e6db3ff7eso27341755e9.0 for ; Wed, 20 May 2026 12:24:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49033d2fd6bsm11694285e9.1.2026.05.20.12.24.15 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:24:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305057; x=1779909857; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=rsFCTUwzPo869q+hRCPooHsKqF8me+mFMwy9EFrvmCE=; b=Kg00meJ5TzNU0s9Ik/S/jOTVy7kkZqqqqSa7TUS7DrXbNPdO3H9RoD6otAVSq5T9E/ rGy28kekGKMychUBcRk8p45uKLqxy8t2flQMefNnf5mHmgmCRimIRZ3IPsl8IswbH3uw /gY0xw2wAnGg1dUkfKzU08TU/xjn9sE0w9xFQwGylP8E1pHW3pFuBj0jONy5jv6G4ITv kR7gZVnlZuB4chBvmWbJVc8SxW70a/Du1N+lgptFq5TyyWNHT7Dvvfx38frsusBbEYNF MQkx9s5hViSz/qs6pOak/rPbJssaT2QWve7jYHz8xhu01t5l4jHN1QibqOlNYS0xV1+5 GRHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305057; x=1779909857; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=rsFCTUwzPo869q+hRCPooHsKqF8me+mFMwy9EFrvmCE=; b=qGN8l7GZSd7eYY2WaWiWhv0dZtMK7nnFrjPxxDxYUGYri5+DoZNVLJvYVYbSq62JK6 cCe2DkVO51teZKyAhBC8zujiIF6zmNmYIMzgu2NLHtXcHgFaZozkHR+W6ygLQmXekiLc Kr7xJrekhX4Kt5QM9cAom76/sm4N5ZAmoBwbugle3zT4rTpDFuYYeBLXOYHWLEoy0bq2 OrvZqp/0CVBhu/xQgTECPEiazPSGj1zG2nl6Y17doE0s9PH7kLaKptYxplgkILqF2VtQ iXocLiOp3us923TYfhUykxU+65LQP5M3VCM6gxC3SxZuxD/UT7Zc0cWUV++d7TGVhszi p0GQ== X-Gm-Message-State: AOJu0YyQZguS2aKrnQiUKQSLpT0Yn3r5W1QDexakXydZ4JnuEKCxhL1g nY7Ogkv6wkzzWVWiyT4tOx7jfDsmZuXYVODu2B7756skLspa7x4KEOFKPBKbDrcx3ItH/ieotoD 9BAN3RLk= X-Gm-Gg: Acq92OF1Z1GB8KqHGdHGta4OcSVrSmDC9qcv0xLoT/wZAsYX1olsWuAmBp+YpLeuFmg 5ADnyR6KhUJELgsuPdxSsvT1Rk4U2f/CSWE9gxbl9CYVL9cjt+a0ZPovVeT6cwJSKKzdO8HDnhn gE0ko0aca+YxH7fn0/bZEtPH5jp9DmfsAT0TLLZ6bdNqcrRR9eZ3XnB51JUpGh+HlK71+XrUpyi p2r9WHHr5BqT5QOUZDNunZHKbj+fGbMwhNcZ63FI/OJJU1HXmpKfCbgTMp77Uo9MC/qIXVTNOAA 4GvwEdezbSWJT/ATY5hbSHpy6bVw9yF3WKOdVXIMZSj3DZW7pcbNBV+xJBwPPbyHCKgC7zC0Dm5 uagv/C4xNfk4ktojQhH6Ys3EgSNrMExYdtqXJvpQDN7Xq5LwGDGxgoYDSdGmxs5ZqDTCxywDxEM JFdh2bTGWbOx9ctirueY8Yntq+tvVyLYEqqD+l85OSH8k/ybSooK73Gl7mp01H1jpkOWwrMVV0 X-Received: by 2002:a05:600c:17d1:b0:48a:54a6:b29f with SMTP id 5b1f17b1804b1-48feea9dda7mr215427515e9.17.1779305056741; Wed, 20 May 2026 12:24:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 05/33] hw/mips: Include missing 'cpu.h' header Date: Wed, 20 May 2026 21:23:10 +0200 Message-ID: <20260520192338.40036-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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: qemu development 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: 1779305105878158500 "target/mips/cpu.h" is indirectly pulled in via the "system/kvm.h" header, which next commit will remove. Explicitly include the "cpu.h" header, otherwise we'd get: hw/mips/mips_int.c:29:5: error: use of undeclared identifier 'MIPSCPU' 29 | MIPSCPU *cpu =3D opaque; | ^ hw/mips/mips_int.c:30:5: error: use of undeclared identifier 'CPUMIPSStat= e' 30 | CPUMIPSState *env =3D &cpu->env; | ^ hw/mips/loongson3_virt.c:156:39: error: unknown type name 'MIPSCPU' 156 | static uint64_t get_cpu_freq_hz(const MIPSCPU *cpu) | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260511135312.38705-4-philmd@linaro.org> --- hw/mips/loongson3_virt.c | 1 + hw/mips/mips_int.c | 1 + 2 files changed, 2 insertions(+) diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index cd94e9f5f77..c29cae86872 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -51,6 +51,7 @@ #include "system/runstate.h" #include "system/system.h" #include "qemu/error-report.h" +#include "target/mips/cpu.h" =20 #define PM_CNTL_MODE 0x10 =20 diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c index 2b740afc4d8..fa9c78e74de 100644 --- a/hw/mips/mips_int.c +++ b/hw/mips/mips_int.c @@ -25,6 +25,7 @@ #include "hw/core/irq.h" #include "system/kvm.h" #include "kvm_mips.h" +#include "target/mips/cpu.h" =20 static void cpu_mips_irq_request(void *opaque, int irq, int level) { --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305097; cv=none; d=zohomail.com; s=zohoarc; b=RFbZCVPs4jkWiFg2B8jHD98HeP/78hdJ9mvjMGIYvnD7E6DrdOHbgGJdP2dA5Lhg3k3oErE5BmgX0nWIPeo0VmQeIKhFK3Mre21cBu8YmR7YH0xStmZbozW/3Bh0VPvHaDFj8f742kLwSZo1Ly8xaRneL301ACb+wqHi6PVC/xE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305097; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=+xInswaBJ32C70oJLCcsoTU6R8qZ9x+KpsqUFZrzU04=; b=eUWycwZLOmpCMIbjtN1GPYrsm1V7+71C+Da+zHNTTSIVSgsVvSr9e2uugb0aw8NGf4s20Jglolaa2iyotB1E+pOf2oVww5Iz+CeiaKnjMiuSRN3yBKN8bzCkbOZaxruNFDTCF65un0uCjW8Woi+l8gAXPI+wEMf2LdFOZSnOKog= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305097877311.99786665093416; Wed, 20 May 2026 12:24:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmXE-00081u-HQ; Wed, 20 May 2026 15:24:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmWu-0007aA-NP for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:34 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmWo-0001rk-AE for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:32 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-490229aa522so19575095e9.3 for ; Wed, 20 May 2026 12:24:25 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49033d3f0d1sm13669065e9.5.2026.05.20.12.24.22 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:24:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305064; x=1779909864; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+xInswaBJ32C70oJLCcsoTU6R8qZ9x+KpsqUFZrzU04=; b=w9rPzil8Jt2gExvho4o/BxkcjVX5w+Lp95DL6KpIu3nh2OzLmS1GvPW79Tp2409lJ9 FcwVKgnujK9dq1Ho+kU8VcgR4KBnKBoBuH715kKtYQU8vaaW/roTshOnUn/dbJtevhev ZAh+iQOvk6vIvdlUEKPYYskWdcNZZD+NawfcI8n7TxWBCDOO7PIXIy0W+ZMeyNVAqYJX SQY3YFftZMvOGV1c4FO51W6MxRn1rcusZwbsyI6bXQ8pLwN6+IuWRdBKdC4bu9qF/SNt Cgxx6VdWwd3kE2SBMKZIpSd3yZOWS2SF5wNq8Y4sXdlbjZmhBwlMkhvYzJV/XcB3Nptf E9QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305064; x=1779909864; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=+xInswaBJ32C70oJLCcsoTU6R8qZ9x+KpsqUFZrzU04=; b=HJxNxOQ8S4GozJTJXcE2ZjKUhRhDddpwV0+XFBfz/RanGRtqwB1dSdxbnX8OoQ+Ta0 UQjUZ5SQMBz6O5fbDDgcghwg5sqrFpxBVnyPGlZSRZkZA/EVolVlL6P2D9UhDfj+5x4N oLlluYLhA5SMKjc7sdkCO6Ya7gg/cAB9o36G8q/ijm5MhfU3uaB//AFTNNWOoV/DAhb9 lXUoZ9UNKkTA0jJcv9+Vlw8KKym9vWNyMTFj87AT3+nipeRp9qoOaktkewWsXgof9gg3 4zMuRn1Ha8/R29ewg39ZjvFJrzV+XaljaKXYPcAtD6DN9Ggk2BQGeAuUerNEj9Ou0D7Y Rekg== X-Gm-Message-State: AOJu0YwQECTue9YYlfg1ZohHE8TAwFmBxuf+uMsB7nVjWEdDr39VV+UI RekpnJbQ9p4cRh3iA8uxTK/ljc/vvliXggfkLsyOcVEIdgV2Xhtn3a/1b/K5UuP7Hf8t7z6Oj2U swVGWvd4= X-Gm-Gg: Acq92OFr59dPK9nxlTv0Z7W2VdLDJz7hpsCO2n59QyVT/oo02tBa4QIaQoFBarglKm0 b67taUGJ/hcEvtPktcPaBTqFbXqLz/Y9qMs+dIioswNfNaJeIftgVkomYKDuAlvO2bTfylfRm8L /a6C4JG9FT0zlHrRgAmkitPcuES33/YEGMZAF1fEnbm2cC3O591t7BPdx9XG78Dpv12Z3JcauIO 3n24Jje6SO0fFgQ3esgZwZjbO6Hao9HzCZDSyg0zoJZim2+kiX7Iw6560jydKov4DeWwlMNgAQL 6wdKxnqrGZAhRV9MjdBA2K8LMQj014xk2Z3k1+wQsrGXwcE7x9ZU/f8tFmVAqN3S3ZnOfOruzr7 z+YwfRlbsK+Dmw2u+D5lL7RF12S4chgfeuY49UebxKfoPNrUdj2KPpSQBLBArL5gYTt7VRgFLlQ k/X6VrASfn+Xmn7Bkm+fMiGUR4bYbTti4/9Z93BR10MGnq66gPJUZKd7narDf55Wc274QzeCUO X-Received: by 2002:a05:600c:4ed0:b0:490:778:4fec with SMTP id 5b1f17b1804b1-49007785052mr263438165e9.33.1779305063652; Wed, 20 May 2026 12:24:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 06/33] buildsys: Remove MIPS KVM Date: Wed, 20 May 2026 21:23:11 +0200 Message-ID: <20260520192338.40036-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: qemu development 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: 1779305099989158500 We removed support for MIPS host. The KVM MIPS code is now unreachable, remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260511135312.38705-5-philmd@linaro.org> --- MAINTAINERS | 6 - docs/system/target-mips.rst | 2 - meson.build | 2 - target/mips/kvm_mips.h | 28 - hw/intc/mips_gic.c | 11 +- hw/mips/loongson3_virt.c | 66 +- hw/mips/malta.c | 1 - hw/mips/mips_int.c | 6 - target/mips/cpu.c | 5 - target/mips/kvm.c | 1283 -------------------------------- target/mips/system/cp0_timer.c | 12 +- target/mips/system/physaddr.c | 1 - target/mips/meson.build | 6 +- 13 files changed, 21 insertions(+), 1408 deletions(-) delete mode 100644 target/mips/kvm_mips.h delete mode 100644 target/mips/kvm.c diff --git a/MAINTAINERS b/MAINTAINERS index b75f3222f2f..bd7ea53f950 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -483,12 +483,6 @@ S: Supported F: target/arm/kvm.c F: tests/functional/aarch64/test_kvm.py =20 -MIPS KVM CPUs -M: Huacai Chen -S: Odd Fixes -F: target/mips/kvm* -F: target/mips/system/ - PPC KVM CPUs M: Nicholas Piggin R: Harsh Prateek Bora diff --git a/docs/system/target-mips.rst b/docs/system/target-mips.rst index 2a152e13380..aebad0c86e9 100644 --- a/docs/system/target-mips.rst +++ b/docs/system/target-mips.rst @@ -76,8 +76,6 @@ The Loongson-3 virtual platform emulation supports: =20 - GPEX and virtio as peripheral devices =20 -- Both KVM and TCG supported - .. include:: cpu-models-mips.rst.inc =20 .. _nanoMIPS-System-emulator: diff --git a/meson.build b/meson.build index fe5211b2122..eb074918193 100644 --- a/meson.build +++ b/meson.build @@ -282,8 +282,6 @@ elif cpu =3D=3D 's390x' kvm_targets =3D ['s390x-softmmu'] elif cpu =3D=3D 'ppc64' kvm_targets =3D ['ppc-softmmu', 'ppc64-softmmu'] -elif cpu =3D=3D 'mips64' - kvm_targets =3D ['mips-softmmu', 'mipsel-softmmu', 'mips64-softmmu', 'mi= ps64el-softmmu'] elif cpu =3D=3D 'riscv64' kvm_targets =3D ['riscv64-softmmu'] elif cpu =3D=3D 'loongarch64' diff --git a/target/mips/kvm_mips.h b/target/mips/kvm_mips.h deleted file mode 100644 index c711269d0af..00000000000 --- a/target/mips/kvm_mips.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Pub= lic - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * KVM/MIPS: MIPS specific KVM APIs - * - * Copyright (C) 2012-2014 Imagination Technologies Ltd. - * Authors: Sanjay Lal - */ - -#ifndef KVM_MIPS_H -#define KVM_MIPS_H - -#include "cpu.h" - -/** - * kvm_mips_reset_vcpu: - * @cpu: MIPSCPU - * - * Called at reset time to set kernel registers to their initial values. - */ -void kvm_mips_reset_vcpu(MIPSCPU *cpu); - -int kvm_mips_set_interrupt(MIPSCPU *cpu, int irq, int level); -int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level); - -#endif /* KVM_MIPS_H */ diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c index ad9363a4c7d..23478df4b46 100644 --- a/hw/intc/mips_gic.c +++ b/hw/intc/mips_gic.c @@ -15,9 +15,7 @@ #include "qapi/error.h" #include "hw/core/sysbus.h" #include "system/memory.h" -#include "system/kvm.h" #include "system/reset.h" -#include "kvm_mips.h" #include "hw/intc/mips_gic.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" @@ -45,14 +43,7 @@ static void mips_gic_set_vp_irq(MIPSGICState *gic, int v= p, int pin) ored_level |=3D (gic->vps[vp].pend & GIC_VP_MASK_CMP_MSK) >> GIC_VP_MASK_CMP_SHF; } - if (kvm_enabled()) { - kvm_mips_set_ipi_interrupt(env_archcpu(gic->vps[vp].env), - pin + GIC_CPU_PIN_OFFSET, - ored_level); - } else { - qemu_set_irq(gic->vps[vp].env->irq[pin + GIC_CPU_PIN_OFFSET], - ored_level); - } + qemu_set_irq(gic->vps[vp].env->irq[pin + GIC_CPU_PIN_OFFSET], ored_lev= el); } =20 static void gic_update_pin_for_irq(MIPSGICState *gic, int n_IRQ) diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index c29cae86872..7de3fb09c17 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -45,7 +45,6 @@ #include "hw/pci-host/gpex.h" #include "hw/usb/usb.h" #include "net/net.h" -#include "system/kvm.h" #include "system/qtest.h" #include "system/reset.h" #include "system/runstate.h" @@ -157,21 +156,6 @@ static const MemoryRegionOps loongson3_pm_ops =3D { =20 static uint64_t get_cpu_freq_hz(const MIPSCPU *cpu) { -#ifdef CONFIG_KVM - int ret; - uint64_t freq; - struct kvm_one_reg freq_reg =3D { - .id =3D KVM_REG_MIPS_COUNT_HZ, - .addr =3D (uintptr_t)(&freq) - }; - - if (kvm_enabled()) { - ret =3D kvm_vcpu_ioctl(CPU(cpu), KVM_GET_ONE_REG, &freq_reg); - if (ret >=3D 0) { - return freq * 2; - } - } -#endif return DEF_LOONGSON3_FREQ; } =20 @@ -511,23 +495,13 @@ static void mips_loongson3_virt_init(MachineState *ma= chine) MemoryRegion *iomem =3D g_new(MemoryRegion, 1); MemoryRegion *iocsr =3D g_new(MemoryRegion, 1); =20 - /* TODO: TCG will support all CPU types */ - if (!kvm_enabled()) { - if (!machine->cpu_type) { - machine->cpu_type =3D MIPS_CPU_TYPE_NAME("Loongson-3A1000"); - } - if (!cpu_type_supports_isa(machine->cpu_type, INSN_LOONGSON3A)) { - error_report("Loongson-3/TCG needs a Loongson-3 series cpu"); - exit(1); - } - } else { - if (!machine->cpu_type) { - machine->cpu_type =3D MIPS_CPU_TYPE_NAME("Loongson-3A4000"); - } - if (!strstr(machine->cpu_type, "Loongson-3A4000")) { - error_report("Loongson-3/KVM needs cpu type Loongson-3A4000"); - exit(1); - } + /* TODO: Support all CPU types */ + if (!machine->cpu_type) { + machine->cpu_type =3D MIPS_CPU_TYPE_NAME("Loongson-3A1000"); + } + if (!cpu_type_supports_isa(machine->cpu_type, INSN_LOONGSON3A)) { + error_report("Loongson-3/TCG needs a Loongson-3 series cpu"); + exit(1); } =20 if (ram_size < 512 * MiB) { @@ -545,16 +519,13 @@ static void mips_loongson3_virt_init(MachineState *ma= chine) =20 memory_region_init(iocsr, OBJECT(machine), "loongson3.iocsr", UINT32_M= AX); =20 - /* IPI controller is in kernel for KVM */ - if (!kvm_enabled()) { - ipi =3D qdev_new(TYPE_LOONGSON_IPI); - qdev_prop_set_uint32(ipi, "num-cpu", machine->smp.cpus); - sysbus_realize_and_unref(SYS_BUS_DEVICE(ipi), &error_fatal); - memory_region_add_subregion(iocsr, SMP_IPI_MAILBOX, - sysbus_mmio_get_region(SYS_BUS_DEVICE(ipi)= , 0)); - memory_region_add_subregion(iocsr, MAIL_SEND_ADDR, - sysbus_mmio_get_region(SYS_BUS_DEVICE(ipi)= , 1)); - } + ipi =3D qdev_new(TYPE_LOONGSON_IPI); + qdev_prop_set_uint32(ipi, "num-cpu", machine->smp.cpus); + sysbus_realize_and_unref(SYS_BUS_DEVICE(ipi), &error_fatal); + memory_region_add_subregion(iocsr, SMP_IPI_MAILBOX, + sysbus_mmio_get_region(SYS_BUS_DEVICE(ipi), 0)= ); + memory_region_add_subregion(iocsr, MAIL_SEND_ADDR, + sysbus_mmio_get_region(SYS_BUS_DEVICE(ipi), 1)= ); =20 liointc =3D qdev_new("loongson.liointc"); sysbus_realize_and_unref(SYS_BUS_DEVICE(liointc), &error_fatal); @@ -575,6 +546,7 @@ static void mips_loongson3_virt_init(MachineState *mach= ine) int node =3D i / LOONGSON3_CORE_PER_NODE; int core =3D i % LOONGSON3_CORE_PER_NODE; int ip; + hwaddr ipi_base =3D ((hwaddr)node << 44) + virt_memmap[VIRT_IPI].b= ase; =20 /* init CPUs */ cpu =3D mips_cpu_create_with_clock(machine->cpu_type, cpuclk, fals= e); @@ -584,12 +556,8 @@ static void mips_loongson3_virt_init(MachineState *mac= hine) cpu_mips_clock_init(cpu); qemu_register_reset(i ? generic_cpu_reset : main_cpu_reset, cpu); =20 - if (!kvm_enabled()) { - hwaddr base =3D ((hwaddr)node << 44) + virt_memmap[VIRT_IPI].b= ase; - base +=3D core * 0x100; - qdev_connect_gpio_out(ipi, i, cpu->env.irq[6]); - sysbus_mmio_map(SYS_BUS_DEVICE(ipi), i + 2, base); - } + qdev_connect_gpio_out(ipi, i, cpu->env.irq[6]); + sysbus_mmio_map(SYS_BUS_DEVICE(ipi), i + 2, ipi_base + core * 0x10= 0); =20 if (ase_lcsr_available(&MIPS_CPU(cpu)->env)) { MemoryRegion *core_iocsr =3D g_new(MemoryRegion, 1); diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 845b8d339e8..38c71f66f2e 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -55,7 +55,6 @@ #include "system/system.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "system/kvm.h" #include "semihosting/semihost.h" #include "hw/mips/cps.h" #include "hw/core/qdev-clock.h" diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c index fa9c78e74de..26e7dd6d5f5 100644 --- a/hw/mips/mips_int.c +++ b/hw/mips/mips_int.c @@ -23,8 +23,6 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "hw/core/irq.h" -#include "system/kvm.h" -#include "kvm_mips.h" #include "target/mips/cpu.h" =20 static void cpu_mips_irq_request(void *opaque, int irq, int level) @@ -45,10 +43,6 @@ static void cpu_mips_irq_request(void *opaque, int irq, = int level) env->CP0_Cause &=3D ~(1 << (irq + CP0Ca_IP)); } =20 - if (kvm_enabled() && (irq =3D=3D 2 || irq =3D=3D 3)) { - kvm_mips_set_interrupt(cpu, irq, level); - } - if (env->CP0_Cause & CP0Ca_IP_mask) { cpu_interrupt(cs, CPU_INTERRUPT_HARD); } else { diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 88bb59d506b..99d43613828 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -25,9 +25,7 @@ #include "qapi/error.h" #include "cpu.h" #include "internal.h" -#include "kvm_mips.h" #include "qemu/module.h" -#include "system/kvm.h" #include "system/qtest.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" @@ -416,9 +414,6 @@ static void mips_cpu_reset_hold(Object *obj, ResetType = type) /* UHI interface can be used to obtain argc and argv */ env->active_tc.gpr[4] =3D -1; } - if (kvm_enabled()) { - kvm_mips_reset_vcpu(cpu); - } #endif } =20 diff --git a/target/mips/kvm.c b/target/mips/kvm.c deleted file mode 100644 index a85e162409c..00000000000 --- a/target/mips/kvm.c +++ /dev/null @@ -1,1283 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Pub= lic - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * KVM/MIPS: MIPS specific KVM APIs - * - * Copyright (C) 2012-2014 Imagination Technologies Ltd. - * Authors: Sanjay Lal -*/ - -#include "qemu/osdep.h" -#include - -#include - -#include "cpu.h" -#include "internal.h" -#include "qemu/error-report.h" -#include "qemu/main-loop.h" -#include "system/kvm.h" -#include "system/kvm_int.h" -#include "system/runstate.h" -#include "kvm_mips.h" -#include "hw/core/boards.h" -#include "fpu_helper.h" - -#define DEBUG_KVM 0 - -#define DPRINTF(fmt, ...) \ - do { if (DEBUG_KVM) { fprintf(stderr, fmt, ## __VA_ARGS__); } } while = (0) - -static int kvm_mips_fpu_cap; -static int kvm_mips_msa_cap; - -const KVMCapabilityInfo kvm_arch_required_capabilities[] =3D { - KVM_CAP_LAST_INFO -}; - -static void kvm_mips_update_state(void *opaque, bool running, RunState sta= te); - -unsigned long kvm_arch_vcpu_id(CPUState *cs) -{ - return cs->cpu_index; -} - -int kvm_arch_init(MachineState *ms, KVMState *s) -{ - /* MIPS has 128 signals */ - kvm_set_sigmask_len(s, 16); - - kvm_mips_fpu_cap =3D kvm_check_extension(s, KVM_CAP_MIPS_FPU); - kvm_mips_msa_cap =3D kvm_check_extension(s, KVM_CAP_MIPS_MSA); - - DPRINTF("%s\n", __func__); - return 0; -} - -int kvm_arch_irqchip_create(KVMState *s) -{ - return 0; -} - -int kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp) -{ - return 0; -} - -int kvm_arch_init_vcpu(CPUState *cs) -{ - CPUMIPSState *env =3D cpu_env(cs); - int ret =3D 0; - - qemu_add_vm_change_state_handler(kvm_mips_update_state, cs); - - if (kvm_mips_fpu_cap && env->CP0_Config1 & (1 << CP0C1_FP)) { - ret =3D kvm_vcpu_enable_cap(cs, KVM_CAP_MIPS_FPU, 0, 0); - if (ret < 0) { - /* mark unsupported so it gets disabled on reset */ - kvm_mips_fpu_cap =3D 0; - ret =3D 0; - } - } - - if (kvm_mips_msa_cap && ase_msa_available(env)) { - ret =3D kvm_vcpu_enable_cap(cs, KVM_CAP_MIPS_MSA, 0, 0); - if (ret < 0) { - /* mark unsupported so it gets disabled on reset */ - kvm_mips_msa_cap =3D 0; - ret =3D 0; - } - } - - DPRINTF("%s\n", __func__); - return ret; -} - -int kvm_arch_destroy_vcpu(CPUState *cs) -{ - return 0; -} - -void kvm_mips_reset_vcpu(MIPSCPU *cpu) -{ - CPUMIPSState *env =3D &cpu->env; - - if (!kvm_mips_fpu_cap && env->CP0_Config1 & (1 << CP0C1_FP)) { - warn_report("KVM does not support FPU, disabling"); - env->CP0_Config1 &=3D ~(1 << CP0C1_FP); - } - if (!kvm_mips_msa_cap && ase_msa_available(env)) { - warn_report("KVM does not support MSA, disabling"); - env->CP0_Config3 &=3D ~(1 << CP0C3_MSAP); - } - - DPRINTF("%s\n", __func__); -} - -int kvm_arch_insert_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *= bp) -{ - DPRINTF("%s\n", __func__); - return 0; -} - -int kvm_arch_remove_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *= bp) -{ - DPRINTF("%s\n", __func__); - return 0; -} - -static inline int cpu_mips_io_interrupts_pending(MIPSCPU *cpu) -{ - CPUMIPSState *env =3D &cpu->env; - - return env->CP0_Cause & (0x1 << (2 + CP0Ca_IP)); -} - - -void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run) -{ - MIPSCPU *cpu =3D MIPS_CPU(cs); - int r; - struct kvm_mips_interrupt intr; - - bql_lock(); - - if (cpu_test_interrupt(cs, CPU_INTERRUPT_HARD) && - cpu_mips_io_interrupts_pending(cpu)) { - intr.cpu =3D -1; - intr.irq =3D 2; - r =3D kvm_vcpu_ioctl(cs, KVM_INTERRUPT, &intr); - if (r < 0) { - error_report("%s: cpu %d: failed to inject IRQ %x", - __func__, cs->cpu_index, intr.irq); - } - } - - bql_unlock(); -} - -MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) -{ - return MEMTXATTRS_UNSPECIFIED; -} - -int kvm_arch_process_async_events(CPUState *cs) -{ - return cs->halted; -} - -int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) -{ - int ret; - - DPRINTF("%s\n", __func__); - switch (run->exit_reason) { - default: - error_report("%s: unknown exit reason %d", - __func__, run->exit_reason); - ret =3D -1; - break; - } - - return ret; -} - -bool kvm_arch_stop_on_emulation_error(CPUState *cs) -{ - DPRINTF("%s\n", __func__); - return true; -} - -void kvm_arch_init_irq_routing(KVMState *s) -{ -} - -int kvm_mips_set_interrupt(MIPSCPU *cpu, int irq, int level) -{ - CPUState *cs =3D CPU(cpu); - struct kvm_mips_interrupt intr; - - assert(kvm_enabled()); - - intr.cpu =3D -1; - - if (level) { - intr.irq =3D irq; - } else { - intr.irq =3D -irq; - } - - kvm_vcpu_ioctl(cs, KVM_INTERRUPT, &intr); - - return 0; -} - -int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level) -{ - CPUState *cs =3D current_cpu; - CPUState *dest_cs =3D CPU(cpu); - struct kvm_mips_interrupt intr; - - assert(kvm_enabled()); - - intr.cpu =3D dest_cs->cpu_index; - - if (level) { - intr.irq =3D irq; - } else { - intr.irq =3D -irq; - } - - DPRINTF("%s: CPU %d, IRQ: %d\n", __func__, intr.cpu, intr.irq); - - kvm_vcpu_ioctl(cs, KVM_INTERRUPT, &intr); - - return 0; -} - -#define MIPS_CP0_32(_R, _S) \ - (KVM_REG_MIPS_CP0 | KVM_REG_SIZE_U32 | (8 * (_R) + (_S))) - -#define MIPS_CP0_64(_R, _S) \ - (KVM_REG_MIPS_CP0 | KVM_REG_SIZE_U64 | (8 * (_R) + (_S))) - -#define KVM_REG_MIPS_CP0_INDEX MIPS_CP0_32(0, 0) -#define KVM_REG_MIPS_CP0_RANDOM MIPS_CP0_32(1, 0) -#define KVM_REG_MIPS_CP0_CONTEXT MIPS_CP0_64(4, 0) -#define KVM_REG_MIPS_CP0_USERLOCAL MIPS_CP0_64(4, 2) -#define KVM_REG_MIPS_CP0_PAGEMASK MIPS_CP0_32(5, 0) -#define KVM_REG_MIPS_CP0_PAGEGRAIN MIPS_CP0_32(5, 1) -#define KVM_REG_MIPS_CP0_PWBASE MIPS_CP0_64(5, 5) -#define KVM_REG_MIPS_CP0_PWFIELD MIPS_CP0_64(5, 6) -#define KVM_REG_MIPS_CP0_PWSIZE MIPS_CP0_64(5, 7) -#define KVM_REG_MIPS_CP0_WIRED MIPS_CP0_32(6, 0) -#define KVM_REG_MIPS_CP0_PWCTL MIPS_CP0_32(6, 6) -#define KVM_REG_MIPS_CP0_HWRENA MIPS_CP0_32(7, 0) -#define KVM_REG_MIPS_CP0_BADVADDR MIPS_CP0_64(8, 0) -#define KVM_REG_MIPS_CP0_COUNT MIPS_CP0_32(9, 0) -#define KVM_REG_MIPS_CP0_ENTRYHI MIPS_CP0_64(10, 0) -#define KVM_REG_MIPS_CP0_COMPARE MIPS_CP0_32(11, 0) -#define KVM_REG_MIPS_CP0_STATUS MIPS_CP0_32(12, 0) -#define KVM_REG_MIPS_CP0_CAUSE MIPS_CP0_32(13, 0) -#define KVM_REG_MIPS_CP0_EPC MIPS_CP0_64(14, 0) -#define KVM_REG_MIPS_CP0_PRID MIPS_CP0_32(15, 0) -#define KVM_REG_MIPS_CP0_EBASE MIPS_CP0_64(15, 1) -#define KVM_REG_MIPS_CP0_CONFIG MIPS_CP0_32(16, 0) -#define KVM_REG_MIPS_CP0_CONFIG1 MIPS_CP0_32(16, 1) -#define KVM_REG_MIPS_CP0_CONFIG2 MIPS_CP0_32(16, 2) -#define KVM_REG_MIPS_CP0_CONFIG3 MIPS_CP0_32(16, 3) -#define KVM_REG_MIPS_CP0_CONFIG4 MIPS_CP0_32(16, 4) -#define KVM_REG_MIPS_CP0_CONFIG5 MIPS_CP0_32(16, 5) -#define KVM_REG_MIPS_CP0_CONFIG6 MIPS_CP0_32(16, 6) -#define KVM_REG_MIPS_CP0_XCONTEXT MIPS_CP0_64(20, 0) -#define KVM_REG_MIPS_CP0_ERROREPC MIPS_CP0_64(30, 0) -#define KVM_REG_MIPS_CP0_KSCRATCH1 MIPS_CP0_64(31, 2) -#define KVM_REG_MIPS_CP0_KSCRATCH2 MIPS_CP0_64(31, 3) -#define KVM_REG_MIPS_CP0_KSCRATCH3 MIPS_CP0_64(31, 4) -#define KVM_REG_MIPS_CP0_KSCRATCH4 MIPS_CP0_64(31, 5) -#define KVM_REG_MIPS_CP0_KSCRATCH5 MIPS_CP0_64(31, 6) -#define KVM_REG_MIPS_CP0_KSCRATCH6 MIPS_CP0_64(31, 7) - -static inline int kvm_mips_put_one_reg(CPUState *cs, uint64_t reg_id, - int32_t *addr) -{ - struct kvm_one_reg cp0reg =3D { - .id =3D reg_id, - .addr =3D (uintptr_t)addr - }; - - return kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, &cp0reg); -} - -static inline int kvm_mips_put_one_ureg(CPUState *cs, uint64_t reg_id, - uint32_t *addr) -{ - struct kvm_one_reg cp0reg =3D { - .id =3D reg_id, - .addr =3D (uintptr_t)addr - }; - - return kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, &cp0reg); -} - -static inline int kvm_mips_put_one_ulreg(CPUState *cs, uint64_t reg_id, - target_ulong *addr) -{ - uint64_t val64 =3D *addr; - struct kvm_one_reg cp0reg =3D { - .id =3D reg_id, - .addr =3D (uintptr_t)&val64 - }; - - return kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, &cp0reg); -} - -static inline int kvm_mips_put_one_reg64(CPUState *cs, uint64_t reg_id, - int64_t *addr) -{ - struct kvm_one_reg cp0reg =3D { - .id =3D reg_id, - .addr =3D (uintptr_t)addr - }; - - return kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, &cp0reg); -} - -static inline int kvm_mips_put_one_ureg64(CPUState *cs, uint64_t reg_id, - uint64_t *addr) -{ - struct kvm_one_reg cp0reg =3D { - .id =3D reg_id, - .addr =3D (uintptr_t)addr - }; - - return kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, &cp0reg); -} - -static inline int kvm_mips_get_one_reg(CPUState *cs, uint64_t reg_id, - int32_t *addr) -{ - struct kvm_one_reg cp0reg =3D { - .id =3D reg_id, - .addr =3D (uintptr_t)addr - }; - - return kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, &cp0reg); -} - -static inline int kvm_mips_get_one_ureg(CPUState *cs, uint64_t reg_id, - uint32_t *addr) -{ - struct kvm_one_reg cp0reg =3D { - .id =3D reg_id, - .addr =3D (uintptr_t)addr - }; - - return kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, &cp0reg); -} - -static inline int kvm_mips_get_one_ulreg(CPUState *cs, uint64_t reg_id, - target_ulong *addr) -{ - int ret; - uint64_t val64 =3D 0; - struct kvm_one_reg cp0reg =3D { - .id =3D reg_id, - .addr =3D (uintptr_t)&val64 - }; - - ret =3D kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, &cp0reg); - if (ret >=3D 0) { - *addr =3D val64; - } - return ret; -} - -static inline int kvm_mips_get_one_reg64(CPUState *cs, uint64_t reg_id, - int64_t *addr) -{ - struct kvm_one_reg cp0reg =3D { - .id =3D reg_id, - .addr =3D (uintptr_t)addr - }; - - return kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, &cp0reg); -} - -static inline int kvm_mips_get_one_ureg64(CPUState *cs, uint64_t reg_id, - uint64_t *addr) -{ - struct kvm_one_reg cp0reg =3D { - .id =3D reg_id, - .addr =3D (uintptr_t)addr - }; - - return kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, &cp0reg); -} - -#define KVM_REG_MIPS_CP0_CONFIG_MASK (1U << CP0C0_M) -#define KVM_REG_MIPS_CP0_CONFIG1_MASK ((1U << CP0C1_M) | \ - (1U << CP0C1_FP)) -#define KVM_REG_MIPS_CP0_CONFIG2_MASK (1U << CP0C2_M) -#define KVM_REG_MIPS_CP0_CONFIG3_MASK ((1U << CP0C3_M) | \ - (1U << CP0C3_MSAP)) -#define KVM_REG_MIPS_CP0_CONFIG4_MASK (1U << CP0C4_M) -#define KVM_REG_MIPS_CP0_CONFIG5_MASK ((1U << CP0C5_MSAEn) | \ - (1U << CP0C5_UFE) | \ - (1U << CP0C5_FRE) | \ - (1U << CP0C5_UFR)) -#define KVM_REG_MIPS_CP0_CONFIG6_MASK ((1U << CP0C6_BPPASS) | \ - (0x3fU << CP0C6_KPOS) | \ - (1U << CP0C6_KE) | \ - (1U << CP0C6_VTLBONLY) | \ - (1U << CP0C6_LASX) | \ - (1U << CP0C6_SSEN) | \ - (1U << CP0C6_DISDRTIME) | \ - (1U << CP0C6_PIXNUEN) | \ - (1U << CP0C6_SCRAND) | \ - (1U << CP0C6_LLEXCEN) | \ - (1U << CP0C6_DISVC) | \ - (1U << CP0C6_VCLRU) | \ - (1U << CP0C6_DCLRU) | \ - (1U << CP0C6_PIXUEN) | \ - (1U << CP0C6_DISBLKLYEN) | \ - (1U << CP0C6_UMEMUALEN) | \ - (1U << CP0C6_SFBEN) | \ - (1U << CP0C6_FLTINT) | \ - (1U << CP0C6_VLTINT) | \ - (1U << CP0C6_DISBTB) | \ - (3U << CP0C6_STPREFCTL) | \ - (1U << CP0C6_INSTPREF) | \ - (1U << CP0C6_DATAPREF)) - -static inline int kvm_mips_change_one_reg(CPUState *cs, uint64_t reg_id, - int32_t *addr, int32_t mask) -{ - int err; - int32_t tmp, change; - - err =3D kvm_mips_get_one_reg(cs, reg_id, &tmp); - if (err < 0) { - return err; - } - - /* only change bits in mask */ - change =3D (*addr ^ tmp) & mask; - if (!change) { - return 0; - } - - tmp =3D tmp ^ change; - return kvm_mips_put_one_reg(cs, reg_id, &tmp); -} - -/* - * We freeze the KVM timer when either the VM clock is stopped or the stat= e is - * saved (the state is dirty). - */ - -/* - * Save the state of the KVM timer when VM clock is stopped or state is sy= nced - * to QEMU. - */ -static int kvm_mips_save_count(CPUState *cs) -{ - CPUMIPSState *env =3D cpu_env(cs); - uint64_t count_ctl; - int err, ret =3D 0; - - /* freeze KVM timer */ - err =3D kvm_mips_get_one_ureg64(cs, KVM_REG_MIPS_COUNT_CTL, &count_ctl= ); - if (err < 0) { - DPRINTF("%s: Failed to get COUNT_CTL (%d)\n", __func__, err); - ret =3D err; - } else if (!(count_ctl & KVM_REG_MIPS_COUNT_CTL_DC)) { - count_ctl |=3D KVM_REG_MIPS_COUNT_CTL_DC; - err =3D kvm_mips_put_one_ureg64(cs, KVM_REG_MIPS_COUNT_CTL, &count= _ctl); - if (err < 0) { - DPRINTF("%s: Failed to set COUNT_CTL.DC=3D1 (%d)\n", __func__,= err); - ret =3D err; - } - } - - /* read CP0_Cause */ - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_CAUSE, &env->CP0_Cau= se); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_CAUSE (%d)\n", __func__, err); - ret =3D err; - } - - /* read CP0_Count */ - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_COUNT, &env->CP0_Cou= nt); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_COUNT (%d)\n", __func__, err); - ret =3D err; - } - - return ret; -} - -/* - * Restore the state of the KVM timer when VM clock is restarted or state = is - * synced to KVM. - */ -static int kvm_mips_restore_count(CPUState *cs) -{ - CPUMIPSState *env =3D cpu_env(cs); - uint64_t count_ctl; - int err_dc, err, ret =3D 0; - - /* check the timer is frozen */ - err_dc =3D kvm_mips_get_one_ureg64(cs, KVM_REG_MIPS_COUNT_CTL, &count_= ctl); - if (err_dc < 0) { - DPRINTF("%s: Failed to get COUNT_CTL (%d)\n", __func__, err_dc); - ret =3D err_dc; - } else if (!(count_ctl & KVM_REG_MIPS_COUNT_CTL_DC)) { - /* freeze timer (sets COUNT_RESUME for us) */ - count_ctl |=3D KVM_REG_MIPS_COUNT_CTL_DC; - err =3D kvm_mips_put_one_ureg64(cs, KVM_REG_MIPS_COUNT_CTL, &count= _ctl); - if (err < 0) { - DPRINTF("%s: Failed to set COUNT_CTL.DC=3D1 (%d)\n", __func__,= err); - ret =3D err; - } - } - - /* load CP0_Cause */ - err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_CAUSE, &env->CP0_Cau= se); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_CAUSE (%d)\n", __func__, err); - ret =3D err; - } - - /* load CP0_Count */ - err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_COUNT, &env->CP0_Cou= nt); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_COUNT (%d)\n", __func__, err); - ret =3D err; - } - - /* resume KVM timer */ - if (err_dc >=3D 0) { - count_ctl &=3D ~KVM_REG_MIPS_COUNT_CTL_DC; - err =3D kvm_mips_put_one_ureg64(cs, KVM_REG_MIPS_COUNT_CTL, &count= _ctl); - if (err < 0) { - DPRINTF("%s: Failed to set COUNT_CTL.DC=3D0 (%d)\n", __func__,= err); - ret =3D err; - } - } - - return ret; -} - -/* - * Handle the VM clock being started or stopped - */ -static void kvm_mips_update_state(void *opaque, bool running, RunState sta= te) -{ - CPUState *cs =3D opaque; - int ret; - uint64_t count_resume; - - /* - * If state is already dirty (synced to QEMU) then the KVM timer state= is - * already saved and can be restored when it is synced back to KVM. - */ - if (!running) { - if (!cs->vcpu_dirty) { - ret =3D kvm_mips_save_count(cs); - if (ret < 0) { - warn_report("Failed saving count"); - } - } - } else { - /* Set clock restore time to now */ - count_resume =3D qemu_clock_get_ns(QEMU_CLOCK_REALTIME); - ret =3D kvm_mips_put_one_ureg64(cs, KVM_REG_MIPS_COUNT_RESUME, - &count_resume); - if (ret < 0) { - warn_report("Failed setting COUNT_RESUME"); - return; - } - - if (!cs->vcpu_dirty) { - ret =3D kvm_mips_restore_count(cs); - if (ret < 0) { - warn_report("Failed restoring count"); - } - } - } -} - -static int kvm_mips_put_fpu_registers(CPUState *cs, KvmPutState level) -{ - CPUMIPSState *env =3D cpu_env(cs); - int err, ret =3D 0; - unsigned int i; - - /* Only put FPU state if we're emulating a CPU with an FPU */ - if (env->CP0_Config1 & (1 << CP0C1_FP)) { - /* FPU Control Registers */ - if (level =3D=3D KVM_PUT_FULL_STATE) { - err =3D kvm_mips_put_one_ureg(cs, KVM_REG_MIPS_FCR_IR, - &env->active_fpu.fcr0); - if (err < 0) { - DPRINTF("%s: Failed to put FCR_IR (%d)\n", __func__, err); - ret =3D err; - } - } - err =3D kvm_mips_put_one_ureg(cs, KVM_REG_MIPS_FCR_CSR, - &env->active_fpu.fcr31); - if (err < 0) { - DPRINTF("%s: Failed to put FCR_CSR (%d)\n", __func__, err); - ret =3D err; - } - - /* - * FPU register state is a subset of MSA vector state, so don't pu= t FPU - * registers if we're emulating a CPU with MSA. - */ - if (!ase_msa_available(env)) { - /* Floating point registers */ - for (i =3D 0; i < 32; ++i) { - if (env->CP0_Status & (1 << CP0St_FR)) { - err =3D kvm_mips_put_one_ureg64(cs, KVM_REG_MIPS_FPR_6= 4(i), - &env->active_fpu.fpr[i].= d); - } else { - err =3D kvm_mips_get_one_ureg(cs, KVM_REG_MIPS_FPR_32(= i), - &env->active_fpu.fpr[i].w[FP_ENDIAN_ID= X]); - } - if (err < 0) { - DPRINTF("%s: Failed to put FPR%u (%d)\n", __func__, i,= err); - ret =3D err; - } - } - } - } - - /* Only put MSA state if we're emulating a CPU with MSA */ - if (ase_msa_available(env)) { - /* MSA Control Registers */ - if (level =3D=3D KVM_PUT_FULL_STATE) { - err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_MSA_IR, - &env->msair); - if (err < 0) { - DPRINTF("%s: Failed to put MSA_IR (%d)\n", __func__, err); - ret =3D err; - } - } - err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_MSA_CSR, - &env->active_tc.msacsr); - if (err < 0) { - DPRINTF("%s: Failed to put MSA_CSR (%d)\n", __func__, err); - ret =3D err; - } - - /* Vector registers (includes FP registers) */ - for (i =3D 0; i < 32; ++i) { - /* Big endian MSA not supported by QEMU yet anyway */ - err =3D kvm_mips_put_one_reg64(cs, KVM_REG_MIPS_VEC_128(i), - env->active_fpu.fpr[i].wr.d); - if (err < 0) { - DPRINTF("%s: Failed to put VEC%u (%d)\n", __func__, i, err= ); - ret =3D err; - } - } - } - - return ret; -} - -static int kvm_mips_get_fpu_registers(CPUState *cs) -{ - CPUMIPSState *env =3D cpu_env(cs); - int err, ret =3D 0; - unsigned int i; - - /* Only get FPU state if we're emulating a CPU with an FPU */ - if (env->CP0_Config1 & (1 << CP0C1_FP)) { - /* FPU Control Registers */ - err =3D kvm_mips_get_one_ureg(cs, KVM_REG_MIPS_FCR_IR, - &env->active_fpu.fcr0); - if (err < 0) { - DPRINTF("%s: Failed to get FCR_IR (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ureg(cs, KVM_REG_MIPS_FCR_CSR, - &env->active_fpu.fcr31); - if (err < 0) { - DPRINTF("%s: Failed to get FCR_CSR (%d)\n", __func__, err); - ret =3D err; - } else { - restore_fp_status(env); - } - - /* - * FPU register state is a subset of MSA vector state, so don't sa= ve FPU - * registers if we're emulating a CPU with MSA. - */ - if (!ase_msa_available(env)) { - /* Floating point registers */ - for (i =3D 0; i < 32; ++i) { - if (env->CP0_Status & (1 << CP0St_FR)) { - err =3D kvm_mips_get_one_ureg64(cs, KVM_REG_MIPS_FPR_6= 4(i), - &env->active_fpu.fpr[i].= d); - } else { - err =3D kvm_mips_get_one_ureg(cs, KVM_REG_MIPS_FPR_32(= i), - &env->active_fpu.fpr[i].w[FP_ENDIAN_ID= X]); - } - if (err < 0) { - DPRINTF("%s: Failed to get FPR%u (%d)\n", __func__, i,= err); - ret =3D err; - } - } - } - } - - /* Only get MSA state if we're emulating a CPU with MSA */ - if (ase_msa_available(env)) { - /* MSA Control Registers */ - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_MSA_IR, - &env->msair); - if (err < 0) { - DPRINTF("%s: Failed to get MSA_IR (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_MSA_CSR, - &env->active_tc.msacsr); - if (err < 0) { - DPRINTF("%s: Failed to get MSA_CSR (%d)\n", __func__, err); - ret =3D err; - } else { - restore_msa_fp_status(env); - } - - /* Vector registers (includes FP registers) */ - for (i =3D 0; i < 32; ++i) { - /* Big endian MSA not supported by QEMU yet anyway */ - err =3D kvm_mips_get_one_reg64(cs, KVM_REG_MIPS_VEC_128(i), - env->active_fpu.fpr[i].wr.d); - if (err < 0) { - DPRINTF("%s: Failed to get VEC%u (%d)\n", __func__, i, err= ); - ret =3D err; - } - } - } - - return ret; -} - - -static int kvm_mips_put_cp0_registers(CPUState *cs, KvmPutState level) -{ - CPUMIPSState *env =3D cpu_env(cs); - int err, ret =3D 0; - - (void)level; - - err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_INDEX, &env->CP0_Ind= ex); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_INDEX (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_RANDOM, &env->CP0_Ra= ndom); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_RANDOM (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_CONTEXT, - &env->CP0_Context); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_CONTEXT (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_USERLOCAL, - &env->active_tc.CP0_UserLocal); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_USERLOCAL (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_PAGEMASK, - &env->CP0_PageMask); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_PAGEMASK (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_PAGEGRAIN, - &env->CP0_PageGrain); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_PAGEGRAIN (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_PWBASE, - &env->CP0_PWBase); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_PWBASE (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_PWFIELD, - &env->CP0_PWField); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_PWField (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_PWSIZE, - &env->CP0_PWSize); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_PWSIZE (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_WIRED, &env->CP0_Wir= ed); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_WIRED (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_PWCTL, &env->CP0_PWC= tl); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_PWCTL (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_HWRENA, &env->CP0_HW= REna); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_HWRENA (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_BADVADDR, - &env->CP0_BadVAddr); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_BADVADDR (%d)\n", __func__, err); - ret =3D err; - } - - /* If VM clock stopped then state will be restored when it is restarte= d */ - if (runstate_is_running()) { - err =3D kvm_mips_restore_count(cs); - if (err < 0) { - ret =3D err; - } - } - - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_ENTRYHI, - &env->CP0_EntryHi); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_ENTRYHI (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_COMPARE, - &env->CP0_Compare); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_COMPARE (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_STATUS, &env->CP0_St= atus); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_STATUS (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_EPC, &env->CP0_EPC= ); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_EPC (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_PRID, &env->CP0_PRid= ); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_PRID (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_EBASE, &env->CP0_E= Base); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_EBASE (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_change_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG, - &env->CP0_Config0, - KVM_REG_MIPS_CP0_CONFIG_MASK); - if (err < 0) { - DPRINTF("%s: Failed to change CP0_CONFIG (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_change_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG1, - &env->CP0_Config1, - KVM_REG_MIPS_CP0_CONFIG1_MASK); - if (err < 0) { - DPRINTF("%s: Failed to change CP0_CONFIG1 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_change_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG2, - &env->CP0_Config2, - KVM_REG_MIPS_CP0_CONFIG2_MASK); - if (err < 0) { - DPRINTF("%s: Failed to change CP0_CONFIG2 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_change_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG3, - &env->CP0_Config3, - KVM_REG_MIPS_CP0_CONFIG3_MASK); - if (err < 0) { - DPRINTF("%s: Failed to change CP0_CONFIG3 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_change_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG4, - &env->CP0_Config4, - KVM_REG_MIPS_CP0_CONFIG4_MASK); - if (err < 0) { - DPRINTF("%s: Failed to change CP0_CONFIG4 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_change_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG5, - &env->CP0_Config5, - KVM_REG_MIPS_CP0_CONFIG5_MASK); - if (err < 0) { - DPRINTF("%s: Failed to change CP0_CONFIG5 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_change_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG6, - &env->CP0_Config6, - KVM_REG_MIPS_CP0_CONFIG6_MASK); - if (err < 0) { - DPRINTF("%s: Failed to change CP0_CONFIG6 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_XCONTEXT, - &env->CP0_XContext); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_XCONTEXT (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_ERROREPC, - &env->CP0_ErrorEPC); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_ERROREPC (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_KSCRATCH1, - &env->CP0_KScratch[0]); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_KSCRATCH1 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_KSCRATCH2, - &env->CP0_KScratch[1]); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_KSCRATCH2 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_KSCRATCH3, - &env->CP0_KScratch[2]); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_KSCRATCH3 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_KSCRATCH4, - &env->CP0_KScratch[3]); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_KSCRATCH4 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_KSCRATCH5, - &env->CP0_KScratch[4]); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_KSCRATCH5 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_KSCRATCH6, - &env->CP0_KScratch[5]); - if (err < 0) { - DPRINTF("%s: Failed to put CP0_KSCRATCH6 (%d)\n", __func__, err); - ret =3D err; - } - - return ret; -} - -static int kvm_mips_get_cp0_registers(CPUState *cs) -{ - CPUMIPSState *env =3D cpu_env(cs); - int err, ret =3D 0; - - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_INDEX, &env->CP0_Ind= ex); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_INDEX (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_RANDOM, &env->CP0_Ra= ndom); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_RANDOM (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_CONTEXT, - &env->CP0_Context); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_CONTEXT (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_USERLOCAL, - &env->active_tc.CP0_UserLocal); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_USERLOCAL (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_PAGEMASK, - &env->CP0_PageMask); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_PAGEMASK (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_PAGEGRAIN, - &env->CP0_PageGrain); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_PAGEGRAIN (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_PWBASE, - &env->CP0_PWBase); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_PWBASE (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_PWFIELD, - &env->CP0_PWField); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_PWFIELD (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_PWSIZE, - &env->CP0_PWSize); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_PWSIZE (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_WIRED, &env->CP0_Wir= ed); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_WIRED (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_PWCTL, &env->CP0_PWC= tl); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_PWCtl (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_HWRENA, &env->CP0_HW= REna); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_HWRENA (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_BADVADDR, - &env->CP0_BadVAddr); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_BADVADDR (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_ENTRYHI, - &env->CP0_EntryHi); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_ENTRYHI (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_COMPARE, - &env->CP0_Compare); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_COMPARE (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_STATUS, &env->CP0_St= atus); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_STATUS (%d)\n", __func__, err); - ret =3D err; - } - - /* If VM clock stopped then state was already saved when it was stoppe= d */ - if (runstate_is_running()) { - err =3D kvm_mips_save_count(cs); - if (err < 0) { - ret =3D err; - } - } - - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_EPC, &env->CP0_EPC= ); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_EPC (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_PRID, &env->CP0_PRid= ); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_PRID (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_EBASE, &env->CP0_E= Base); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_EBASE (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG, &env->CP0_Co= nfig0); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_CONFIG (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG1, &env->CP0_C= onfig1); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_CONFIG1 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG2, &env->CP0_C= onfig2); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_CONFIG2 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG3, &env->CP0_C= onfig3); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_CONFIG3 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG4, &env->CP0_C= onfig4); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_CONFIG4 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG5, &env->CP0_C= onfig5); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_CONFIG5 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG6, &env->CP0_C= onfig6); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_CONFIG6 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_XCONTEXT, - &env->CP0_XContext); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_XCONTEXT (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_ERROREPC, - &env->CP0_ErrorEPC); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_ERROREPC (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_KSCRATCH1, - &env->CP0_KScratch[0]); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_KSCRATCH1 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_KSCRATCH2, - &env->CP0_KScratch[1]); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_KSCRATCH2 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_KSCRATCH3, - &env->CP0_KScratch[2]); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_KSCRATCH3 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_KSCRATCH4, - &env->CP0_KScratch[3]); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_KSCRATCH4 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_KSCRATCH5, - &env->CP0_KScratch[4]); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_KSCRATCH5 (%d)\n", __func__, err); - ret =3D err; - } - err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_KSCRATCH6, - &env->CP0_KScratch[5]); - if (err < 0) { - DPRINTF("%s: Failed to get CP0_KSCRATCH6 (%d)\n", __func__, err); - ret =3D err; - } - - return ret; -} - -int kvm_arch_put_registers(CPUState *cs, KvmPutState level, Error **errp) -{ - CPUMIPSState *env =3D cpu_env(cs); - struct kvm_regs regs; - int ret; - int i; - - /* Set the registers based on QEMU's view of things */ - for (i =3D 0; i < 32; i++) { - regs.gpr[i] =3D (int64_t)(target_long)env->active_tc.gpr[i]; - } - - regs.hi =3D (int64_t)(target_long)env->active_tc.HI[0]; - regs.lo =3D (int64_t)(target_long)env->active_tc.LO[0]; - regs.pc =3D (int64_t)(target_long)env->active_tc.PC; - - ret =3D kvm_vcpu_ioctl(cs, KVM_SET_REGS, ®s); - - if (ret < 0) { - return ret; - } - - ret =3D kvm_mips_put_cp0_registers(cs, level); - if (ret < 0) { - return ret; - } - - ret =3D kvm_mips_put_fpu_registers(cs, level); - if (ret < 0) { - return ret; - } - - return ret; -} - -int kvm_arch_get_registers(CPUState *cs, Error **errp) -{ - CPUMIPSState *env =3D cpu_env(cs); - int ret =3D 0; - struct kvm_regs regs; - int i; - - /* Get the current register set as KVM seems it */ - ret =3D kvm_vcpu_ioctl(cs, KVM_GET_REGS, ®s); - - if (ret < 0) { - return ret; - } - - for (i =3D 0; i < 32; i++) { - env->active_tc.gpr[i] =3D regs.gpr[i]; - } - - env->active_tc.HI[0] =3D regs.hi; - env->active_tc.LO[0] =3D regs.lo; - env->active_tc.PC =3D regs.pc; - - kvm_mips_get_cp0_registers(cs); - kvm_mips_get_fpu_registers(cs); - - return ret; -} - -int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, - uint64_t address, uint32_t data, PCIDevice *d= ev) -{ - return 0; -} - -int kvm_arch_add_msi_route_post(struct kvm_irq_routing_entry *route, - int vector, PCIDevice *dev) -{ - return 0; -} - -int kvm_arch_release_virq_post(int virq) -{ - return 0; -} - -int kvm_arch_msi_data_to_gsi(uint32_t data) -{ - abort(); -} - -int kvm_arch_get_default_type(MachineState *machine) -{ -#if defined(KVM_CAP_MIPS_VZ) - int r; - KVMState *s =3D KVM_STATE(machine->accelerator); - - r =3D kvm_check_extension(s, KVM_CAP_MIPS_VZ); - if (r > 0) { - return KVM_VM_MIPS_VZ; - } -#endif - - error_report("KVM_VM_MIPS_VZ type is not available"); - return -1; -} - -void kvm_arch_accel_class_init(ObjectClass *oc) -{ -} diff --git a/target/mips/system/cp0_timer.c b/target/mips/system/cp0_timer.c index 634c2a66bbd..6aed5d3af24 100644 --- a/target/mips/system/cp0_timer.c +++ b/target/mips/system/cp0_timer.c @@ -23,7 +23,6 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "qemu/timer.h" -#include "system/kvm.h" #include "internal.h" =20 /* MIPS R4K timer */ @@ -84,8 +83,7 @@ void cpu_mips_store_count(CPUMIPSState *env, uint32_t cou= nt) { /* * This gets called from cpu_state_reset(), potentially before timer i= nit. - * So env->timer may be NULL, which is also the case with KVM enabled = so - * treat timer as disabled in that case. + * So env->timer may be NULL, so treat timer as disabled in that case. */ MIPSCPU *cpu =3D env_archcpu(env); if (env->CP0_Cause & (1 << CP0Ca_DC) || !env->timer) { @@ -141,11 +139,5 @@ void cpu_mips_clock_init(MIPSCPU *cpu) { CPUMIPSState *env =3D &cpu->env; =20 - /* - * If we're in KVM mode, don't create the periodic timer, that is hand= led in - * kernel. - */ - if (!kvm_enabled()) { - env->timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, &mips_timer_cb, en= v); - } + env->timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, &mips_timer_cb, env); } diff --git a/target/mips/system/physaddr.c b/target/mips/system/physaddr.c index fbbbcf6e006..746dbf8aa4e 100644 --- a/target/mips/system/physaddr.c +++ b/target/mips/system/physaddr.c @@ -126,7 +126,6 @@ int get_physical_address(CPUMIPSState *env, hwaddr *phy= sical, int KX =3D (env->CP0_Status & (1 << CP0St_KX)) !=3D 0; #endif int ret =3D TLBRET_MATCH; - /* effective address (modified for KVM T&E kernel segments) */ target_ulong address =3D real_address; =20 if (address <=3D USEG_LIMIT) { diff --git a/target/mips/meson.build b/target/mips/meson.build index abf0ce3e8b9..5acb3a2dcf5 100644 --- a/target/mips/meson.build +++ b/target/mips/meson.build @@ -13,11 +13,7 @@ if have_system subdir('system') endif =20 -if 'CONFIG_TCG' in config_all_accel - subdir('tcg') -endif - -mips_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c')) +subdir('tcg') =20 target_arch +=3D {'mips': mips_ss} target_system_arch +=3D {'mips': mips_system_ss} --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305111; cv=none; d=zohomail.com; s=zohoarc; b=huTWt9OSK3AIImaxwNqxXsWogWcgnFds1GZJNjUQLzS5UF3zTFzNcJClHQZbz/kouw1fdl1Mf53pvrQBMDzKYoHPC1WHh98vbxbmlQKbPwjyz9leBqzQACUY9Vw8ZX47rMNh6TPgt1YWzCmSDGdcg+a6N+BNbnk8b3Ne8WJCr+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305111; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=lZD0ZN8VuzAXDtRsEnK1FsmHLFAA6OhM4XiIl30AK0o=; b=PrkFzrjdf0KiHQx7tzInaUB/F+pqMgORbUWBqQgN6b47wlEpAzjLp2Otyaey4ypQb+gvgHnxHwjftRidyk/RJzXlsUXMspy2F713jHFeF4yfhXq4oZ+8yxFSPTwPIk9Ifho2ry0LIyjh8xBLp+83m83D/op7gBufprzklSiiPnQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305111463619.5484084212468; Wed, 20 May 2026 12:25:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmXF-00089k-Nb; Wed, 20 May 2026 15:24:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmX8-0007m8-4N for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:47 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmX1-0001ss-5U for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:45 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-48ff4f8ef0dso58383375e9.3 for ; Wed, 20 May 2026 12:24:34 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49033d8e24bsm11804185e9.10.2026.05.20.12.24.29 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:24:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305072; x=1779909872; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lZD0ZN8VuzAXDtRsEnK1FsmHLFAA6OhM4XiIl30AK0o=; b=aMEf5/MEi/zQ7CBMJlxCavRODlUuoDiacCF8DvRF9i2u48OgnQZ41Oq63cQZ44HIm+ TmolH9pyDfbwQnWOCNYEtqnXVluJWJI1HGowztf+sTHARu4mkvPw8m+TOAAHmfTeMhwg RiXb0vYOf9FyWFjZyr0GyUDQZBsD48g4cNuSl5fVMDWCWECzaWLvexUOGAVjDIoGuCDB TiS24O9UP0e4ccuCfENFZN4ihGVJaU/xEkLt5AAY7kdQaN5YBvaceS2+NqrKHXmmEM7X ziVJuq1wE/90Ln4+UGnH9QBYF2sG2Q2XPgZKBP/Y5jCQgKyt/aKCPYEZRP8O4+wmq3lR iXrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305072; x=1779909872; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=lZD0ZN8VuzAXDtRsEnK1FsmHLFAA6OhM4XiIl30AK0o=; b=Ms43YnPNFXNVaaVfnozY0ICnaVL+LSZI45uTFQMpbHFYb07m0oOwI87wZBAkI8EpSq OkMMFlB7/QVoeugtL0XVPB/VJU9K3DAP9BBBuy+GFrnu2W/CReBtkedpWWB9cxSBDdy9 uPMJ2hCBSS0fIvFO53v/UZY3YrSussXxd1uNazlSB35fkwJXwkaL6AAFvq1sRXbLelIp iEyo+qbpPdQKgE5tnBfz/ZW2Pn+wBXhUBDAlz2evBdunCQTHcFIU+r3Omz3PGYrOyCB5 CMsyJl+DVWJ8L4gQniROlAeJatSF4WJ5Sn0dg4EtMpxUzjyffvzCVHYX8bxseOR7S/ZH hR9A== X-Gm-Message-State: AOJu0Yyagj5I2ojBQxKOkLuQS3d7qXcNn4WFH4/n4VdFwDoJCQ5dZS3x NuwUxkinkuNiKt+m6XqKNdCrVB8ckGMRGFo5RbF8iF1REb8Ew2Jtw0ViTIQTWB7+6icTibp4vyA 62RwWueA= X-Gm-Gg: Acq92OH7VuYPKz9Kzp3PN9YCn4sQOVbX88WSs7Ske/Yr+tdxFq970BN8FThu+99ItxZ 4lIA3TuZ5vhvwxKucIvunMCvAHa+T/XXS7x7L+cM5caOZDgsbea8x0gD/cCIUIt1gXMfDieZVl0 1LxxhUeSEI/ewOdlXdaaLpxjAZCtPMqjSmz+Y/cLNKZz/IhMtgGgHe58zSfGBpzZrmQAacKFPax 9C+xqYGsF/UFLGCA6vsugcYklZS2rHLGBDPaVc2bmtStyqKpuY9voXhPhAYqb/RTK+GCgQgoq/P nWEqfy5ExT13jlxOlDhc4NhEDJpQ2BRBaqziAK8JXcBg4bNYEc/mf9a3uWOglWCuSPG64PvSvl8 edNZ8tZ+IEFOH2k+iVQhiy1skCHa4fo9yKAKNOMFkxL7Rfj8TEuC7o5eSk7tZjBV32/s1XwIlQ7 NO2eHvyT3K1ypojshb1ghwKiQ8mE1qlKswrXhMyr5DRSz4g2NLmepCg/G4dl6+ujbDFrDHW2oSR gwZ5be67uY= X-Received: by 2002:a05:600c:8b4b:b0:48f:d2fc:d025 with SMTP id 5b1f17b1804b1-48fe60e14d0mr370614545e9.6.1779305070782; Wed, 20 May 2026 12:24:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 07/33] buildsys: Remove MIPS TCG backend Date: Wed, 20 May 2026 21:23:12 +0200 Message-ID: <20260520192338.40036-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: qemu development 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: 1779305113431154100 We removed support for MIPS host. Remove the now unreachable TCG host code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260511135312.38705-6-philmd@linaro.org> --- MAINTAINERS | 9 - include/user/thunk.h | 2 +- linux-user/include/host/mips64/host-signal.h | 75 - tcg/mips64/tcg-target-con-set.h | 30 - tcg/mips64/tcg-target-con-str.h | 20 - tcg/mips64/tcg-target-has.h | 69 - tcg/mips64/tcg-target-mo.h | 13 - tcg/mips64/tcg-target.h | 75 - tcg/mips64/tcg-target-opc.h.inc | 1 - linux-user/mmap.c | 2 +- tcg/mips64/tcg-target.c.inc | 2605 ------------------ common-user/host/mips64/safe-syscall.inc.S | 114 - 12 files changed, 2 insertions(+), 3013 deletions(-) delete mode 100644 linux-user/include/host/mips64/host-signal.h delete mode 100644 tcg/mips64/tcg-target-con-set.h delete mode 100644 tcg/mips64/tcg-target-con-str.h delete mode 100644 tcg/mips64/tcg-target-has.h delete mode 100644 tcg/mips64/tcg-target-mo.h delete mode 100644 tcg/mips64/tcg-target.h delete mode 100644 tcg/mips64/tcg-target-opc.h.inc delete mode 100644 tcg/mips64/tcg-target.c.inc delete mode 100644 common-user/host/mips64/safe-syscall.inc.S diff --git a/MAINTAINERS b/MAINTAINERS index bd7ea53f950..7496ace6d5a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4148,15 +4148,6 @@ M: WANG Xuerui S: Maintained F: tcg/loongarch64/ =20 -MIPS TCG target -M: Philippe Mathieu-Daud=C3=A9 -R: Aurelien Jarno -R: Huacai Chen -R: Jiaxun Yang -R: Aleksandar Rikalo -S: Odd Fixes -F: tcg/mips64/ - PPC TCG target M: Richard Henderson S: Odd Fixes diff --git a/include/user/thunk.h b/include/user/thunk.h index 2a2104b568f..9af174eaa18 100644 --- a/include/user/thunk.h +++ b/include/user/thunk.h @@ -115,7 +115,7 @@ static inline int thunk_type_size(const argtype *type_p= tr, int is_host) if (is_host) { #if defined(HOST_X86_64) return 8; -#elif defined(HOST_MIPS) || defined(HOST_SPARC64) +#elif defined(HOST_SPARC64) return 4; #elif defined(HOST_PPC) return sizeof(void *); diff --git a/linux-user/include/host/mips64/host-signal.h b/linux-user/incl= ude/host/mips64/host-signal.h deleted file mode 100644 index 0dbc5cecfde..00000000000 --- a/linux-user/include/host/mips64/host-signal.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * host-signal.h: signal info dependent on the host architecture - * - * Copyright (c) 2003-2005 Fabrice Bellard - * Copyright (c) 2021 Linaro Limited - * - * This work is licensed under the terms of the GNU LGPL, version 2.1 or l= ater. - * See the COPYING file in the top-level directory. - */ - -#ifndef MIPS_HOST_SIGNAL_H -#define MIPS_HOST_SIGNAL_H - -/* The third argument to a SA_SIGINFO handler is ucontext_t. */ -typedef ucontext_t host_sigcontext; - -static inline uintptr_t host_signal_pc(host_sigcontext *uc) -{ - return uc->uc_mcontext.pc; -} - -static inline void host_signal_set_pc(host_sigcontext *uc, uintptr_t pc) -{ - uc->uc_mcontext.pc =3D pc; -} - -static inline void *host_signal_mask(host_sigcontext *uc) -{ - return &uc->uc_sigmask; -} - -#if defined(__misp16) || defined(__mips_micromips) -#error "Unsupported encoding" -#endif - -static inline bool host_signal_write(siginfo_t *info, host_sigcontext *uc) -{ - uint32_t insn =3D *(uint32_t *)host_signal_pc(uc); - - /* Detect all store instructions at program counter. */ - switch ((insn >> 26) & 077) { - case 050: /* SB */ - case 051: /* SH */ - case 052: /* SWL */ - case 053: /* SW */ - case 054: /* SDL */ - case 055: /* SDR */ - case 056: /* SWR */ - case 070: /* SC */ - case 071: /* SWC1 */ - case 074: /* SCD */ - case 075: /* SDC1 */ - case 077: /* SD */ -#if !defined(__mips_isa_rev) || __mips_isa_rev < 6 - case 072: /* SWC2 */ - case 076: /* SDC2 */ -#endif - return true; - case 023: /* COP1X */ - /* - * Required in all versions of MIPS64 since - * MIPS64r1 and subsequent versions of MIPS32r2. - */ - switch (insn & 077) { - case 010: /* SWXC1 */ - case 011: /* SDXC1 */ - case 015: /* SUXC1 */ - return true; - } - break; - } - return false; -} - -#endif diff --git a/tcg/mips64/tcg-target-con-set.h b/tcg/mips64/tcg-target-con-se= t.h deleted file mode 100644 index 5304691dc18..00000000000 --- a/tcg/mips64/tcg-target-con-set.h +++ /dev/null @@ -1,30 +0,0 @@ -/* SPDX-License-Identifier: MIT */ -/* - * Define MIPS target-specific constraint sets. - * Copyright (c) 2021 Linaro - */ - -/* - * C_On_Im(...) defines a constraint set with outputs and inputs. - * Each operand should be a sequence of constraint letters as defined by - * tcg-target-con-str.h; the constraint combination is inclusive or. - */ -C_O0_I1(r) -C_O0_I2(r, rz) -C_O0_I2(rz, r) -C_O0_I3(rz, rz, r) -C_O0_I4(r, r, rz, rz) -C_O1_I1(r, r) -C_O1_I2(r, 0, rz) -C_O1_I2(r, r, r) -C_O1_I2(r, r, ri) -C_O1_I2(r, r, rI) -C_O1_I2(r, r, rIK) -C_O1_I2(r, r, rJ) -C_O1_I2(r, r, rz) -C_O1_I2(r, r, rzW) -C_O1_I4(r, r, rz, rz, 0) -C_O1_I4(r, r, rz, rz, rz) -C_O1_I4(r, r, r, rz, rz) -C_O2_I1(r, r, r) -C_O2_I2(r, r, r, r) diff --git a/tcg/mips64/tcg-target-con-str.h b/tcg/mips64/tcg-target-con-st= r.h deleted file mode 100644 index db2b225e4a2..00000000000 --- a/tcg/mips64/tcg-target-con-str.h +++ /dev/null @@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: MIT */ -/* - * Define MIPS target-specific operand constraints. - * Copyright (c) 2021 Linaro - */ - -/* - * Define constraint letters for register sets: - * REGS(letter, register_mask) - */ -REGS('r', ALL_GENERAL_REGS) - -/* - * Define constraint letters for constants: - * CONST(letter, TCG_CT_CONST_* bit set) - */ -CONST('I', TCG_CT_CONST_U16) -CONST('J', TCG_CT_CONST_S16) -CONST('K', TCG_CT_CONST_P2M1) -CONST('W', TCG_CT_CONST_WSZ) diff --git a/tcg/mips64/tcg-target-has.h b/tcg/mips64/tcg-target-has.h deleted file mode 100644 index 88f0145efba..00000000000 --- a/tcg/mips64/tcg-target-has.h +++ /dev/null @@ -1,69 +0,0 @@ -/* SPDX-License-Identifier: MIT */ -/* - * Define target-specific opcode support - * Copyright (c) 2008-2009 Arnaud Patard - * Copyright (c) 2009 Aurelien Jarno - */ - -#ifndef TCG_TARGET_HAS_H -#define TCG_TARGET_HAS_H - -/* MOVN/MOVZ instructions detection */ -#if (defined(__mips_isa_rev) && (__mips_isa_rev >=3D 1)) || \ - defined(_MIPS_ARCH_LOONGSON2E) || defined(_MIPS_ARCH_LOONGSON2F) || \ - defined(_MIPS_ARCH_MIPS4) -#define use_movnz_instructions 1 -#else -extern bool use_movnz_instructions; -#endif - -/* MIPS32 instruction set detection */ -#if defined(__mips_isa_rev) && (__mips_isa_rev >=3D 1) -#define use_mips32_instructions 1 -#else -extern bool use_mips32_instructions; -#endif - -/* MIPS32R2 instruction set detection */ -#if defined(__mips_isa_rev) && (__mips_isa_rev >=3D 2) -#define use_mips32r2_instructions 1 -#else -extern bool use_mips32r2_instructions; -#endif - -/* MIPS32R6 instruction set detection */ -#if defined(__mips_isa_rev) && (__mips_isa_rev >=3D 6) -#define use_mips32r6_instructions 1 -#else -#define use_mips32r6_instructions 0 -#endif - -/* optional instructions */ -#define TCG_TARGET_HAS_extr_i64_i32 1 -#define TCG_TARGET_HAS_ext32s_i64 1 -#define TCG_TARGET_HAS_ext32u_i64 1 - -/* optional instructions detected at runtime */ -#define TCG_TARGET_HAS_qemu_ldst_i128 0 -#define TCG_TARGET_HAS_tst 0 - -#define TCG_TARGET_extract_valid(type, ofs, len) use_mips32r2_instructions -#define TCG_TARGET_deposit_valid(type, ofs, len) use_mips32r2_instructions - -static inline bool -tcg_target_sextract_valid(TCGType type, unsigned ofs, unsigned len) -{ - if (ofs =3D=3D 0) { - switch (len) { - case 8: - case 16: - return use_mips32r2_instructions; - case 32: - return type =3D=3D TCG_TYPE_I64; - } - } - return false; -} -#define TCG_TARGET_sextract_valid tcg_target_sextract_valid - -#endif diff --git a/tcg/mips64/tcg-target-mo.h b/tcg/mips64/tcg-target-mo.h deleted file mode 100644 index 50cefc222d9..00000000000 --- a/tcg/mips64/tcg-target-mo.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: MIT */ -/* - * Define target-specific memory model - * Copyright (c) 2008-2009 Arnaud Patard - * Copyright (c) 2009 Aurelien Jarno - */ - -#ifndef TCG_TARGET_MO_H -#define TCG_TARGET_MO_H - -#define TCG_TARGET_DEFAULT_MO 0 - -#endif diff --git a/tcg/mips64/tcg-target.h b/tcg/mips64/tcg-target.h deleted file mode 100644 index bd4ca5f852d..00000000000 --- a/tcg/mips64/tcg-target.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Tiny Code Generator for QEMU - * - * Copyright (c) 2008-2009 Arnaud Patard - * Copyright (c) 2009 Aurelien Jarno - * Based on i386/tcg-target.c - Copyright (c) 2008 Fabrice Bellard - * - * Permission is hereby granted, free of charge, to any person obtaining a= copy - * of this software and associated documentation files (the "Software"), t= o deal - * in the Software without restriction, including without limitation the r= ights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included= in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN - * THE SOFTWARE. - */ - -#ifndef MIPS_TCG_TARGET_H -#define MIPS_TCG_TARGET_H - -#define TCG_TARGET_INSN_UNIT_SIZE 4 -#define TCG_TARGET_NB_REGS 32 - -#define MAX_CODE_GEN_BUFFER_SIZE ((size_t)-1) - -typedef enum { - TCG_REG_ZERO =3D 0, - TCG_REG_AT, - TCG_REG_V0, - TCG_REG_V1, - TCG_REG_A0, - TCG_REG_A1, - TCG_REG_A2, - TCG_REG_A3, - TCG_REG_T0, - TCG_REG_T1, - TCG_REG_T2, - TCG_REG_T3, - TCG_REG_T4, - TCG_REG_T5, - TCG_REG_T6, - TCG_REG_T7, - TCG_REG_S0, - TCG_REG_S1, - TCG_REG_S2, - TCG_REG_S3, - TCG_REG_S4, - TCG_REG_S5, - TCG_REG_S6, - TCG_REG_S7, - TCG_REG_T8, - TCG_REG_T9, - TCG_REG_K0, - TCG_REG_K1, - TCG_REG_GP, - TCG_REG_SP, - TCG_REG_S8, - TCG_REG_RA, - - TCG_REG_CALL_STACK =3D TCG_REG_SP, - TCG_AREG0 =3D TCG_REG_S8, -} TCGReg; - -#define TCG_REG_ZERO TCG_REG_ZERO - -#endif diff --git a/tcg/mips64/tcg-target-opc.h.inc b/tcg/mips64/tcg-target-opc.h.= inc deleted file mode 100644 index 84e777bfe53..00000000000 --- a/tcg/mips64/tcg-target-opc.h.inc +++ /dev/null @@ -1 +0,0 @@ -/* No target specific opcodes. */ diff --git a/linux-user/mmap.c b/linux-user/mmap.c index b635b6a21c4..b4b7b3e5cc9 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -1351,7 +1351,7 @@ static inline abi_ulong target_shmlba(CPUArchState *c= pu_env) } #endif =20 -#if defined(__mips__) || defined(__sparc__) +#if defined(__sparc__) #define HOST_FORCE_SHMLBA 1 #else #define HOST_FORCE_SHMLBA 0 diff --git a/tcg/mips64/tcg-target.c.inc b/tcg/mips64/tcg-target.c.inc deleted file mode 100644 index 60c703a0939..00000000000 --- a/tcg/mips64/tcg-target.c.inc +++ /dev/null @@ -1,2605 +0,0 @@ -/* - * Tiny Code Generator for QEMU - * - * Copyright (c) 2008-2009 Arnaud Patard - * Copyright (c) 2009 Aurelien Jarno - * Based on i386/tcg-target.c - Copyright (c) 2008 Fabrice Bellard - * - * Permission is hereby granted, free of charge, to any person obtaining a= copy - * of this software and associated documentation files (the "Software"), t= o deal - * in the Software without restriction, including without limitation the r= ights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included= in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN - * THE SOFTWARE. - */ - -/* used for function call generation */ -#define TCG_TARGET_STACK_ALIGN 16 -#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 - -#ifdef CONFIG_DEBUG_TCG -static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] =3D { - "zero", - "at", - "v0", - "v1", - "a0", - "a1", - "a2", - "a3", - "t0", - "t1", - "t2", - "t3", - "t4", - "t5", - "t6", - "t7", - "s0", - "s1", - "s2", - "s3", - "s4", - "s5", - "s6", - "s7", - "t8", - "t9", - "k0", - "k1", - "gp", - "sp", - "s8", - "ra", -}; -#endif - -#define TCG_TMP0 TCG_REG_AT -#define TCG_TMP1 TCG_REG_T9 -#define TCG_TMP2 TCG_REG_T8 -#define TCG_TMP3 TCG_REG_T7 - -#define TCG_GUEST_BASE_REG TCG_REG_S7 -#define TCG_REG_TB TCG_REG_S6 - -/* check if we really need so many registers :P */ -static const int tcg_target_reg_alloc_order[] =3D { - /* Call saved registers. */ - TCG_REG_S0, - TCG_REG_S1, - TCG_REG_S2, - TCG_REG_S3, - TCG_REG_S4, - TCG_REG_S5, - TCG_REG_S6, - TCG_REG_S7, - TCG_REG_S8, - - /* Call clobbered registers. */ - TCG_REG_T4, - TCG_REG_T5, - TCG_REG_T6, - TCG_REG_T7, - TCG_REG_T8, - TCG_REG_T9, - TCG_REG_V1, - TCG_REG_V0, - - /* Argument registers, opposite order of allocation. */ - TCG_REG_T3, - TCG_REG_T2, - TCG_REG_T1, - TCG_REG_T0, - TCG_REG_A3, - TCG_REG_A2, - TCG_REG_A1, - TCG_REG_A0, -}; - -static const TCGReg tcg_target_call_iarg_regs[] =3D { - TCG_REG_A0, - TCG_REG_A1, - TCG_REG_A2, - TCG_REG_A3, - TCG_REG_T0, - TCG_REG_T1, - TCG_REG_T2, - TCG_REG_T3, -}; - -static TCGReg tcg_target_call_oarg_reg(TCGCallReturnKind kind, int slot) -{ - tcg_debug_assert(kind =3D=3D TCG_CALL_RET_NORMAL); - tcg_debug_assert(slot >=3D 0 && slot <=3D 1); - return TCG_REG_V0 + slot; -} - -static const tcg_insn_unit *tb_ret_addr; -static const tcg_insn_unit *bswap32_addr; -static const tcg_insn_unit *bswap32u_addr; -static const tcg_insn_unit *bswap64_addr; - -static bool reloc_pc16(tcg_insn_unit *src_rw, const tcg_insn_unit *target) -{ - /* Let the compiler perform the right-shift as part of the arithmetic.= */ - const tcg_insn_unit *src_rx =3D tcg_splitwx_to_rx(src_rw); - ptrdiff_t disp =3D target - (src_rx + 1); - if (disp =3D=3D (int16_t)disp) { - *src_rw =3D deposit32(*src_rw, 0, 16, disp); - return true; - } - return false; -} - -static bool patch_reloc(tcg_insn_unit *code_ptr, int type, - intptr_t value, intptr_t addend) -{ - value +=3D addend; - switch (type) { - case R_MIPS_PC16: - return reloc_pc16(code_ptr, (const tcg_insn_unit *)value); - case R_MIPS_16: - if (value !=3D (int16_t)value) { - return false; - } - *code_ptr =3D deposit32(*code_ptr, 0, 16, value); - return true; - } - g_assert_not_reached(); -} - -#define TCG_CT_CONST_U16 0x100 /* Unsigned 16-bit: 0 - 0xffff. */ -#define TCG_CT_CONST_S16 0x200 /* Signed 16-bit: -32768 - 32767 */ -#define TCG_CT_CONST_P2M1 0x400 /* Power of 2 minus 1. */ -#define TCG_CT_CONST_WSZ 0x800 /* word size */ - -#define ALL_GENERAL_REGS 0xffffffffu - -static bool is_p2m1(tcg_target_long val) -{ - return val && ((val + 1) & val) =3D=3D 0; -} - -/* test if a constant matches the constraint */ -static bool tcg_target_const_match(int64_t val, int ct, - TCGType type, TCGCond cond, int vece) -{ - if (ct & TCG_CT_CONST) { - return 1; - } else if ((ct & TCG_CT_CONST_U16) && val =3D=3D (uint16_t)val) { - return 1; - } else if ((ct & TCG_CT_CONST_S16) && val =3D=3D (int16_t)val) { - return 1; - } else if ((ct & TCG_CT_CONST_P2M1) - && use_mips32r2_instructions && is_p2m1(val)) { - return 1; - } else if ((ct & TCG_CT_CONST_WSZ) - && val =3D=3D (type =3D=3D TCG_TYPE_I32 ? 32 : 64)) { - return 1; - } - return 0; -} - -/* instruction opcodes */ -typedef enum { - OPC_J =3D 002 << 26, - OPC_JAL =3D 003 << 26, - OPC_BEQ =3D 004 << 26, - OPC_BNE =3D 005 << 26, - OPC_BLEZ =3D 006 << 26, - OPC_BGTZ =3D 007 << 26, - OPC_ADDIU =3D 011 << 26, - OPC_SLTI =3D 012 << 26, - OPC_SLTIU =3D 013 << 26, - OPC_ANDI =3D 014 << 26, - OPC_ORI =3D 015 << 26, - OPC_XORI =3D 016 << 26, - OPC_LUI =3D 017 << 26, - OPC_BNEL =3D 025 << 26, - OPC_BNEZALC_R6 =3D 030 << 26, - OPC_DADDIU =3D 031 << 26, - OPC_LDL =3D 032 << 26, - OPC_LDR =3D 033 << 26, - OPC_LB =3D 040 << 26, - OPC_LH =3D 041 << 26, - OPC_LWL =3D 042 << 26, - OPC_LW =3D 043 << 26, - OPC_LBU =3D 044 << 26, - OPC_LHU =3D 045 << 26, - OPC_LWR =3D 046 << 26, - OPC_LWU =3D 047 << 26, - OPC_SB =3D 050 << 26, - OPC_SH =3D 051 << 26, - OPC_SWL =3D 052 << 26, - OPC_SW =3D 053 << 26, - OPC_SDL =3D 054 << 26, - OPC_SDR =3D 055 << 26, - OPC_SWR =3D 056 << 26, - OPC_LD =3D 067 << 26, - OPC_SD =3D 077 << 26, - - OPC_SPECIAL =3D 000 << 26, - OPC_SLL =3D OPC_SPECIAL | 000, - OPC_SRL =3D OPC_SPECIAL | 002, - OPC_ROTR =3D OPC_SPECIAL | 002 | (1 << 21), - OPC_SRA =3D OPC_SPECIAL | 003, - OPC_SLLV =3D OPC_SPECIAL | 004, - OPC_SRLV =3D OPC_SPECIAL | 006, - OPC_ROTRV =3D OPC_SPECIAL | 006 | 0100, - OPC_SRAV =3D OPC_SPECIAL | 007, - OPC_JR_R5 =3D OPC_SPECIAL | 010, - OPC_JALR =3D OPC_SPECIAL | 011, - OPC_MOVZ =3D OPC_SPECIAL | 012, - OPC_MOVN =3D OPC_SPECIAL | 013, - OPC_SYNC =3D OPC_SPECIAL | 017, - OPC_MFHI =3D OPC_SPECIAL | 020, - OPC_MFLO =3D OPC_SPECIAL | 022, - OPC_DSLLV =3D OPC_SPECIAL | 024, - OPC_DSRLV =3D OPC_SPECIAL | 026, - OPC_DROTRV =3D OPC_SPECIAL | 026 | 0100, - OPC_DSRAV =3D OPC_SPECIAL | 027, - OPC_MULT =3D OPC_SPECIAL | 030, - OPC_MUL_R6 =3D OPC_SPECIAL | 030 | 0200, - OPC_MUH =3D OPC_SPECIAL | 030 | 0300, - OPC_MULTU =3D OPC_SPECIAL | 031, - OPC_MULU =3D OPC_SPECIAL | 031 | 0200, - OPC_MUHU =3D OPC_SPECIAL | 031 | 0300, - OPC_DIV =3D OPC_SPECIAL | 032, - OPC_DIV_R6 =3D OPC_SPECIAL | 032 | 0200, - OPC_MOD =3D OPC_SPECIAL | 032 | 0300, - OPC_DIVU =3D OPC_SPECIAL | 033, - OPC_DIVU_R6 =3D OPC_SPECIAL | 033 | 0200, - OPC_MODU =3D OPC_SPECIAL | 033 | 0300, - OPC_DMULT =3D OPC_SPECIAL | 034, - OPC_DMUL =3D OPC_SPECIAL | 034 | 0200, - OPC_DMUH =3D OPC_SPECIAL | 034 | 0300, - OPC_DMULTU =3D OPC_SPECIAL | 035, - OPC_DMULU =3D OPC_SPECIAL | 035 | 0200, - OPC_DMUHU =3D OPC_SPECIAL | 035 | 0300, - OPC_DDIV =3D OPC_SPECIAL | 036, - OPC_DDIV_R6 =3D OPC_SPECIAL | 036 | 0200, - OPC_DMOD =3D OPC_SPECIAL | 036 | 0300, - OPC_DDIVU =3D OPC_SPECIAL | 037, - OPC_DDIVU_R6 =3D OPC_SPECIAL | 037 | 0200, - OPC_DMODU =3D OPC_SPECIAL | 037 | 0300, - OPC_ADDU =3D OPC_SPECIAL | 041, - OPC_SUBU =3D OPC_SPECIAL | 043, - OPC_AND =3D OPC_SPECIAL | 044, - OPC_OR =3D OPC_SPECIAL | 045, - OPC_XOR =3D OPC_SPECIAL | 046, - OPC_NOR =3D OPC_SPECIAL | 047, - OPC_SLT =3D OPC_SPECIAL | 052, - OPC_SLTU =3D OPC_SPECIAL | 053, - OPC_DADDU =3D OPC_SPECIAL | 055, - OPC_DSUBU =3D OPC_SPECIAL | 057, - OPC_SELEQZ =3D OPC_SPECIAL | 065, - OPC_SELNEZ =3D OPC_SPECIAL | 067, - OPC_DSLL =3D OPC_SPECIAL | 070, - OPC_DSRL =3D OPC_SPECIAL | 072, - OPC_DROTR =3D OPC_SPECIAL | 072 | (1 << 21), - OPC_DSRA =3D OPC_SPECIAL | 073, - OPC_DSLL32 =3D OPC_SPECIAL | 074, - OPC_DSRL32 =3D OPC_SPECIAL | 076, - OPC_DROTR32 =3D OPC_SPECIAL | 076 | (1 << 21), - OPC_DSRA32 =3D OPC_SPECIAL | 077, - OPC_CLZ_R6 =3D OPC_SPECIAL | 0120, - OPC_DCLZ_R6 =3D OPC_SPECIAL | 0122, - - OPC_REGIMM =3D 001 << 26, - OPC_BLTZ =3D OPC_REGIMM | (000 << 16), - OPC_BGEZ =3D OPC_REGIMM | (001 << 16), - - OPC_SPECIAL2 =3D 034 << 26, - OPC_MUL_R5 =3D OPC_SPECIAL2 | 002, - OPC_CLZ =3D OPC_SPECIAL2 | 040, - OPC_DCLZ =3D OPC_SPECIAL2 | 044, - - OPC_SPECIAL3 =3D 037 << 26, - OPC_EXT =3D OPC_SPECIAL3 | 000, - OPC_DEXTM =3D OPC_SPECIAL3 | 001, - OPC_DEXTU =3D OPC_SPECIAL3 | 002, - OPC_DEXT =3D OPC_SPECIAL3 | 003, - OPC_INS =3D OPC_SPECIAL3 | 004, - OPC_DINSM =3D OPC_SPECIAL3 | 005, - OPC_DINSU =3D OPC_SPECIAL3 | 006, - OPC_DINS =3D OPC_SPECIAL3 | 007, - OPC_WSBH =3D OPC_SPECIAL3 | 00240, - OPC_DSBH =3D OPC_SPECIAL3 | 00244, - OPC_DSHD =3D OPC_SPECIAL3 | 00544, - OPC_SEB =3D OPC_SPECIAL3 | 02040, - OPC_SEH =3D OPC_SPECIAL3 | 03040, - - /* MIPS r6 doesn't have JR, JALR should be used instead */ - OPC_JR =3D use_mips32r6_instructions ? OPC_JALR : OPC_JR_R5, - - /* - * MIPS r6 replaces MUL with an alternative encoding which is - * backwards-compatible at the assembly level. - */ - OPC_MUL =3D use_mips32r6_instructions ? OPC_MUL_R6 : OPC_MUL_R5, - - /* MIPS r6 introduced names for weaker variants of SYNC. These are - backward compatible to previous architecture revisions. */ - OPC_SYNC_WMB =3D OPC_SYNC | 0x04 << 6, - OPC_SYNC_MB =3D OPC_SYNC | 0x10 << 6, - OPC_SYNC_ACQUIRE =3D OPC_SYNC | 0x11 << 6, - OPC_SYNC_RELEASE =3D OPC_SYNC | 0x12 << 6, - OPC_SYNC_RMB =3D OPC_SYNC | 0x13 << 6, -} MIPSInsn; - -/* - * Type reg - */ -static void tcg_out_opc_reg(TCGContext *s, MIPSInsn opc, - TCGReg rd, TCGReg rs, TCGReg rt) -{ - int32_t inst; - - inst =3D opc; - inst |=3D (rs & 0x1F) << 21; - inst |=3D (rt & 0x1F) << 16; - inst |=3D (rd & 0x1F) << 11; - tcg_out32(s, inst); -} - -/* - * Type immediate - */ -static void tcg_out_opc_imm(TCGContext *s, MIPSInsn opc, - TCGReg rt, TCGReg rs, TCGArg imm) -{ - int32_t inst; - - inst =3D opc; - inst |=3D (rs & 0x1F) << 21; - inst |=3D (rt & 0x1F) << 16; - inst |=3D (imm & 0xffff); - tcg_out32(s, inst); -} - -/* - * Type bitfield - */ -static void tcg_out_opc_bf(TCGContext *s, MIPSInsn opc, TCGReg rt, - TCGReg rs, int msb, int lsb) -{ - int32_t inst; - - inst =3D opc; - inst |=3D (rs & 0x1F) << 21; - inst |=3D (rt & 0x1F) << 16; - inst |=3D (msb & 0x1F) << 11; - inst |=3D (lsb & 0x1F) << 6; - tcg_out32(s, inst); -} - -static void tcg_out_opc_bf64(TCGContext *s, MIPSInsn opc, MIPSInsn opm, - MIPSInsn oph, TCGReg rt, TCGReg rs, - int msb, int lsb) -{ - if (lsb >=3D 32) { - opc =3D oph; - msb -=3D 32; - lsb -=3D 32; - } else if (msb >=3D 32) { - opc =3D opm; - msb -=3D 32; - } - tcg_out_opc_bf(s, opc, rt, rs, msb, lsb); -} - -/* - * Type branch - */ -static void tcg_out_opc_br(TCGContext *s, MIPSInsn opc, TCGReg rt, TCGReg = rs) -{ - tcg_out_opc_imm(s, opc, rt, rs, 0); -} - -/* - * Type sa - */ -static void tcg_out_opc_sa(TCGContext *s, MIPSInsn opc, - TCGReg rd, TCGReg rt, TCGArg sa) -{ - int32_t inst; - - inst =3D opc; - inst |=3D (rt & 0x1F) << 16; - inst |=3D (rd & 0x1F) << 11; - inst |=3D (sa & 0x1F) << 6; - tcg_out32(s, inst); - -} - -static void tcg_out_opc_sa64(TCGContext *s, MIPSInsn opc1, MIPSInsn opc2, - TCGReg rd, TCGReg rt, TCGArg sa) -{ - int32_t inst; - - inst =3D (sa & 32 ? opc2 : opc1); - inst |=3D (rt & 0x1F) << 16; - inst |=3D (rd & 0x1F) << 11; - inst |=3D (sa & 0x1F) << 6; - tcg_out32(s, inst); -} - -/* - * Type jump. - * Returns true if the branch was in range and the insn was emitted. - */ -static bool tcg_out_opc_jmp(TCGContext *s, MIPSInsn opc, const void *targe= t) -{ - uintptr_t dest =3D (uintptr_t)target; - uintptr_t from =3D (uintptr_t)tcg_splitwx_to_rx(s->code_ptr) + 4; - int32_t inst; - - /* The pc-region branch happens within the 256MB region of - the delay slot (thus the +4). */ - if ((from ^ dest) & -(1 << 28)) { - return false; - } - tcg_debug_assert((dest & 3) =3D=3D 0); - - inst =3D opc; - inst |=3D (dest >> 2) & 0x3ffffff; - tcg_out32(s, inst); - return true; -} - -static void tcg_out_nop(TCGContext *s) -{ - tcg_out32(s, 0); -} - -static void tcg_out_nop_fill(tcg_insn_unit *p, int count) -{ - memset(p, 0, count * sizeof(tcg_insn_unit)); -} - -static void tcg_out_dsll(TCGContext *s, TCGReg rd, TCGReg rt, TCGArg sa) -{ - tcg_out_opc_sa64(s, OPC_DSLL, OPC_DSLL32, rd, rt, sa); -} - -static void tcg_out_dsrl(TCGContext *s, TCGReg rd, TCGReg rt, TCGArg sa) -{ - tcg_out_opc_sa64(s, OPC_DSRL, OPC_DSRL32, rd, rt, sa); -} - -static void tcg_out_dsra(TCGContext *s, TCGReg rd, TCGReg rt, TCGArg sa) -{ - tcg_out_opc_sa64(s, OPC_DSRA, OPC_DSRA32, rd, rt, sa); -} - -static bool tcg_out_mov(TCGContext *s, TCGType type, TCGReg ret, TCGReg ar= g) -{ - /* Simple reg-reg move, optimising out the 'do nothing' case */ - if (ret !=3D arg) { - tcg_out_opc_reg(s, OPC_OR, ret, arg, TCG_REG_ZERO); - } - return true; -} - -static bool tcg_out_movi_one(TCGContext *s, TCGReg ret, tcg_target_long ar= g) -{ - if (arg =3D=3D (int16_t)arg) { - tcg_out_opc_imm(s, OPC_ADDIU, ret, TCG_REG_ZERO, arg); - return true; - } - if (arg =3D=3D (uint16_t)arg) { - tcg_out_opc_imm(s, OPC_ORI, ret, TCG_REG_ZERO, arg); - return true; - } - if (arg =3D=3D (int32_t)arg && (arg & 0xffff) =3D=3D 0) { - tcg_out_opc_imm(s, OPC_LUI, ret, TCG_REG_ZERO, arg >> 16); - return true; - } - return false; -} - -static bool tcg_out_movi_two(TCGContext *s, TCGReg ret, tcg_target_long ar= g) -{ - /* - * All signed 32-bit constants are loadable with two immediates, - * and everything else requires more work. - */ - if (arg =3D=3D (int32_t)arg) { - if (!tcg_out_movi_one(s, ret, arg)) { - tcg_out_opc_imm(s, OPC_LUI, ret, TCG_REG_ZERO, arg >> 16); - tcg_out_opc_imm(s, OPC_ORI, ret, ret, arg & 0xffff); - } - return true; - } - return false; -} - -static void tcg_out_movi_pool(TCGContext *s, TCGReg ret, - tcg_target_long arg, TCGReg tbreg) -{ - new_pool_label(s, arg, R_MIPS_16, s->code_ptr, tcg_tbrel_diff(s, NULL)= ); - tcg_out_opc_imm(s, OPC_LD, ret, tbreg, 0); -} - -static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret, - tcg_target_long arg, TCGReg tbreg) -{ - tcg_target_long tmp; - int sh, lo; - - if (type =3D=3D TCG_TYPE_I32) { - arg =3D (int32_t)arg; - } - - /* Load all 32-bit constants. */ - if (tcg_out_movi_two(s, ret, arg)) { - return; - } - - /* Load addresses within 2GB of TB with 1 or 3 insns. */ - tmp =3D tcg_tbrel_diff(s, (void *)arg); - if (tmp =3D=3D (int16_t)tmp) { - tcg_out_opc_imm(s, OPC_DADDIU, ret, tbreg, tmp); - return; - } - if (tcg_out_movi_two(s, ret, tmp)) { - tcg_out_opc_reg(s, OPC_DADDU, ret, ret, tbreg); - return; - } - - /* - * Load bitmasks with a right-shift. This is good for things - * like 0x0fff_ffff_ffff_fff0: ADDUI r,0,0xff00 + DSRL r,r,4. - * or similarly using LUI. For this to work, bit 31 must be set. - */ - if (arg > 0 && (int32_t)arg < 0) { - sh =3D clz64(arg); - if (tcg_out_movi_one(s, ret, arg << sh)) { - tcg_out_dsrl(s, ret, ret, sh); - return; - } - } - - /* - * Load slightly larger constants using left-shift. - * Limit this sequence to 3 insns to avoid too much expansion. - */ - sh =3D ctz64(arg); - if (sh && tcg_out_movi_two(s, ret, arg >> sh)) { - tcg_out_dsll(s, ret, ret, sh); - return; - } - - /* - * Load slightly larger constants using left-shift and add/or. - * Prefer addi with a negative immediate when that would produce - * a larger shift. For this to work, bits 15 and 16 must be set. - */ - lo =3D arg & 0xffff; - if (lo) { - if ((arg & 0x18000) =3D=3D 0x18000) { - lo =3D (int16_t)arg; - } - tmp =3D arg - lo; - sh =3D ctz64(tmp); - tmp >>=3D sh; - if (tcg_out_movi_one(s, ret, tmp)) { - tcg_out_dsll(s, ret, ret, sh); - tcg_out_opc_imm(s, lo < 0 ? OPC_DADDIU : OPC_ORI, ret, ret, lo= ); - return; - } - } - - /* Otherwise, put 64-bit constants into the constant pool. */ - tcg_out_movi_pool(s, ret, arg, tbreg); -} - -static void tcg_out_movi(TCGContext *s, TCGType type, - TCGReg ret, tcg_target_long arg) -{ - tcg_out_movi_int(s, type, ret, arg, TCG_REG_TB); -} - -static void tcg_out_ext8s(TCGContext *s, TCGType type, TCGReg rd, TCGReg r= s) -{ - tcg_debug_assert(use_mips32r2_instructions); - tcg_out_opc_reg(s, OPC_SEB, rd, TCG_REG_ZERO, rs); -} - -static void tcg_out_ext8u(TCGContext *s, TCGReg rd, TCGReg rs) -{ - tcg_out_opc_imm(s, OPC_ANDI, rd, rs, 0xff); -} - -static void tcg_out_ext16s(TCGContext *s, TCGType type, TCGReg rd, TCGReg = rs) -{ - tcg_debug_assert(use_mips32r2_instructions); - tcg_out_opc_reg(s, OPC_SEH, rd, TCG_REG_ZERO, rs); -} - -static void tcg_out_ext16u(TCGContext *s, TCGReg rd, TCGReg rs) -{ - tcg_out_opc_imm(s, OPC_ANDI, rd, rs, 0xffff); -} - -static void tcg_out_ext32s(TCGContext *s, TCGReg rd, TCGReg rs) -{ - tcg_out_opc_sa(s, OPC_SLL, rd, rs, 0); -} - -static void tcg_out_exts_i32_i64(TCGContext *s, TCGReg rd, TCGReg rs) -{ - if (rd !=3D rs) { - tcg_out_ext32s(s, rd, rs); - } -} - -static void tcg_out_extu_i32_i64(TCGContext *s, TCGReg rd, TCGReg rs) -{ - tcg_out_ext32u(s, rd, rs); -} - -static void tcg_out_extrl_i64_i32(TCGContext *s, TCGReg rd, TCGReg rs) -{ - tcg_out_ext32s(s, rd, rs); -} - -static bool tcg_out_xchg(TCGContext *s, TCGType type, TCGReg r1, TCGReg r2) -{ - return false; -} - -static void tcg_out_addi_ptr(TCGContext *s, TCGReg rd, TCGReg rs, - tcg_target_long imm) -{ - /* This function is only used for passing structs by reference. */ - g_assert_not_reached(); -} - -static void tcg_out_bswap_subr(TCGContext *s, const tcg_insn_unit *sub) -{ - if (!tcg_out_opc_jmp(s, OPC_JAL, sub)) { - tcg_out_movi(s, TCG_TYPE_PTR, TCG_TMP1, (uintptr_t)sub); - tcg_out_opc_reg(s, OPC_JALR, TCG_REG_RA, TCG_TMP1, 0); - } -} - -static void tcg_out_ext32u(TCGContext *s, TCGReg ret, TCGReg arg) -{ - if (use_mips32r2_instructions) { - tcg_out_opc_bf(s, OPC_DEXT, ret, arg, 31, 0); - } else { - tcg_out_dsll(s, ret, arg, 32); - tcg_out_dsrl(s, ret, ret, 32); - } -} - -static void tcg_out_ldst(TCGContext *s, MIPSInsn opc, TCGReg data, - TCGReg addr, intptr_t ofs) -{ - int16_t lo =3D ofs; - 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, OPC_DADDU, TCG_TMP0, TCG_TMP0, addr); - } - addr =3D TCG_TMP0; - } - tcg_out_opc_imm(s, opc, data, addr, lo); -} - -static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg arg, - TCGReg arg1, intptr_t arg2) -{ - MIPSInsn opc =3D type =3D=3D TCG_TYPE_I32 ? OPC_LW : OPC_LD; - tcg_out_ldst(s, opc, arg, arg1, arg2); -} - -static void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, - TCGReg arg1, intptr_t arg2) -{ - MIPSInsn opc =3D type =3D=3D TCG_TYPE_I32 ? OPC_SW : OPC_SD; - tcg_out_ldst(s, opc, arg, arg1, arg2); -} - -static bool tcg_out_sti(TCGContext *s, TCGType type, TCGArg val, - TCGReg base, intptr_t ofs) -{ - if (val =3D=3D 0) { - tcg_out_st(s, type, TCG_REG_ZERO, base, ofs); - return true; - } - return false; -} - -#define SETCOND_INV TCG_TARGET_NB_REGS -#define SETCOND_NEZ (SETCOND_INV << 1) -#define SETCOND_FLAGS (SETCOND_INV | SETCOND_NEZ) - -static int tcg_out_setcond_int(TCGContext *s, TCGCond cond, TCGReg ret, - TCGReg arg1, TCGReg arg2) -{ - int flags =3D 0; - - switch (cond) { - case TCG_COND_EQ: /* -> NE */ - case TCG_COND_GE: /* -> LT */ - case TCG_COND_GEU: /* -> LTU */ - case TCG_COND_LE: /* -> GT */ - case TCG_COND_LEU: /* -> GTU */ - cond =3D tcg_invert_cond(cond); - flags ^=3D SETCOND_INV; - break; - default: - break; - } - - switch (cond) { - case TCG_COND_NE: - flags |=3D SETCOND_NEZ; - if (arg2 =3D=3D 0) { - return arg1 | flags; - } - tcg_out_opc_reg(s, OPC_XOR, ret, arg1, arg2); - break; - case TCG_COND_LT: - tcg_out_opc_reg(s, OPC_SLT, ret, arg1, arg2); - break; - case TCG_COND_LTU: - tcg_out_opc_reg(s, OPC_SLTU, ret, arg1, arg2); - break; - case TCG_COND_GT: - tcg_out_opc_reg(s, OPC_SLT, ret, arg2, arg1); - break; - case TCG_COND_GTU: - tcg_out_opc_reg(s, OPC_SLTU, ret, arg2, arg1); - break; - default: - g_assert_not_reached(); - } - return ret | flags; -} - -static void tcg_out_setcond_end(TCGContext *s, TCGReg ret, int tmpflags) -{ - if (tmpflags !=3D ret) { - TCGReg tmp =3D tmpflags & ~SETCOND_FLAGS; - - switch (tmpflags & SETCOND_FLAGS) { - case SETCOND_INV: - /* Intermediate result is boolean: simply invert. */ - tcg_out_opc_imm(s, OPC_XORI, ret, tmp, 1); - break; - case SETCOND_NEZ: - /* Intermediate result is zero/non-zero: test !=3D 0. */ - tcg_out_opc_reg(s, OPC_SLTU, ret, TCG_REG_ZERO, tmp); - break; - case SETCOND_NEZ | SETCOND_INV: - /* Intermediate result is zero/non-zero: test =3D=3D 0. */ - tcg_out_opc_imm(s, OPC_SLTIU, ret, tmp, 1); - break; - default: - g_assert_not_reached(); - } - } -} - -static void tgen_setcond(TCGContext *s, TCGType type, TCGCond cond, - TCGReg ret, TCGReg arg1, TCGReg arg2) -{ - int tmpflags =3D tcg_out_setcond_int(s, cond, ret, arg1, arg2); - tcg_out_setcond_end(s, ret, tmpflags); -} - -static const TCGOutOpSetcond outop_setcond =3D { - .base.static_constraint =3D C_O1_I2(r, r, rz), - .out_rrr =3D tgen_setcond, -}; - -static void tgen_negsetcond(TCGContext *s, TCGType type, TCGCond cond, - TCGReg ret, TCGReg arg1, TCGReg arg2) -{ - int tmpflags =3D tcg_out_setcond_int(s, cond, ret, arg1, arg2); - TCGReg tmp =3D tmpflags & ~SETCOND_FLAGS; - - /* If intermediate result is zero/non-zero: test !=3D 0. */ - if (tmpflags & SETCOND_NEZ) { - tcg_out_opc_reg(s, OPC_SLTU, ret, TCG_REG_ZERO, tmp); - tmp =3D ret; - } - /* Produce the 0/-1 result. */ - if (tmpflags & SETCOND_INV) { - tcg_out_opc_imm(s, OPC_ADDIU, ret, tmp, -1); - } else { - tcg_out_opc_reg(s, OPC_SUBU, ret, TCG_REG_ZERO, tmp); - } -} - -static const TCGOutOpSetcond outop_negsetcond =3D { - .base.static_constraint =3D C_O1_I2(r, r, rz), - .out_rrr =3D tgen_negsetcond, -}; - -static void tgen_brcond(TCGContext *s, TCGType type, TCGCond cond, - TCGReg arg1, TCGReg arg2, TCGLabel *l) -{ - static const MIPSInsn b_zero[16] =3D { - [TCG_COND_LT] =3D OPC_BLTZ, - [TCG_COND_GT] =3D OPC_BGTZ, - [TCG_COND_LE] =3D OPC_BLEZ, - [TCG_COND_GE] =3D OPC_BGEZ, - }; - - MIPSInsn b_opc =3D 0; - - switch (cond) { - case TCG_COND_EQ: - b_opc =3D OPC_BEQ; - break; - case TCG_COND_NE: - b_opc =3D OPC_BNE; - break; - case TCG_COND_LT: - case TCG_COND_GT: - case TCG_COND_LE: - case TCG_COND_GE: - if (arg2 =3D=3D 0) { - b_opc =3D b_zero[cond]; - arg2 =3D arg1; - arg1 =3D 0; - } - break; - default: - break; - } - - if (b_opc =3D=3D 0) { - int tmpflags =3D tcg_out_setcond_int(s, cond, TCG_TMP0, arg1, arg2= ); - - arg2 =3D TCG_REG_ZERO; - arg1 =3D tmpflags & ~SETCOND_FLAGS; - 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, arg1, arg2); - tcg_out_nop(s); -} - -static const TCGOutOpBrcond outop_brcond =3D { - .base.static_constraint =3D C_O0_I2(r, rz), - .out_rr =3D tgen_brcond, -}; - -void tcg_out_br(TCGContext *s, TCGLabel *l) -{ - tgen_brcond(s, TCG_TYPE_I32, TCG_COND_EQ, TCG_REG_ZERO, TCG_REG_ZERO, = l); -} - -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) -{ - int tmpflags; - bool eqz; - - /* If one of the values is zero, put it last to match SEL*Z instructio= ns */ - if (use_mips32r6_instructions && v1 =3D=3D 0) { - v1 =3D v2; - v2 =3D 0; - cond =3D tcg_invert_cond(cond); - } - - tmpflags =3D tcg_out_setcond_int(s, cond, TCG_TMP0, c1, c2); - c1 =3D tmpflags & ~SETCOND_FLAGS; - eqz =3D tmpflags & SETCOND_INV; - - if (use_mips32r6_instructions) { - MIPSInsn m_opc_t =3D eqz ? OPC_SELEQZ : OPC_SELNEZ; - MIPSInsn m_opc_f =3D eqz ? OPC_SELNEZ : OPC_SELEQZ; - - if (v2 !=3D 0) { - tcg_out_opc_reg(s, m_opc_f, TCG_TMP1, v2, c1); - } - tcg_out_opc_reg(s, m_opc_t, ret, v1, c1); - if (v2 !=3D 0) { - tcg_out_opc_reg(s, OPC_OR, ret, ret, TCG_TMP1); - } - return; - } - - /* This should be guaranteed via constraints */ - tcg_debug_assert(v2 =3D=3D ret); - - if (use_movnz_instructions) { - MIPSInsn m_opc =3D eqz ? OPC_MOVZ : OPC_MOVN; - tcg_out_opc_reg(s, m_opc, ret, v1, c1); - } else { - /* Invert the condition in order to branch over the move. */ - MIPSInsn b_opc =3D eqz ? OPC_BNE : OPC_BEQ; - tcg_out_opc_imm(s, b_opc, c1, TCG_REG_ZERO, 2); - tcg_out_nop(s); - /* Open-code tcg_out_mov, without the nop-move check. */ - tcg_out_opc_reg(s, OPC_OR, ret, v1, TCG_REG_ZERO); - } -} - -static const TCGOutOpMovcond outop_movcond =3D { - .base.static_constraint =3D (use_mips32r6_instructions - ? C_O1_I4(r, r, rz, rz, rz) - : C_O1_I4(r, r, rz, rz, 0)), - .out =3D tgen_movcond, -}; - -static void tcg_out_call_int(TCGContext *s, const tcg_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. - * - * We can re-use helper addresses often; always drop the pointer - * into the constant pool. - */ - tcg_out_movi_pool(s, TCG_REG_T9, (uintptr_t)arg, TCG_REG_TB); - - if (tail) { - if (!tcg_out_opc_jmp(s, OPC_J, arg)) { - tcg_out_opc_reg(s, OPC_JR, 0, TCG_REG_T9, 0); - } - } else { - if (!tcg_out_opc_jmp(s, OPC_JAL, arg)) { - tcg_out_opc_reg(s, OPC_JALR, TCG_REG_RA, TCG_REG_T9, 0); - } - } -} - -static void tcg_out_call(TCGContext *s, const tcg_insn_unit *arg, - const TCGHelperInfo *info) -{ - tcg_out_call_int(s, arg, false); - tcg_out_nop(s); -} - -/* We have four temps, we might as well expose three of them. */ -static const TCGLdstHelperParam ldst_helper_param =3D { - .ntmp =3D 3, .tmp =3D { TCG_TMP0, TCG_TMP1, TCG_TMP2 } -}; - -static bool tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l) -{ - const tcg_insn_unit *tgt_rx =3D tcg_splitwx_to_rx(s->code_ptr); - MemOp opc =3D get_memop(l->oi); - - /* resolve label address */ - if (!reloc_pc16(l->label_ptr[0], tgt_rx) - || (l->label_ptr[1] && !reloc_pc16(l->label_ptr[1], tgt_rx))) { - return false; - } - - tcg_out_ld_helper_args(s, l, &ldst_helper_param); - - tcg_out_call_int(s, qemu_ld_helpers[opc & MO_SSIZE], false); - /* delay slot */ - tcg_out_nop(s); - - tcg_out_ld_helper_ret(s, l, true, &ldst_helper_param); - - tcg_out_opc_br(s, OPC_BEQ, TCG_REG_ZERO, TCG_REG_ZERO); - if (!reloc_pc16(s->code_ptr - 1, l->raddr)) { - return false; - } - - /* delay slot */ - tcg_out_nop(s); - return true; -} - -static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l) -{ - const tcg_insn_unit *tgt_rx =3D tcg_splitwx_to_rx(s->code_ptr); - MemOp opc =3D get_memop(l->oi); - - /* resolve label address */ - if (!reloc_pc16(l->label_ptr[0], tgt_rx) - || (l->label_ptr[1] && !reloc_pc16(l->label_ptr[1], tgt_rx))) { - return false; - } - - tcg_out_st_helper_args(s, l, &ldst_helper_param); - - tcg_out_call_int(s, qemu_st_helpers[opc & MO_SIZE], false); - /* delay slot */ - tcg_out_nop(s); - - tcg_out_opc_br(s, OPC_BEQ, TCG_REG_ZERO, TCG_REG_ZERO); - if (!reloc_pc16(s->code_ptr - 1, l->raddr)) { - return false; - } - - /* delay slot */ - tcg_out_nop(s); - return true; -} - -typedef struct { - TCGReg base; - TCGAtomAlign aa; -} HostAddress; - -bool tcg_target_has_memory_bswap(MemOp memop) -{ - return false; -} - -/* We expect to use a 16-bit negative offset from ENV. */ -#define MIN_TLB_MASK_TABLE_OFS -32768 - -/* - * For system-mode, perform the TLB load and compare. - * For user-mode, perform any required alignment tests. - * In both cases, return a TCGLabelQemuLdst structure if the slow path - * is required and fill in @h with the host address for the fast path. - */ -static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, - TCGReg addr, MemOpIdx oi, bool = is_ld) -{ - TCGType addr_type =3D s->addr_type; - TCGLabelQemuLdst *ldst =3D NULL; - MemOp opc =3D get_memop(oi); - MemOp a_bits; - unsigned s_bits =3D opc & MO_SIZE; - unsigned a_mask; - TCGReg base; - - h->aa =3D atom_and_align_for_opc(s, opc, MO_ATOM_IFALIGN, false); - a_bits =3D h->aa.align; - a_mask =3D (1 << a_bits) - 1; - - if (tcg_use_softmmu) { - unsigned s_mask =3D (1 << s_bits) - 1; - int mem_index =3D get_mmuidx(oi); - int fast_off =3D tlb_mask_table_ofs(s, mem_index); - int mask_off =3D fast_off + offsetof(CPUTLBDescFast, mask); - int table_off =3D fast_off + offsetof(CPUTLBDescFast, table); - int add_off =3D offsetof(CPUTLBEntry, addend); - int cmp_off =3D is_ld ? offsetof(CPUTLBEntry, addr_read) - : offsetof(CPUTLBEntry, addr_write); - - ldst =3D new_ldst_label(s); - ldst->is_ld =3D is_ld; - ldst->oi =3D oi; - ldst->addr_reg =3D addr; - - /* Load tlb_mask[mmu_idx] and tlb_table[mmu_idx]. */ - tcg_out_ld(s, TCG_TYPE_PTR, TCG_TMP0, TCG_AREG0, mask_off); - tcg_out_ld(s, TCG_TYPE_PTR, TCG_TMP1, TCG_AREG0, table_off); - - /* Extract the TLB index from the address into TMP3. */ - 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 { - tcg_out_dsrl(s, TCG_TMP3, addr, TARGET_PAGE_BITS - CPU_TLB_ENT= RY_BITS); - } - tcg_out_opc_reg(s, OPC_AND, TCG_TMP3, TCG_TMP3, TCG_TMP0); - - /* Add the tlb_table pointer, creating the CPUTLBEntry address. */ - tcg_out_opc_reg(s, OPC_DADDU, TCG_TMP3, TCG_TMP3, TCG_TMP1); - - /* Load the tlb comparator. */ - 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 { - tcg_out_ld(s, TCG_TYPE_REG, TCG_TMP0, TCG_TMP3, cmp_off); - } - - /* Load the tlb addend for the fast path. */ - tcg_out_ld(s, TCG_TYPE_PTR, TCG_TMP3, TCG_TMP3, add_off); - - /* - * Mask the page bits, keeping the alignment bits to compare again= st. - * For unaligned accesses, compare against the end of the access to - * verify that it does not cross a page boundary. - */ - tcg_out_movi(s, addr_type, TCG_TMP1, TARGET_PAGE_MASK | a_mask); - if (a_mask < s_mask) { - 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); - } else { - tcg_out_opc_reg(s, OPC_AND, TCG_TMP1, TCG_TMP1, addr); - } - - /* Zero extend a 32-bit guest address for a 64-bit host. */ - if (addr_type =3D=3D TCG_TYPE_I32) { - tcg_out_ext32u(s, TCG_TMP2, addr); - addr =3D TCG_TMP2; - } - - ldst->label_ptr[0] =3D s->code_ptr; - tcg_out_opc_br(s, OPC_BNE, TCG_TMP1, TCG_TMP0); - - /* delay slot */ - base =3D TCG_TMP3; - 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); - - ldst->is_ld =3D is_ld; - ldst->oi =3D oi; - ldst->addr_reg =3D addr; - - /* We are expecting a_bits to max out at 7, much lower than AN= DI. */ - tcg_debug_assert(a_bits < 16); - tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP0, addr, a_mask); - - ldst->label_ptr[0] =3D s->code_ptr; - if (use_mips32r6_instructions) { - tcg_out_opc_br(s, OPC_BNEZALC_R6, TCG_REG_ZERO, TCG_TMP0); - } else { - tcg_out_opc_br(s, OPC_BNEL, TCG_TMP0, TCG_REG_ZERO); - tcg_out_nop(s); - } - } - - base =3D addr; - if (addr_type =3D=3D TCG_TYPE_I32) { - tcg_out_ext32u(s, TCG_REG_A0, base); - base =3D TCG_REG_A0; - } - if (guest_base) { - if (guest_base =3D=3D (int16_t)guest_base) { - tcg_out_opc_imm(s, OPC_DADDIU, TCG_REG_A0, base, guest_bas= e); - } else { - tcg_out_opc_reg(s, OPC_DADDU, TCG_REG_A0, base, - TCG_GUEST_BASE_REG); - } - base =3D TCG_REG_A0; - } - } - - h->base =3D base; - return ldst; -} - -static void tcg_out_qemu_ld_direct(TCGContext *s, TCGReg lo, TCGReg hi, - TCGReg base, MemOp opc, TCGType type) -{ - switch (opc & MO_SSIZE) { - case MO_UB: - tcg_out_opc_imm(s, OPC_LBU, lo, base, 0); - break; - case MO_SB: - tcg_out_opc_imm(s, OPC_LB, lo, base, 0); - break; - case MO_UW: - tcg_out_opc_imm(s, OPC_LHU, lo, base, 0); - break; - case MO_SW: - tcg_out_opc_imm(s, OPC_LH, lo, base, 0); - break; - case MO_UL: - if (type =3D=3D TCG_TYPE_I64) { - tcg_out_opc_imm(s, OPC_LWU, lo, base, 0); - break; - } - /* FALLTHRU */ - case MO_SL: - tcg_out_opc_imm(s, OPC_LW, lo, base, 0); - break; - case MO_UQ: - tcg_out_opc_imm(s, OPC_LD, lo, base, 0); - break; - default: - g_assert_not_reached(); - } -} - -static void tcg_out_qemu_ld_unalign(TCGContext *s, TCGReg lo, TCGReg hi, - TCGReg base, MemOp opc, TCGType type) -{ - const MIPSInsn lw1 =3D HOST_BIG_ENDIAN ? OPC_LWL : OPC_LWR; - const MIPSInsn lw2 =3D HOST_BIG_ENDIAN ? OPC_LWR : OPC_LWL; - const MIPSInsn ld1 =3D HOST_BIG_ENDIAN ? OPC_LDL : OPC_LDR; - const MIPSInsn ld2 =3D HOST_BIG_ENDIAN ? OPC_LDR : OPC_LDL; - bool sgn =3D opc & MO_SIGN; - - switch (opc & MO_SIZE) { - case MO_16: - if (HOST_BIG_ENDIAN) { - tcg_out_opc_imm(s, sgn ? OPC_LB : OPC_LBU, TCG_TMP0, base, 0); - tcg_out_opc_imm(s, OPC_LBU, lo, base, 1); - if (use_mips32r2_instructions) { - tcg_out_opc_bf(s, OPC_INS, lo, TCG_TMP0, 31, 8); - } else { - tcg_out_opc_sa(s, OPC_SLL, TCG_TMP0, TCG_TMP0, 8); - tcg_out_opc_reg(s, OPC_OR, lo, lo, TCG_TMP0); - } - } else if (use_mips32r2_instructions && lo !=3D base) { - tcg_out_opc_imm(s, OPC_LBU, lo, base, 0); - tcg_out_opc_imm(s, sgn ? OPC_LB : OPC_LBU, TCG_TMP0, base, 1); - tcg_out_opc_bf(s, OPC_INS, lo, TCG_TMP0, 31, 8); - } else { - tcg_out_opc_imm(s, OPC_LBU, TCG_TMP0, base, 0); - tcg_out_opc_imm(s, sgn ? OPC_LB : OPC_LBU, TCG_TMP1, base, 1); - tcg_out_opc_sa(s, OPC_SLL, TCG_TMP1, TCG_TMP1, 8); - tcg_out_opc_reg(s, OPC_OR, lo, TCG_TMP0, TCG_TMP1); - } - break; - - case MO_32: - tcg_out_opc_imm(s, lw1, lo, base, 0); - tcg_out_opc_imm(s, lw2, lo, base, 3); - if (type =3D=3D TCG_TYPE_I64 && !sgn) { - tcg_out_ext32u(s, lo, lo); - } - break; - - case MO_64: - tcg_out_opc_imm(s, ld1, lo, base, 0); - tcg_out_opc_imm(s, ld2, lo, base, 7); - break; - - default: - g_assert_not_reached(); - } -} - -static void tgen_qemu_ld(TCGContext *s, TCGType type, TCGReg data, - TCGReg addr, MemOpIdx oi) -{ - MemOp opc =3D get_memop(oi); - TCGLabelQemuLdst *ldst; - HostAddress h; - - 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, data, 0, h.base, opc, type); - } else { - tcg_out_qemu_ld_unalign(s, data, 0, h.base, opc, type); - } - - if (ldst) { - ldst->type =3D type; - ldst->datalo_reg =3D data; - ldst->datahi_reg =3D 0; - ldst->raddr =3D tcg_splitwx_to_rx(s->code_ptr); - } -} - -static const TCGOutOpQemuLdSt outop_qemu_ld =3D { - .base.static_constraint =3D C_O1_I1(r, r), - .out =3D tgen_qemu_ld, -}; - -static const TCGOutOpQemuLdSt2 outop_qemu_ld2 =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static void tcg_out_qemu_st_direct(TCGContext *s, TCGReg lo, TCGReg hi, - TCGReg base, MemOp opc) -{ - switch (opc & MO_SIZE) { - case MO_8: - tcg_out_opc_imm(s, OPC_SB, lo, base, 0); - break; - case MO_16: - tcg_out_opc_imm(s, OPC_SH, lo, base, 0); - break; - case MO_32: - tcg_out_opc_imm(s, OPC_SW, lo, base, 0); - break; - case MO_64: - tcg_out_opc_imm(s, OPC_SD, lo, base, 0); - break; - default: - g_assert_not_reached(); - } -} - -static void tcg_out_qemu_st_unalign(TCGContext *s, TCGReg lo, TCGReg hi, - TCGReg base, MemOp opc) -{ - const MIPSInsn sw1 =3D HOST_BIG_ENDIAN ? OPC_SWL : OPC_SWR; - const MIPSInsn sw2 =3D HOST_BIG_ENDIAN ? OPC_SWR : OPC_SWL; - const MIPSInsn sd1 =3D HOST_BIG_ENDIAN ? OPC_SDL : OPC_SDR; - const MIPSInsn sd2 =3D HOST_BIG_ENDIAN ? OPC_SDR : OPC_SDL; - - switch (opc & MO_SIZE) { - case MO_16: - tcg_out_opc_sa(s, OPC_SRL, TCG_TMP0, lo, 8); - tcg_out_opc_imm(s, OPC_SB, HOST_BIG_ENDIAN ? TCG_TMP0 : lo, base, = 0); - tcg_out_opc_imm(s, OPC_SB, HOST_BIG_ENDIAN ? lo : TCG_TMP0, base, = 1); - break; - - case MO_32: - tcg_out_opc_imm(s, sw1, lo, base, 0); - tcg_out_opc_imm(s, sw2, lo, base, 3); - break; - - case MO_64: - tcg_out_opc_imm(s, sd1, lo, base, 0); - tcg_out_opc_imm(s, sd2, lo, base, 7); - break; - - default: - g_assert_not_reached(); - } -} - -static void tgen_qemu_st(TCGContext *s, TCGType type, TCGReg data, - TCGReg addr, MemOpIdx oi) -{ - MemOp opc =3D get_memop(oi); - TCGLabelQemuLdst *ldst; - HostAddress h; - - 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, data, 0, h.base, opc); - } else { - tcg_out_qemu_st_unalign(s, data, 0, h.base, opc); - } - - if (ldst) { - ldst->type =3D type; - ldst->datalo_reg =3D data; - ldst->datahi_reg =3D 0; - ldst->raddr =3D tcg_splitwx_to_rx(s->code_ptr); - } -} - -static const TCGOutOpQemuLdSt outop_qemu_st =3D { - .base.static_constraint =3D C_O0_I2(rz, r), - .out =3D tgen_qemu_st, -}; - -static const TCGOutOpQemuLdSt2 outop_qemu_st2 =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static void tcg_out_mb(TCGContext *s, unsigned a0) -{ - static const MIPSInsn sync[] =3D { - /* Note that SYNC_MB is a slightly weaker than SYNC 0, - as the former is an ordering barrier and the latter - is a completion barrier. */ - [0 ... TCG_MO_ALL] =3D OPC_SYNC_MB, - [TCG_MO_LD_LD] =3D OPC_SYNC_RMB, - [TCG_MO_ST_ST] =3D OPC_SYNC_WMB, - [TCG_MO_LD_ST] =3D OPC_SYNC_RELEASE, - [TCG_MO_LD_ST | TCG_MO_ST_ST] =3D OPC_SYNC_RELEASE, - [TCG_MO_LD_ST | TCG_MO_LD_LD] =3D OPC_SYNC_ACQUIRE, - }; - tcg_out32(s, sync[a0 & TCG_MO_ALL]); -} - -static void tcg_out_exit_tb(TCGContext *s, uintptr_t a0) -{ - TCGReg base =3D TCG_REG_ZERO; - int16_t lo =3D 0; - - if (a0) { - intptr_t 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, OPC_DADDU, base, base, TCG_REG_TB); - } - } - if (!tcg_out_opc_jmp(s, OPC_J, tb_ret_addr)) { - tcg_out_movi(s, TCG_TYPE_PTR, TCG_TMP0, (uintptr_t)tb_ret_addr); - tcg_out_opc_reg(s, OPC_JR, 0, TCG_TMP0, 0); - } - /* delay slot */ - tcg_out_opc_imm(s, OPC_DADDIU, TCG_REG_V0, base, lo); -} - -static void tcg_out_goto_tb(TCGContext *s, int which) -{ - intptr_t ofs =3D get_jmp_target_addr(s, which); - TCGReg base, dest; - - /* indirect jump method */ - 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); - - set_jmp_reset_offset(s, which); - /* For the unlinked case, need to reset TCG_REG_TB. */ - tcg_out_ldst(s, OPC_DADDIU, TCG_REG_TB, TCG_REG_TB, - -tcg_current_code_size(s)); -} - -static void tcg_out_goto_ptr(TCGContext *s, TCGReg a0) -{ - tcg_out_opc_reg(s, OPC_JR, 0, a0, 0); - tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_TB, a0); -} - -void tb_target_set_jmp_target(const TranslationBlock *tb, int n, - uintptr_t jmp_rx, uintptr_t jmp_rw) -{ - /* Always indirect, nothing to do */ -} - - -static void tgen_add(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_ADDU : OPC_DADDU; - tcg_out_opc_reg(s, insn, a0, a1, a2); -} - -static void tgen_addi(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, tcg_target_long a2) -{ - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_ADDIU : OPC_DADDIU; - tcg_out_opc_imm(s, insn, a0, a1, a2); -} - -static const TCGOutOpBinary outop_add =3D { - .base.static_constraint =3D C_O1_I2(r, r, rJ), - .out_rrr =3D tgen_add, - .out_rri =3D tgen_addi, -}; - -static const TCGOutOpBinary outop_addco =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static const TCGOutOpAddSubCarry outop_addci =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static const TCGOutOpBinary outop_addcio =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static void tcg_out_set_carry(TCGContext *s) -{ - g_assert_not_reached(); -} - -static void tgen_and(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - tcg_out_opc_reg(s, OPC_AND, a0, a1, a2); -} - -static void tgen_andi(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, tcg_target_long a2) -{ - int msb; - - if (a2 =3D=3D (uint16_t)a2) { - tcg_out_opc_imm(s, OPC_ANDI, a0, a1, a2); - return; - } - - tcg_debug_assert(use_mips32r2_instructions); - tcg_debug_assert(is_p2m1(a2)); - msb =3D ctz64(~a2) - 1; - if (type =3D=3D TCG_TYPE_I32) { - tcg_out_opc_bf(s, OPC_EXT, a0, a1, msb, 0); - } else { - tcg_out_opc_bf64(s, OPC_DEXT, OPC_DEXTM, OPC_DEXTU, a0, a1, msb, 0= ); - } -} - -static const TCGOutOpBinary outop_and =3D { - .base.static_constraint =3D C_O1_I2(r, r, rIK), - .out_rrr =3D tgen_and, - .out_rri =3D tgen_andi, -}; - -static const TCGOutOpBinary outop_andc =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static void tgen_clz(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - if (use_mips32r6_instructions) { - MIPSInsn opcv6 =3D type =3D=3D TCG_TYPE_I32 ? OPC_CLZ_R6 : OPC_DCL= Z_R6; - tcg_out_opc_reg(s, opcv6, TCG_TMP0, a1, 0); - tgen_movcond(s, TCG_TYPE_REG, TCG_COND_EQ, a0, a1, a2, false, - TCG_TMP0, false, TCG_REG_ZERO, false); - } else { - MIPSInsn opcv2 =3D type =3D=3D TCG_TYPE_I32 ? OPC_CLZ : OPC_DCLZ; - if (a0 =3D=3D a2) { - tcg_out_opc_reg(s, opcv2, TCG_TMP0, a1, a1); - tcg_out_opc_reg(s, OPC_MOVN, a0, TCG_TMP0, a1); - } else if (a0 !=3D a1) { - tcg_out_opc_reg(s, opcv2, a0, a1, a1); - tcg_out_opc_reg(s, OPC_MOVZ, a0, a2, a1); - } else { - tcg_out_opc_reg(s, opcv2, TCG_TMP0, a1, a1); - tcg_out_opc_reg(s, OPC_MOVZ, TCG_TMP0, a2, a1); - tcg_out_mov(s, type, a0, TCG_TMP0); - } - } -} - -static void tgen_clzi(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, tcg_target_long a2) -{ - if (a2 =3D=3D 0) { - tgen_clz(s, type, a0, a1, TCG_REG_ZERO); - } else if (use_mips32r6_instructions) { - MIPSInsn opcv6 =3D type =3D=3D TCG_TYPE_I32 ? OPC_CLZ_R6 : OPC_DCL= Z_R6; - tcg_out_opc_reg(s, opcv6, a0, a1, 0); - } else { - MIPSInsn opcv2 =3D type =3D=3D TCG_TYPE_I32 ? OPC_CLZ : OPC_DCLZ; - tcg_out_opc_reg(s, opcv2, a0, a1, a1); - } -} - -static TCGConstraintSetIndex cset_clz(TCGType type, unsigned flags) -{ - return use_mips32r2_instructions ? C_O1_I2(r, r, rzW) : C_NotImplement= ed; -} - -static const TCGOutOpBinary outop_clz =3D { - .base.static_constraint =3D C_Dynamic, - .base.dynamic_constraint =3D cset_clz, - .out_rrr =3D tgen_clz, - .out_rri =3D tgen_clzi, -}; - -static const TCGOutOpUnary outop_ctpop =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static const TCGOutOpBinary outop_ctz =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static void tgen_divs(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - if (use_mips32r6_instructions) { - if (type =3D=3D TCG_TYPE_I32) { - tcg_out_opc_reg(s, OPC_DIV_R6, a0, a1, a2); - } else { - tcg_out_opc_reg(s, OPC_DDIV_R6, a0, a1, a2); - } - } else { - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_DIV : OPC_DDIV; - tcg_out_opc_reg(s, insn, 0, a1, a2); - tcg_out_opc_reg(s, OPC_MFLO, a0, 0, 0); - } -} - -static const TCGOutOpBinary outop_divs =3D { - .base.static_constraint =3D C_O1_I2(r, r, r), - .out_rrr =3D tgen_divs, -}; - -static const TCGOutOpDivRem outop_divs2 =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static void tgen_divu(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - if (use_mips32r6_instructions) { - if (type =3D=3D TCG_TYPE_I32) { - tcg_out_opc_reg(s, OPC_DIVU_R6, a0, a1, a2); - } else { - tcg_out_opc_reg(s, OPC_DDIVU_R6, a0, a1, a2); - } - } else { - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_DIVU : OPC_DDIVU; - tcg_out_opc_reg(s, insn, 0, a1, a2); - tcg_out_opc_reg(s, OPC_MFLO, a0, 0, 0); - } -} - -static const TCGOutOpBinary outop_divu =3D { - .base.static_constraint =3D C_O1_I2(r, r, r), - .out_rrr =3D tgen_divu, -}; - -static const TCGOutOpDivRem outop_divu2 =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static const TCGOutOpBinary outop_eqv =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static void tgen_extrh_i64_i32(TCGContext *s, TCGType t, TCGReg a0, TCGReg= a1) -{ - tcg_out_dsra(s, a0, a1, 32); -} - -static const TCGOutOpUnary outop_extrh_i64_i32 =3D { - .base.static_constraint =3D C_O1_I1(r, r), - .out_rr =3D tgen_extrh_i64_i32, -}; - -static void tgen_mul(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - MIPSInsn insn; - - if (type =3D=3D TCG_TYPE_I32) { - if (use_mips32_instructions) { - tcg_out_opc_reg(s, OPC_MUL, a0, a1, a2); - return; - } - insn =3D OPC_MULT; - } else { - if (use_mips32r6_instructions) { - tcg_out_opc_reg(s, OPC_DMUL, a0, a1, a2); - return; - } - insn =3D OPC_DMULT; - } - tcg_out_opc_reg(s, insn, 0, a1, a2); - tcg_out_opc_reg(s, OPC_MFLO, a0, 0, 0); -} - -static const TCGOutOpBinary outop_mul =3D { - .base.static_constraint =3D C_O1_I2(r, r, r), - .out_rrr =3D tgen_mul, -}; - -static void tgen_muls2(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2, TCGReg a3) -{ - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_MULT : OPC_DMULT; - tcg_out_opc_reg(s, insn, 0, a2, a3); - tcg_out_opc_reg(s, OPC_MFLO, a0, 0, 0); - tcg_out_opc_reg(s, OPC_MFHI, a1, 0, 0); -} - -static TCGConstraintSetIndex cset_mul2(TCGType type, unsigned flags) -{ - return use_mips32r6_instructions ? C_NotImplemented : C_O2_I2(r, r, r,= r); -} - -static const TCGOutOpMul2 outop_muls2 =3D { - .base.static_constraint =3D C_Dynamic, - .base.dynamic_constraint =3D cset_mul2, - .out_rrrr =3D tgen_muls2, -}; - -static void tgen_mulsh(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - if (use_mips32r6_instructions) { - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_MUH : OPC_DMUH; - tcg_out_opc_reg(s, insn, a0, a1, a2); - } else { - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_MULT : OPC_DMULT; - tcg_out_opc_reg(s, insn, 0, a1, a2); - tcg_out_opc_reg(s, OPC_MFHI, a0, 0, 0); - } -} - -static const TCGOutOpBinary outop_mulsh =3D { - .base.static_constraint =3D C_O1_I2(r, r, r), - .out_rrr =3D tgen_mulsh, -}; - -static void tgen_mulu2(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2, TCGReg a3) -{ - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_MULTU : OPC_DMULTU; - tcg_out_opc_reg(s, insn, 0, a2, a3); - tcg_out_opc_reg(s, OPC_MFLO, a0, 0, 0); - tcg_out_opc_reg(s, OPC_MFHI, a1, 0, 0); -} - -static const TCGOutOpMul2 outop_mulu2 =3D { - .base.static_constraint =3D C_Dynamic, - .base.dynamic_constraint =3D cset_mul2, - .out_rrrr =3D tgen_mulu2, -}; - -static void tgen_muluh(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - if (use_mips32r6_instructions) { - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_MUHU : OPC_DMUHU; - tcg_out_opc_reg(s, insn, a0, a1, a2); - } else { - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_MULTU : OPC_DMULT= U; - tcg_out_opc_reg(s, insn, 0, a1, a2); - tcg_out_opc_reg(s, OPC_MFHI, a0, 0, 0); - } -} - -static const TCGOutOpBinary outop_muluh =3D { - .base.static_constraint =3D C_O1_I2(r, r, r), - .out_rrr =3D tgen_muluh, -}; - -static const TCGOutOpBinary outop_nand =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static void tgen_nor(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - tcg_out_opc_reg(s, OPC_NOR, a0, a1, a2); -} - -static const TCGOutOpBinary outop_nor =3D { - .base.static_constraint =3D C_O1_I2(r, r, r), - .out_rrr =3D tgen_nor, -}; - -static void tgen_or(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - tcg_out_opc_reg(s, OPC_OR, a0, a1, a2); -} - -static void tgen_ori(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, tcg_target_long a2) -{ - tcg_out_opc_imm(s, OPC_ORI, a0, a1, a2); -} - -static const TCGOutOpBinary outop_or =3D { - .base.static_constraint =3D C_O1_I2(r, r, rI), - .out_rrr =3D tgen_or, - .out_rri =3D tgen_ori, -}; - -static const TCGOutOpBinary outop_orc =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static void tgen_rems(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - if (use_mips32r6_instructions) { - if (type =3D=3D TCG_TYPE_I32) { - tcg_out_opc_reg(s, OPC_MOD, a0, a1, a2); - } else { - tcg_out_opc_reg(s, OPC_DMOD, a0, a1, a2); - } - } else { - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_DIV : OPC_DDIV; - tcg_out_opc_reg(s, insn, 0, a1, a2); - tcg_out_opc_reg(s, OPC_MFHI, a0, 0, 0); - } -} - -static const TCGOutOpBinary outop_rems =3D { - .base.static_constraint =3D C_O1_I2(r, r, r), - .out_rrr =3D tgen_rems, -}; - -static void tgen_remu(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - if (use_mips32r6_instructions) { - if (type =3D=3D TCG_TYPE_I32) { - tcg_out_opc_reg(s, OPC_MODU, a0, a1, a2); - } else { - tcg_out_opc_reg(s, OPC_DMODU, a0, a1, a2); - } - } else { - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_DIVU : OPC_DDIVU; - tcg_out_opc_reg(s, insn, 0, a1, a2); - tcg_out_opc_reg(s, OPC_MFHI, a0, 0, 0); - } -} - -static const TCGOutOpBinary outop_remu =3D { - .base.static_constraint =3D C_O1_I2(r, r, r), - .out_rrr =3D tgen_remu, -}; - -static const TCGOutOpBinary outop_rotl =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static TCGConstraintSetIndex cset_rotr(TCGType type, unsigned flags) -{ - return use_mips32r2_instructions ? C_O1_I2(r, r, ri) : C_NotImplemente= d; -} - -static void tgen_rotr(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_ROTRV : OPC_DROTRV; - tcg_out_opc_reg(s, insn, a0, a1, a2); -} - -static void tgen_rotri(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, tcg_target_long a2) -{ - if (type =3D=3D TCG_TYPE_I32) { - tcg_out_opc_sa(s, OPC_ROTR, a0, a1, a2); - } else { - tcg_out_opc_sa64(s, OPC_DROTR, OPC_DROTR32, a0, a1, a2); - } -} - -static const TCGOutOpBinary outop_rotr =3D { - .base.static_constraint =3D C_Dynamic, - .base.dynamic_constraint =3D cset_rotr, - .out_rrr =3D tgen_rotr, - .out_rri =3D tgen_rotri, -}; - -static void tgen_sar(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_SRAV : OPC_DSRAV; - tcg_out_opc_reg(s, insn, a0, a1, a2); -} - -static void tgen_sari(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, tcg_target_long a2) -{ - if (type =3D=3D TCG_TYPE_I32) { - tcg_out_opc_sa(s, OPC_SRA, a0, a1, a2); - } else { - tcg_out_dsra(s, a0, a1, a2); - } -} - -static const TCGOutOpBinary outop_sar =3D { - .base.static_constraint =3D C_O1_I2(r, r, ri), - .out_rrr =3D tgen_sar, - .out_rri =3D tgen_sari, -}; - -static void tgen_shl(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_SLLV : OPC_DSLLV; - tcg_out_opc_reg(s, insn, a0, a1, a2); -} - -static void tgen_shli(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, tcg_target_long a2) -{ - if (type =3D=3D TCG_TYPE_I32) { - tcg_out_opc_sa(s, OPC_SLL, a0, a1, a2); - } else { - tcg_out_dsll(s, a0, a1, a2); - } -} - -static const TCGOutOpBinary outop_shl =3D { - .base.static_constraint =3D C_O1_I2(r, r, ri), - .out_rrr =3D tgen_shl, - .out_rri =3D tgen_shli, -}; - -static void tgen_shr(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_SRLV : OPC_DSRLV; - tcg_out_opc_reg(s, insn, a0, a1, a2); -} - -static void tgen_shri(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, tcg_target_long a2) -{ - if (type =3D=3D TCG_TYPE_I32) { - tcg_out_opc_sa(s, OPC_SRL, a0, a1, a2); - } else { - tcg_out_dsrl(s, a0, a1, a2); - } -} - -static const TCGOutOpBinary outop_shr =3D { - .base.static_constraint =3D C_O1_I2(r, r, ri), - .out_rrr =3D tgen_shr, - .out_rri =3D tgen_shri, -}; - -static void tgen_sub(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_SUBU : OPC_DSUBU; - tcg_out_opc_reg(s, insn, a0, a1, a2); -} - -static const TCGOutOpSubtract outop_sub =3D { - .base.static_constraint =3D C_O1_I2(r, r, r), - .out_rrr =3D tgen_sub, -}; - -static const TCGOutOpAddSubCarry outop_subbo =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static const TCGOutOpAddSubCarry outop_subbi =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static const TCGOutOpAddSubCarry outop_subbio =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static void tcg_out_set_borrow(TCGContext *s) -{ - g_assert_not_reached(); -} - -static void tgen_xor(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, TCGReg a2) -{ - tcg_out_opc_reg(s, OPC_XOR, a0, a1, a2); -} - -static void tgen_xori(TCGContext *s, TCGType type, - TCGReg a0, TCGReg a1, tcg_target_long a2) -{ - tcg_out_opc_imm(s, OPC_XORI, a0, a1, a2); -} - -static const TCGOutOpBinary outop_xor =3D { - .base.static_constraint =3D C_O1_I2(r, r, rI), - .out_rrr =3D tgen_xor, - .out_rri =3D tgen_xori, -}; - -static void tgen_bswap16(TCGContext *s, TCGType type, - TCGReg ret, TCGReg arg, unsigned flags) -{ - /* With arg =3D abcd: */ - if (use_mips32r2_instructions) { - tcg_out_opc_reg(s, OPC_WSBH, ret, 0, arg); /* badc= */ - if (flags & TCG_BSWAP_OS) { - tcg_out_opc_reg(s, OPC_SEH, ret, 0, ret); /* ssdc= */ - } else if ((flags & (TCG_BSWAP_IZ | TCG_BSWAP_OZ)) =3D=3D TCG_BSWA= P_OZ) { - tcg_out_opc_imm(s, OPC_ANDI, ret, ret, 0xffff); /* 00dc= */ - } - return; - } - - tcg_out_opc_sa(s, OPC_SRL, TCG_TMP0, arg, 8); /* 0abc= */ - if (!(flags & TCG_BSWAP_IZ)) { - tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP0, TCG_TMP0, 0x00ff); /* 000c= */ - } - if (flags & TCG_BSWAP_OS) { - tcg_out_opc_sa(s, OPC_SLL, ret, arg, 24); /* d000= */ - tcg_out_opc_sa(s, OPC_SRA, ret, ret, 16); /* ssd0= */ - } else { - tcg_out_opc_sa(s, OPC_SLL, ret, arg, 8); /* bcd0= */ - if (flags & TCG_BSWAP_OZ) { - tcg_out_opc_imm(s, OPC_ANDI, ret, ret, 0xff00); /* 00d0= */ - } - } - tcg_out_opc_reg(s, OPC_OR, ret, ret, TCG_TMP0); /* ssdc= */ -} - -static const TCGOutOpBswap outop_bswap16 =3D { - .base.static_constraint =3D C_O1_I1(r, r), - .out_rr =3D tgen_bswap16, -}; - -static void tgen_bswap32(TCGContext *s, TCGType type, - TCGReg ret, TCGReg arg, unsigned flags) -{ - if (use_mips32r2_instructions) { - tcg_out_opc_reg(s, OPC_WSBH, ret, 0, arg); - tcg_out_opc_sa(s, OPC_ROTR, ret, ret, 16); - if (flags & TCG_BSWAP_OZ) { - tcg_out_opc_bf(s, OPC_DEXT, ret, ret, 31, 0); - } - } else { - if (flags & TCG_BSWAP_OZ) { - tcg_out_bswap_subr(s, bswap32u_addr); - } else { - tcg_out_bswap_subr(s, bswap32_addr); - } - /* delay slot -- never omit the insn, like tcg_out_mov might. */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP0, arg, TCG_REG_ZERO); - tcg_out_mov(s, TCG_TYPE_I32, ret, TCG_TMP3); - } -} - -static const TCGOutOpBswap outop_bswap32 =3D { - .base.static_constraint =3D C_O1_I1(r, r), - .out_rr =3D tgen_bswap32, -}; - -static void tgen_bswap64(TCGContext *s, TCGType type, TCGReg ret, TCGReg a= rg) -{ - if (use_mips32r2_instructions) { - tcg_out_opc_reg(s, OPC_DSBH, ret, 0, arg); - tcg_out_opc_reg(s, OPC_DSHD, ret, 0, ret); - } else { - tcg_out_bswap_subr(s, bswap64_addr); - /* delay slot -- never omit the insn, like tcg_out_mov might. */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP0, arg, TCG_REG_ZERO); - tcg_out_mov(s, TCG_TYPE_I32, ret, TCG_TMP3); - } -} - -static const TCGOutOpUnary outop_bswap64 =3D { - .base.static_constraint =3D C_O1_I1(r, r), - .out_rr =3D tgen_bswap64, -}; - -static void tgen_neg(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1) -{ - tgen_sub(s, type, a0, TCG_REG_ZERO, a1); -} - -static const TCGOutOpUnary outop_neg =3D { - .base.static_constraint =3D C_O1_I1(r, r), - .out_rr =3D tgen_neg, -}; - -static void tgen_not(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1) -{ - tgen_nor(s, type, a0, TCG_REG_ZERO, a1); -} - -static const TCGOutOpUnary outop_not =3D { - .base.static_constraint =3D C_O1_I1(r, r), - .out_rr =3D tgen_not, -}; - -static void tgen_deposit(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1, - TCGReg a2, unsigned ofs, unsigned len) -{ - if (type =3D=3D TCG_TYPE_I32) { - tcg_out_opc_bf(s, OPC_INS, a0, a2, ofs + len - 1, ofs); - } else { - tcg_out_opc_bf64(s, OPC_DINS, OPC_DINSM, OPC_DINSU, a0, a2, - ofs + len - 1, ofs); - } -} - -static const TCGOutOpDeposit outop_deposit =3D { - .base.static_constraint =3D C_O1_I2(r, 0, rz), - .out_rrr =3D tgen_deposit, -}; - -static void tgen_extract(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1, - unsigned ofs, unsigned len) -{ - if (ofs =3D=3D 0 && len <=3D 16) { - tcg_out_opc_imm(s, OPC_ANDI, a0, a1, (1 << len) - 1); - } else if (type =3D=3D TCG_TYPE_I32) { - tcg_out_opc_bf(s, OPC_EXT, a0, a1, len - 1, ofs); - } else { - tcg_out_opc_bf64(s, OPC_DEXT, OPC_DEXTM, OPC_DEXTU, - a0, a1, len - 1, ofs); - } -} - -static const TCGOutOpExtract outop_extract =3D { - .base.static_constraint =3D C_O1_I1(r, r), - .out_rr =3D tgen_extract, -}; - -static void tgen_sextract(TCGContext *s, TCGType type, TCGReg a0, TCGReg a= 1, - unsigned ofs, unsigned len) -{ - if (ofs =3D=3D 0) { - switch (len) { - case 8: - tcg_out_ext8s(s, type, a0, a1); - return; - case 16: - tcg_out_ext16s(s, type, a0, a1); - return; - case 32: - tcg_out_ext32s(s, a0, a1); - return; - } - } - g_assert_not_reached(); -} - -static const TCGOutOpExtract outop_sextract =3D { - .base.static_constraint =3D C_O1_I1(r, r), - .out_rr =3D tgen_sextract, -}; - -static const TCGOutOpExtract2 outop_extract2 =3D { - .base.static_constraint =3D C_NotImplemented, -}; - -static void tgen_ld8u(TCGContext *s, TCGType type, TCGReg dest, - TCGReg base, ptrdiff_t offset) -{ - tcg_out_ldst(s, OPC_LBU, dest, base, offset); -} - -static const TCGOutOpLoad outop_ld8u =3D { - .base.static_constraint =3D C_O1_I1(r, r), - .out =3D tgen_ld8u, -}; - -static void tgen_ld8s(TCGContext *s, TCGType type, TCGReg dest, - TCGReg base, ptrdiff_t offset) -{ - tcg_out_ldst(s, OPC_LB, dest, base, offset); -} - -static const TCGOutOpLoad outop_ld8s =3D { - .base.static_constraint =3D C_O1_I1(r, r), - .out =3D tgen_ld8s, -}; - -static void tgen_ld16u(TCGContext *s, TCGType type, TCGReg dest, - TCGReg base, ptrdiff_t offset) -{ - tcg_out_ldst(s, OPC_LHU, dest, base, offset); -} - -static const TCGOutOpLoad outop_ld16u =3D { - .base.static_constraint =3D C_O1_I1(r, r), - .out =3D tgen_ld16u, -}; - -static void tgen_ld16s(TCGContext *s, TCGType type, TCGReg dest, - TCGReg base, ptrdiff_t offset) -{ - tcg_out_ldst(s, OPC_LH, dest, base, offset); -} - -static const TCGOutOpLoad outop_ld16s =3D { - .base.static_constraint =3D C_O1_I1(r, r), - .out =3D tgen_ld16s, -}; - -static void tgen_ld32u(TCGContext *s, TCGType type, TCGReg dest, - TCGReg base, ptrdiff_t offset) -{ - tcg_out_ldst(s, OPC_LWU, dest, base, offset); -} - -static const TCGOutOpLoad outop_ld32u =3D { - .base.static_constraint =3D C_O1_I1(r, r), - .out =3D tgen_ld32u, -}; - -static void tgen_ld32s(TCGContext *s, TCGType type, TCGReg dest, - TCGReg base, ptrdiff_t offset) -{ - tcg_out_ldst(s, OPC_LW, dest, base, offset); -} - -static const TCGOutOpLoad outop_ld32s =3D { - .base.static_constraint =3D C_O1_I1(r, r), - .out =3D tgen_ld32s, -}; - -static void tgen_st8_r(TCGContext *s, TCGType type, TCGReg data, - TCGReg base, ptrdiff_t offset) -{ - tcg_out_ldst(s, OPC_SB, data, base, offset); -} - -static const TCGOutOpStore outop_st8 =3D { - .base.static_constraint =3D C_O0_I2(rz, r), - .out_r =3D tgen_st8_r, -}; - -static void tgen_st16_r(TCGContext *s, TCGType type, TCGReg data, - TCGReg base, ptrdiff_t offset) -{ - tcg_out_ldst(s, OPC_SH, data, base, offset); -} - -static const TCGOutOpStore outop_st16 =3D { - .base.static_constraint =3D C_O0_I2(rz, r), - .out_r =3D tgen_st16_r, -}; - -static const TCGOutOpStore outop_st =3D { - .base.static_constraint =3D C_O0_I2(rz, r), - .out_r =3D tcg_out_st, -}; - - -static TCGConstraintSetIndex -tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags) -{ - return C_NotImplemented; -} - -static const int tcg_target_callee_save_regs[] =3D { - TCG_REG_S0, - TCG_REG_S1, - TCG_REG_S2, - TCG_REG_S3, - TCG_REG_S4, - TCG_REG_S5, - TCG_REG_S6, /* used for the tb base (TCG_REG_TB) */ - TCG_REG_S7, /* used for guest_base */ - TCG_REG_S8, /* used for the global env (TCG_AREG0) */ - TCG_REG_RA, /* should be last for ABI compliance */ -}; - -/* The Linux kernel doesn't provide any information about the available - instruction set. Probe it using a signal handler. */ - - -#ifndef use_movnz_instructions -bool use_movnz_instructions =3D false; -#endif - -#ifndef use_mips32_instructions -bool use_mips32_instructions =3D false; -#endif - -#ifndef use_mips32r2_instructions -bool use_mips32r2_instructions =3D false; -#endif - -static volatile sig_atomic_t got_sigill; - -static void sigill_handler(int signo, siginfo_t *si, void *data) -{ - /* Skip the faulty instruction */ - ucontext_t *uc =3D (ucontext_t *)data; - uc->uc_mcontext.pc +=3D 4; - - got_sigill =3D 1; -} - -static void tcg_target_detect_isa(void) -{ - struct sigaction sa_old, sa_new; - - memset(&sa_new, 0, sizeof(sa_new)); - sa_new.sa_flags =3D SA_SIGINFO; - sa_new.sa_sigaction =3D sigill_handler; - sigaction(SIGILL, &sa_new, &sa_old); - - /* Probe for movn/movz, necessary to implement movcond. */ -#ifndef use_movnz_instructions - got_sigill =3D 0; - asm volatile(".set push\n" - ".set mips32\n" - "movn $zero, $zero, $zero\n" - "movz $zero, $zero, $zero\n" - ".set pop\n" - : : : ); - use_movnz_instructions =3D !got_sigill; -#endif - - /* Probe for MIPS32 instructions. As no subsetting is allowed - by the specification, it is only necessary to probe for one - of the instructions. */ -#ifndef use_mips32_instructions - got_sigill =3D 0; - asm volatile(".set push\n" - ".set mips32\n" - "mul $zero, $zero\n" - ".set pop\n" - : : : ); - use_mips32_instructions =3D !got_sigill; -#endif - - /* Probe for MIPS32r2 instructions if MIPS32 instructions are - available. As no subsetting is allowed by the specification, - it is only necessary to probe for one of the instructions. */ -#ifndef use_mips32r2_instructions - if (use_mips32_instructions) { - got_sigill =3D 0; - asm volatile(".set push\n" - ".set mips32r2\n" - "seb $zero, $zero\n" - ".set pop\n" - : : : ); - use_mips32r2_instructions =3D !got_sigill; - } -#endif - - sigaction(SIGILL, &sa_old, NULL); -} - -static tcg_insn_unit *align_code_ptr(TCGContext *s) -{ - uintptr_t p =3D (uintptr_t)s->code_ptr; - if (p & 15) { - p =3D (p + 15) & -16; - s->code_ptr =3D (void *)p; - } - return s->code_ptr; -} - -/* Stack frame parameters. */ -#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)) - -#define FRAME_SIZE ((TCG_STATIC_CALL_ARGS_SIZE + TEMP_SIZE + SAVE_SIZE \ - + TCG_TARGET_STACK_ALIGN - 1) \ - & -TCG_TARGET_STACK_ALIGN) -#define SAVE_OFS (TCG_STATIC_CALL_ARGS_SIZE + TEMP_SIZE) - -/* We're expecting to be able to use an immediate for frame allocation. */ -QEMU_BUILD_BUG_ON(FRAME_SIZE > 0x7fff); - -/* Generate global QEMU prologue and epilogue code */ -static void tcg_target_qemu_prologue(TCGContext *s) -{ - int i; - - tcg_set_frame(s, TCG_REG_SP, TCG_STATIC_CALL_ARGS_SIZE, TEMP_SIZE); - - /* TB prologue */ - 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); - } - - if (!tcg_use_softmmu && guest_base !=3D (int16_t)guest_base) { - /* - * The function call abi for n32 and n64 will have loaded $25 (t9) - * with the address of the prologue, so we can use that instead - * of TCG_REG_TB. - */ -#if !defined(__mips_abicalls) -# error "Unknown mips abi" -#endif - tcg_out_movi_int(s, TCG_TYPE_PTR, TCG_GUEST_BASE_REG, guest_base, - TCG_REG_T9); - tcg_regset_set_reg(s->reserved_regs, TCG_GUEST_BASE_REG); - } - - tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_TB, tcg_target_call_iarg_regs[1]); - - /* Call generated code */ - tcg_out_opc_reg(s, OPC_JR, 0, tcg_target_call_iarg_regs[1], 0); - /* delay slot */ - tcg_out_mov(s, TCG_TYPE_PTR, TCG_AREG0, tcg_target_call_iarg_regs[0]); - - /* - * Return path for goto_ptr. Set return value to 0, a-la exit_tb, - * and fall through to the rest of the epilogue. - */ - tcg_code_gen_epilogue =3D tcg_splitwx_to_rx(s->code_ptr); - tcg_out_mov(s, TCG_TYPE_REG, TCG_REG_V0, TCG_REG_ZERO); - - /* TB epilogue */ - tb_ret_addr =3D tcg_splitwx_to_rx(s->code_ptr); - for (i =3D 0; i < ARRAY_SIZE(tcg_target_callee_save_regs); i++) { - tcg_out_ld(s, TCG_TYPE_REG, tcg_target_callee_save_regs[i], - TCG_REG_SP, SAVE_OFS + i * REG_SIZE); - } - - tcg_out_opc_reg(s, OPC_JR, 0, TCG_REG_RA, 0); - /* delay slot */ - tcg_out_opc_imm(s, OPC_DADDIU, TCG_REG_SP, TCG_REG_SP, FRAME_SIZE); - - if (use_mips32r2_instructions) { - return; - } - - /* Bswap subroutines: Input in TCG_TMP0, output in TCG_TMP3; - clobbers TCG_TMP1, TCG_TMP2. */ - - /* - * bswap32 -- 32-bit swap (signed result for mips64). a0 =3D abcd. - */ - bswap32_addr =3D tcg_splitwx_to_rx(align_code_ptr(s)); - /* t3 =3D (ssss)d000 */ - tcg_out_opc_sa(s, OPC_SLL, TCG_TMP3, TCG_TMP0, 24); - /* t1 =3D 000a */ - tcg_out_opc_sa(s, OPC_SRL, TCG_TMP1, TCG_TMP0, 24); - /* t2 =3D 00c0 */ - tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP2, TCG_TMP0, 0xff00); - /* t3 =3D d00a */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP3, TCG_TMP3, TCG_TMP1); - /* t1 =3D 0abc */ - tcg_out_opc_sa(s, OPC_SRL, TCG_TMP1, TCG_TMP0, 8); - /* t2 =3D 0c00 */ - tcg_out_opc_sa(s, OPC_SLL, TCG_TMP2, TCG_TMP2, 8); - /* t1 =3D 00b0 */ - tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP1, TCG_TMP1, 0xff00); - /* t3 =3D dc0a */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP3, TCG_TMP3, TCG_TMP2); - tcg_out_opc_reg(s, OPC_JR, 0, TCG_REG_RA, 0); - /* t3 =3D dcba -- delay slot */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP3, TCG_TMP3, TCG_TMP1); - - /* - * bswap32u -- unsigned 32-bit swap. a0 =3D ....abcd. - */ - bswap32u_addr =3D tcg_splitwx_to_rx(align_code_ptr(s)); - /* t1 =3D (0000)000d */ - tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP1, TCG_TMP0, 0xff); - /* t3 =3D 000a */ - tcg_out_opc_sa(s, OPC_SRL, TCG_TMP3, TCG_TMP0, 24); - /* t1 =3D (0000)d000 */ - tcg_out_dsll(s, TCG_TMP1, TCG_TMP1, 24); - /* t2 =3D 00c0 */ - tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP2, TCG_TMP0, 0xff00); - /* t3 =3D d00a */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP3, TCG_TMP3, TCG_TMP1); - /* t1 =3D 0abc */ - tcg_out_opc_sa(s, OPC_SRL, TCG_TMP1, TCG_TMP0, 8); - /* t2 =3D 0c00 */ - tcg_out_opc_sa(s, OPC_SLL, TCG_TMP2, TCG_TMP2, 8); - /* t1 =3D 00b0 */ - tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP1, TCG_TMP1, 0xff00); - /* t3 =3D dc0a */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP3, TCG_TMP3, TCG_TMP2); - tcg_out_opc_reg(s, OPC_JR, 0, TCG_REG_RA, 0); - /* t3 =3D dcba -- delay slot */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP3, TCG_TMP3, TCG_TMP1); - - /* - * bswap64 -- 64-bit swap. a0 =3D abcdefgh - */ - bswap64_addr =3D tcg_splitwx_to_rx(align_code_ptr(s)); - /* t3 =3D h0000000 */ - tcg_out_dsll(s, TCG_TMP3, TCG_TMP0, 56); - /* t1 =3D 0000000a */ - tcg_out_dsrl(s, TCG_TMP1, TCG_TMP0, 56); - - /* t2 =3D 000000g0 */ - tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP2, TCG_TMP0, 0xff00); - /* t3 =3D h000000a */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP3, TCG_TMP3, TCG_TMP1); - /* t1 =3D 00000abc */ - tcg_out_dsrl(s, TCG_TMP1, TCG_TMP0, 40); - /* t2 =3D 0g000000 */ - tcg_out_dsll(s, TCG_TMP2, TCG_TMP2, 40); - /* t1 =3D 000000b0 */ - tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP1, TCG_TMP1, 0xff00); - - /* t3 =3D hg00000a */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP3, TCG_TMP3, TCG_TMP2); - /* t2 =3D 0000abcd */ - tcg_out_dsrl(s, TCG_TMP2, TCG_TMP0, 32); - /* t3 =3D hg0000ba */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP3, TCG_TMP3, TCG_TMP1); - - /* t1 =3D 000000c0 */ - tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP1, TCG_TMP2, 0xff00); - /* t2 =3D 0000000d */ - tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP2, TCG_TMP2, 0x00ff); - /* t1 =3D 00000c00 */ - tcg_out_dsll(s, TCG_TMP1, TCG_TMP1, 8); - /* t2 =3D 0000d000 */ - tcg_out_dsll(s, TCG_TMP2, TCG_TMP2, 24); - - /* t3 =3D hg000cba */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP3, TCG_TMP3, TCG_TMP1); - /* t1 =3D 00abcdef */ - tcg_out_dsrl(s, TCG_TMP1, TCG_TMP0, 16); - /* t3 =3D hg00dcba */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP3, TCG_TMP3, TCG_TMP2); - - /* t2 =3D 0000000f */ - tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP2, TCG_TMP1, 0x00ff); - /* t1 =3D 000000e0 */ - tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP1, TCG_TMP1, 0xff00); - /* t2 =3D 00f00000 */ - tcg_out_dsll(s, TCG_TMP2, TCG_TMP2, 40); - /* t1 =3D 000e0000 */ - tcg_out_dsll(s, TCG_TMP1, TCG_TMP1, 24); - - /* t3 =3D hgf0dcba */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP3, TCG_TMP3, TCG_TMP2); - tcg_out_opc_reg(s, OPC_JR, 0, TCG_REG_RA, 0); - /* t3 =3D hgfedcba -- delay slot */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP3, TCG_TMP3, TCG_TMP1); -} - -static void tcg_out_tb_start(TCGContext *s) -{ - /* nothing to do */ -} - -static void tcg_target_init(TCGContext *s) -{ - tcg_target_detect_isa(); - tcg_target_available_regs[TCG_TYPE_I32] =3D 0xffffffff; - tcg_target_available_regs[TCG_TYPE_I64] =3D 0xffffffff; - - tcg_target_call_clobber_regs =3D 0; - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_V0); - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_V1); - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_A0); - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_A1); - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_A2); - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_A3); - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T0); - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T1); - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T2); - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T3); - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T4); - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T5); - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T6); - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T7); - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T8); - tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T9); - - s->reserved_regs =3D 0; - tcg_regset_set_reg(s->reserved_regs, TCG_REG_ZERO); /* zero register */ - tcg_regset_set_reg(s->reserved_regs, TCG_REG_K0); /* kernel use only= */ - tcg_regset_set_reg(s->reserved_regs, TCG_REG_K1); /* kernel use only= */ - tcg_regset_set_reg(s->reserved_regs, TCG_TMP0); /* internal use */ - tcg_regset_set_reg(s->reserved_regs, TCG_TMP1); /* internal use */ - tcg_regset_set_reg(s->reserved_regs, TCG_TMP2); /* internal use */ - tcg_regset_set_reg(s->reserved_regs, TCG_TMP3); /* internal use */ - 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 = */ - tcg_regset_set_reg(s->reserved_regs, TCG_REG_TB); /* tc->tc_ptr */ -} - -typedef struct { - DebugFrameHeader h; - uint8_t fde_def_cfa[4]; - uint8_t fde_reg_ofs[ARRAY_SIZE(tcg_target_callee_save_regs) * 2]; -} DebugFrame; - -#define ELF_HOST_MACHINE EM_MIPS -/* GDB doesn't appear to require proper setting of ELF_HOST_FLAGS, - which is good because they're really quite complicated for MIPS. */ - -static const DebugFrame debug_frame =3D { - .h.cie.len =3D sizeof(DebugFrameCIE) - 4, /* length after .len member = */ - .h.cie.id =3D -1, - .h.cie.version =3D 1, - .h.cie.code_align =3D 1, - .h.cie.data_align =3D -REG_SIZE & 0x7f, /* sleb128 */ - .h.cie.return_column =3D TCG_REG_RA, - - /* Total FDE size does not include the "len" member. */ - .h.fde.len =3D sizeof(DebugFrame) - offsetof(DebugFrame, h.fde.cie_off= set), - - .fde_def_cfa =3D { - 12, TCG_REG_SP, /* DW_CFA_def_cfa sp, ... */ - (FRAME_SIZE & 0x7f) | 0x80, /* ... uleb128 FRAME_SIZE */ - (FRAME_SIZE >> 7) - }, - .fde_reg_ofs =3D { - 0x80 + 16, 9, /* DW_CFA_offset, s0, -72 */ - 0x80 + 17, 8, /* DW_CFA_offset, s2, -64 */ - 0x80 + 18, 7, /* DW_CFA_offset, s3, -56 */ - 0x80 + 19, 6, /* DW_CFA_offset, s4, -48 */ - 0x80 + 20, 5, /* DW_CFA_offset, s5, -40 */ - 0x80 + 21, 4, /* DW_CFA_offset, s6, -32 */ - 0x80 + 22, 3, /* DW_CFA_offset, s7, -24 */ - 0x80 + 30, 2, /* DW_CFA_offset, s8, -16 */ - 0x80 + 31, 1, /* DW_CFA_offset, ra, -8 */ - } -}; - -void tcg_register_jit(const void *buf, size_t buf_size) -{ - tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame)); -} diff --git a/common-user/host/mips64/safe-syscall.inc.S b/common-user/host/= mips64/safe-syscall.inc.S deleted file mode 100644 index 3b196cc634c..00000000000 --- a/common-user/host/mips64/safe-syscall.inc.S +++ /dev/null @@ -1,114 +0,0 @@ -/* - * safe-syscall.inc.S : host-specific assembly fragment - * to handle signals occurring at the same time as system calls. - * This is intended to be included by common-user/safe-syscall.S - * - * Written by Richard Henderson - * Copyright (C) 2021 Linaro, Inc. - * - * This work is licensed under the terms of the GNU GPL, version 2 or late= r. - * See the COPYING file in the top-level directory. - */ - -#include "sys/regdef.h" -#include "sys/asm.h" - - .text - .set nomips16 - .set reorder - - .global safe_syscall_start - .global safe_syscall_end - .type safe_syscall_start, @function - .type safe_syscall_end, @function - - /* - * This is the entry point for making a system call. The calling - * convention here is that of a C varargs function with the - * first argument an 'int *' to the signal_pending flag, the - * second one the system call number (as a 'long'), and all further - * arguments being syscall arguments (also 'long'). - */ - -/* 1 * 8 for s0 save; 1 * 8 for align. */ -#define FRAME 16 -#define OFS_S0 0 - - -NESTED(safe_syscall_base, FRAME, ra) - .cfi_startproc - PTR_ADDIU sp, sp, -FRAME - .cfi_adjust_cfa_offset FRAME - REG_S s0, OFS_S0(sp) - .cfi_rel_offset s0, OFS_S0 - /* - * The syscall calling convention is nearly the same as C: - * we enter with a0 =3D=3D &signal_pending - * a1 =3D=3D syscall number - * a2 ... a7 =3D=3D syscall arguments - * and return the result in a0 - * and the syscall instruction needs - * v0 =3D=3D syscall number - * a0 ... a5 =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 - move a2, a4 - move a3, a5 - move a4, a6 - move a5, a7 - - /* - * This next sequence of code works in conjunction with the - * rewind_if_safe_syscall_function(). If a signal is taken - * and the interrupted PC is anywhere between 'safe_syscall_start' - * and 'safe_syscall_end' then we rewind it to 'safe_syscall_start= '. - * The code sequence must therefore be able to cope with this, and - * the syscall instruction must be the final one in the sequence. - */ -safe_syscall_start: - /* If signal_pending is non-zero, don't do the call */ - lw t1, 0(s0) - bnez t1, 2f - syscall -safe_syscall_end: - - /* code path for having successfully executed the syscall */ - REG_L s0, OFS_S0(sp) - PTR_ADDIU sp, sp, FRAME - .cfi_remember_state - .cfi_adjust_cfa_offset -FRAME - .cfi_restore s0 - bnez a3, 1f - jr ra - .cfi_restore_state - - /* code path when we didn't execute the syscall */ -2: REG_L s0, OFS_S0(sp) - PTR_ADDIU sp, sp, FRAME - .cfi_adjust_cfa_offset -FRAME - .cfi_restore s0 - li v0, QEMU_ERESTARTSYS - - /* code path setting errno */ - /* - * We didn't setup GP on entry, optimistic of the syscall success. - * We must do so now to load the address of the helper, as required - * by the ABI, into t9. - * - * Note that SETUP_GPX and SETUP_GPX64 are themselves conditional, - * so we can simply let the one that's not empty succeed. - */ -1: USE_ALT_CP(t0) - SETUP_GPX(t1) - SETUP_GPX64(t0, t1) - move a0, v0 - PTR_LA t9, safe_syscall_set_errno_tail - jr t9 - - .cfi_endproc -END(safe_syscall_base) --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305111; cv=none; d=zohomail.com; s=zohoarc; b=K0PvCmXmz6gzZjtglqpu5z95GNJSMIx9Zk7uqiM6xVrtMVYF0C0jrnC8Q+P4ya6nqbYgpheEcjyjTU0QGA1+Gx0Ngpm0bq3Kh78B0APZ2oVyKCdrNoeTFQnAtPtvlGtLfgXEQ3aWX7MOh4+/zuCa3txuqcbmR2de4oK61Zd9jsc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305111; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=wMLJEwyeCLqgj1Jg/Gcg3sR4YMXmetqIBMHZ1a3Cpic=; b=g2KJ5uXZ+l0V7889rVnZHSulJDFfo3mEjWyA3/nAFmnRyZ+uGd75P/wI9NDSBawiT7e7ND99Cebvaf8PdATQzAnmcbu2B4HCtoz2ZqqFBHfdAtNueJ+SX5ELCVYb941+w7gwcKjG0csqoWJqz4nfjnUI/tie96Du/Vpww74GVFY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305111304765.4689233625878; Wed, 20 May 2026 12:25:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmXF-0008Av-Om; Wed, 20 May 2026 15:24:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmX5-0007kc-2n for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:44 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmX1-0001tU-EX for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:41 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4891e86fabeso70047715e9.1 for ; Wed, 20 May 2026 12:24:39 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da15a6454sm57518150f8f.34.2026.05.20.12.24.36 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:24:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305078; x=1779909878; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=wMLJEwyeCLqgj1Jg/Gcg3sR4YMXmetqIBMHZ1a3Cpic=; b=XeaDaeOvi9FLRoDDeGqQLZKJYCEcvQ6sZ7szSNKvmW2S2JHnYk7ZOylyeaY3N9toLA eaeeq5wGLS4H2ilf5xFTc24NA4qL/70xkODGobr87v39wTiWXqX/DMORpWSiGzssW+cK 9kxCYMEp2+z6KkpI/MQvxqr9/3iyKsxsFMMNgm/lij6o6wDfX6EEsHy6PM3cjJu1/VAc FuOFSn6YDvD0Fvc3t438h/QUUaIo6ntRe59hw+7pA2kcnFV/vw7VMbgtTi6aZ4AAGAu9 aevqTh6k13YJfSGZjRZAZSkJz7YF04D1DqWKWwmtnuGy1IeQmzoZOO9XN7ne/7uZJ7pW 11OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305078; x=1779909878; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=wMLJEwyeCLqgj1Jg/Gcg3sR4YMXmetqIBMHZ1a3Cpic=; b=EbYpKXQkd4rdQjtC7XUBWwGc2We6sk042nMkA2wNFtts6BMqUJqDQtc6dl6NDBdeUE lM58a/aoAHABFS/ztblh3RW26TzUaqPkIAkVcSB8lrLfypiZBm/0aok6OtPjCrrIobYZ JI5JjFUKd1E34kbOqB7xmiElMlDfabb8bTIA0lL/w1YVXcAHjB9Va7T8736vGGolR3ZP OWYajMlEV9L76LSbKlew3NMaTdLl7jTzDRDJYkFFg8fVZGvPGvhQDeIXpGfZGlH6C78T 86W9neWgLHnBeoAgizmwHvFjHLJ15yUHq965tsQWxNhCfO93jZPOX5RSF5bGj1Lu3Lig KqYA== X-Gm-Message-State: AOJu0YwE1G6WEU7kOy/FXc0dtyUp31bi+QgbQ0R+34C5ddH7MUxbWpLC A6SMuuN52tEJIXinnDOMNGtfmv9aKQnKFzQ9IsupddydN1RAgAwF7Y/ldsSD1YKLAbZLGB7YtSl fBLhC8uA= X-Gm-Gg: Acq92OEFpSvIwwbFnnt/6oZvKtaG2eARRXOvXYW7la2N7e99PCSP1Sfkd3+Iur51N9c N+seopenHd7SL6ZYieAFdRieTXBxYiTXaMgY6z/7li/g9I1HHxzSiUgpUMTMT/X6XBYCJ1njYYG Cw/GeeIqwSQHhpc1BuBWC6yawBcv8nsQH5AYAuR9tg0c5klB7LBbn0JBeuM/uEIAUrx6mYrwoZX +cOOudR20nxC/JFxQDTDtHpyl6jn6QgfFX3ycO1Fp/C/bGB1S1MZPfkVj824o0NGxZyKBgS8+YI KCXPhBtH0jyS0lnaE8fEf3Yq9yO7uSIgLZ9jbRJloKusvF2iRMIQrggjFCoWKGjYa5H6TkHwipD HBluNqhignC8Yl6Lp08wfF2mHNHCL+eD97aUSaSQ3XmQoZxit+Rt2Kli+IL61nXelj5FklfshjD HjwLXyNP86/mq4qqgeYXhcKc5p4ynB7MOntRd337lvOcvtvb7STfH4tVNkl/lxA9I/WWi4IQBB X-Received: by 2002:a05:600c:a11c:b0:48f:e468:1761 with SMTP id 5b1f17b1804b1-48fe60e47afmr289520305e9.2.1779305077737; Wed, 20 May 2026 12:24:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 08/33] hw/intc/mips_gic: Avoid Coverity complaint in VP writes Date: Wed, 20 May 2026 21:23:13 +0200 Message-ID: <20260520192338.40036-9-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: qemu development 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: 1779305113301154101 From: Peter Maydell The MIPS GIC does a check for a guest error in the write path for the SH_MAP*_VP registers which triggers a Coverity complaint because it assigns -1 to a uint64_t. The code doesn't misbehave because the -1 case will be caught by the following OFFSET_CHECK(), but the code could be improved: * there is no need to special case to avoid passing 0 to ctz64(), because (unlike the compiler builtins) QEMU defines that this has a specific behaviour, returning 64 * the OFFSET_CHECK() macro will go to the "bad_offset" label and print an error implying that the guest wrote to an invalid register offset. This is misleading about the actual problem, which is that the guest wrote a bogus value to a valid register offset Make the error check print a better log message, and avoid the special casing on ctz64(); in passing, this should also make Coverity happier. CID: 1547545 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260512111536.3437645-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/mips_gic.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c index 23478df4b46..4777c70d6b4 100644 --- a/hw/intc/mips_gic.c +++ b/hw/intc/mips_gic.c @@ -317,9 +317,13 @@ static void gic_write(void *opaque, hwaddr addr, uint6= 4_t data, unsigned size) /* up to 32 bytes per a pin */ irq_src =3D (addr - GIC_SH_MAP0_VP_OFS) / 32; OFFSET_CHECK(irq_src < gic->num_irq); - data =3D data ? ctz64(data) : -1; - OFFSET_CHECK(data < gic->num_vps); - gic->irq_state[irq_src].map_vp =3D data; + if (ctz64(data) >=3D gic->num_vps) { + qemu_log_mask(LOG_GUEST_ERROR, "Bad data value 0x%" PRIx64 + " at MAP VP register offset 0x%" PRIx64 "\n", + data, addr); + break; + } + gic->irq_state[irq_src].map_vp =3D ctz64(data); break; case VP_LOCAL_SECTION_OFS ... (VP_LOCAL_SECTION_OFS + GIC_VL_BRK_GROUP= ): gic_write_vp(gic, vp_index, addr - VP_LOCAL_SECTION_OFS, data, siz= e); --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305155; cv=none; d=zohomail.com; s=zohoarc; b=bpNZZ43c6cPAR5wd/1/6SKEs/uvzdUywubSOWnW1pvmaty73fCul01fNbPHvZPMEg3PFuCTzGiE+rdCW25hhkp8cLifumYQnD1Xh9I4fqpaMU9vAXnDYBBdQh0SV+OLc0+QeigkThfq2ZA771ZcgeAGQs4tVDphHP+tQwqAjOeA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305155; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=NTJTBJGiKTAtbk2+yacFXD/H2Zy4Qt8gbCv1PqATx/Q=; b=EEMlJJJZEV8CQXkCr3q7kE1+79HuIdc5osRQPqJ+8XYhplVzbgwdyqU3KpeyjdLIf/4X8nf7Wwi4CwPe24HYLlTcSNHujA1228cHTVVFjUoG0ZPKqHkWYgsqr2tvj4hFB7QOfQ43T4fCrButsCGj6ToYh4HiBioInQbxnaOre4w= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305155622801.0212467863767; Wed, 20 May 2026 12:25:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmXG-0008Ii-Ir; Wed, 20 May 2026 15:24:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmXD-0007y7-9H for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:51 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmX9-0001xA-MX for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:50 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-48d146705b4so58516005e9.3 for ; Wed, 20 May 2026 12:24:47 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49033d5f21dsm12793425e9.13.2026.05.20.12.24.43 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:24:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305085; x=1779909885; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=NTJTBJGiKTAtbk2+yacFXD/H2Zy4Qt8gbCv1PqATx/Q=; b=K1FFlNdddFqMVgD+N9m8NFkpH0cSTlQlNch206FAVmqsFhQjqePSzPjGeuK+5VtBaE 86JmFMWgofKBHXJxcwopW7/iYKCaV0Vt3JZ2iuGZoxuj3khsyF2bH00hD5MDEWxXkUsy JkA9UY61EGh8N0KIE42Gj+AZdkWnlJglYl2fvHRtBLhH6JBpuRFvQmFJlMFz1ouL/2C5 gLx3geVV+z16by4+2ZKj4wiJIjFWzozEiH1FCez/LxjTRb/zfYnsJCWgXEoUycmnBQCx 30+2tm4FHK6lug1OIQowGy+mJQxc8qOkGRpltiE6xAcKML9ZE9i/dfxZnEI44EVfLAXl kcCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305085; x=1779909885; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=NTJTBJGiKTAtbk2+yacFXD/H2Zy4Qt8gbCv1PqATx/Q=; b=UmIhk6fdMhQOB5il/+1Fq8QpDq9mE15NmEgEzs6TE+NVsm2pBVM7KjmHwANgXkL2BW dlEQe9+m1tMqtBZ1X/JProAikZA7Cp0HYzxelLE54rdYtiRZi43LtxAjnj4fWDmn0so/ c3qdckI3lQLPYarDZ/Y5WvnccjayHEP6714JQiBD48JGpQZpOi8ByYqLAWvHfXuYL77w rhGHRS0zUByp2ckdjcvB+Sivt9BWuzeznoZ0rgqZwUH/DXDcKqEGkCXCh6p6Rqx4+3+J jMj7oiBC3eFZNOdD8jXCs8fN39PzIwrgIYxlsa25YRbPeF1JdTEVVQo4T9K9Wcn9A7zU EcaQ== X-Gm-Message-State: AOJu0YzjEIbf0fY7ckbnQaz/8Gfo+5qiSAXe9etiYRhNlnv8H5pvidbX UNGguEqp9pvW1fcqyKgDNNefCPSsKSnLSIdkXrRBeS+LjiihLtZoVPnKk4se8LSmpdqH0IT1VMe 2tMpVLYs= X-Gm-Gg: Acq92OE4LWSHKVm28PyNeEkVlY82N+JDC3fdDUko2lawuOXHvwKQMidvcZI6TdRmsIs DCkHPUX1D+hSxA36xfE8wMb0IB94jsF+yZUXKVdATwLzSraxwYTAgkazc5gh6c8wlTc0aTdd5Qh P0N3PtrwnizyfjxI+3r3mjSMwfvvu8JqluiHT/VIvPSGVyFPsp0CdNdiTroRxplRF0WsCLsi/tE 5ENie9b1fPJ3Qqz+Ncsx6HsHjeVN22dqa3OoyDukHQnr/xr+5x58xwrd13lCycD/hta432IywdF 9C9Ga1p08z7MCkQvncWPqUnlcxngOwQXW/CBpLapBK+SrXS/EHOhabh/Hl7PYVyUKRE5EpXpMJG xi+P+XYJRrp8/3ikfdw3Px1vYX7QsDoLzI0JMZaPgSxjrf+3UE7qvqr2u2kw7rYeia+bMgy8j7M ftPk8FQ85l+PjSCYncmU4sxnW6N7CqlyOSMZ8DWkeum3ua5VS3r8eb4XYnJOi6P3xMZ6z3VTjh X-Received: by 2002:a05:600c:a406:b0:487:1fb4:7e1 with SMTP id 5b1f17b1804b1-48fe632a02fmr323196125e9.22.1779305085441; Wed, 20 May 2026 12:24:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 09/33] linux-user/mips: implement sysmips(MIPS_FLUSH_CACHE) Date: Wed, 20 May 2026 21:23:14 +0200 Message-ID: <20260520192338.40036-10-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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: qemu development 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: 1779305158058154100 From: James Hilliard Add the target sysmips dispatcher and implement MIPS_FLUSH_CACHE as a successful no-op for linux-user. Self-modifying code is handled by QEMU's normal user-mode translation invalidation machinery, so the target ABI only needs the syscall command to be accepted. Reviewed-by: Richard Henderson Signed-off-by: James Hilliard Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-2-philmd@linaro.org> --- linux-user/mips/target_syscall.h | 1 + linux-user/mips64/target_syscall.h | 1 + linux-user/syscall.c | 17 +++++++++++++++++ 3 files changed, 19 insertions(+) diff --git a/linux-user/mips/target_syscall.h b/linux-user/mips/target_sysc= all.h index dfcdf320b7c..3f36c1695a5 100644 --- a/linux-user/mips/target_syscall.h +++ b/linux-user/mips/target_syscall.h @@ -10,6 +10,7 @@ #define TARGET_MCL_ONFAULT 4 =20 #define TARGET_FORCE_SHMLBA +#define TARGET_SYSMIPS_FLUSH_CACHE 3 =20 static inline abi_ulong target_shmlba(CPUMIPSState *env) { diff --git a/linux-user/mips64/target_syscall.h b/linux-user/mips64/target_= syscall.h index 9135bf5e8b6..20ea7c6ab9b 100644 --- a/linux-user/mips64/target_syscall.h +++ b/linux-user/mips64/target_syscall.h @@ -10,6 +10,7 @@ #define TARGET_MCL_ONFAULT 4 =20 #define TARGET_FORCE_SHMLBA +#define TARGET_SYSMIPS_FLUSH_CACHE 3 =20 static inline abi_ulong target_shmlba(CPUMIPSState *env) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 2d4a8aa182b..5a8e00337a0 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6630,6 +6630,19 @@ static abi_long do_prctl_syscall_user_dispatch(CPUAr= chState *env, } } =20 +#ifdef TARGET_NR_sysmips +static abi_long do_sysmips(CPUArchState *env, abi_long cmd, abi_long arg1, + abi_long arg2) +{ + switch (cmd) { + case TARGET_SYSMIPS_FLUSH_CACHE: + return 0; + default: + return -TARGET_EINVAL; + } +} +#endif + static abi_long do_prctl(CPUArchState *env, abi_long option, abi_long arg2, abi_long arg3, abi_long arg4, abi_long arg5) { @@ -12110,6 +12123,10 @@ static abi_long do_syscall1(CPUArchState *cpu_env,= int num, abi_long arg1, case TARGET_NR_prctl: return do_prctl(cpu_env, arg1, arg2, arg3, arg4, arg5); break; +#ifdef TARGET_NR_sysmips + case TARGET_NR_sysmips: + return do_sysmips(cpu_env, arg1, arg2, arg3); +#endif #ifdef TARGET_NR_arch_prctl case TARGET_NR_arch_prctl: return do_arch_prctl(cpu_env, arg1, arg2); --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305191; cv=none; d=zohomail.com; s=zohoarc; b=dEe00lttDPyc2lLxxKYTpHhYAk9ylRkP7Y/yHCrwsUdfzHiEAk6thK9x/WFMWxH/ISgDnvqmO+UsWIfJcQiqrSDT+wtTXUkAmI8cbjnK1obuiWXPd9XpGg8Jw0vqGvnHDSODQuuciv2EwvQX7T7dteycgy2Jm68XAF/5RGepPvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305191; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=hU6ebKsQT0Fy24onkNdlGUsVBCKWyDDG3Y1v+yE4t/0=; b=dg7qfiZCcByGupCHmw4N2KYgRZpz6/Jp+JSSjk/gSfyHf06MjTrUeiYbYQpFUKQmne1Ym1cZz9l7qJ7ncU5LVyDnNH2U66g9tr4TKeTdqpAGKFvL98HxrJvPmgeo0KXIdPxXkg1JSfMNQ1YPJU67t7N5PkbcQoi5aQQCtxK23o8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305191691421.1459160740916; Wed, 20 May 2026 12:26:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmXM-0000S7-SY; Wed, 20 May 2026 15:25:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmXK-00009y-47 for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:58 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmXH-00020D-Js for qemu-devel@nongnu.org; Wed, 20 May 2026 15:24:57 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-43d75312379so4351877f8f.1 for ; Wed, 20 May 2026 12:24:55 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0a19a0csm53471546f8f.20.2026.05.20.12.24.51 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:24:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305094; x=1779909894; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=hU6ebKsQT0Fy24onkNdlGUsVBCKWyDDG3Y1v+yE4t/0=; b=Uo9fu/Ue/7n4fl5SeQ1kcWrfaO39D0Mk53R0Soyde1Gzoyo5OZYHfiED2IrnEQL+Rt Czcw29yq+oaeRpprd/jCdqb/4ujSLeU+Gvij1RnLvC1kPkb9+CcyHzvQBTmRGlueLO11 NukyRURup4zCH4IH1QzYlL2jobudkFIi44v1LwkTnkivFzeS8emWvECFmte1c0rSSaOH Bc2yxyZCbop8sdjLbxRIl1+FwBNkG4BU/lfStKtB0kgROJRL1iWNvI7TKISE38SQm7XW +zgejrMTS8VaQhOZVaUCs6+tvsJ9Wf6UERxR/m4KlqKLaUSf3IODoCLpvDQceHBIqISp d2Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305094; x=1779909894; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=hU6ebKsQT0Fy24onkNdlGUsVBCKWyDDG3Y1v+yE4t/0=; b=GNXDjgWpHz33EEgctpJ9fI5qGSj8/e4VAIPer5ThdxSSh/Wrguwm1UUkMypJldF+G3 hXVdTbhEdfLAinhuFfNehi79iMifD2pKLBnPkqDbHMZ7TJiiYHFsm3lnPLB3MlDyzwam DNQAu9Ew7lQc4hHfPFMGEPbCbLAFZHl2/7v42FKaGC1X7ovY5UcCd+NcXfdVHuAUfQNV Y+tAPSreEnjS6m8pwZL95GtBHDNKbBaHB1EK4W8C9FvUMcdWB/oXkBJ2NWUobciukUc0 c3OedBMSedghAhd6EfLaQFXnJNH9+2z3CWcawf5azSLedb1IA8szxOaFAb1C9FS55jd/ YsvA== X-Gm-Message-State: AOJu0Yylm7yIzj42HDyDbK3kegQ6nmTZCfD4+poGARLxKnQVLlI0vjWG 1gXZLoaovH0VsrEiCJPcDcQwKpwc54nDClmpT+ECIlqQgF2wOltNi++ZYjGzMIYTRNSvBTLy43f G2nMKpJ4= X-Gm-Gg: Acq92OGtpPnIAP1Kny3n6EaUrO0b+mEzf8tVpqTBRaaY8uaNdhu2yO46FVBiydgoAX3 WLNlB8mIPuTddxVOdBBTRKjLa9lvZkd1AbMamllh701lkct3x/7ImDwmXXSbK2tVg+apgX+Djnq S0CVtYc3QxouLFOlSrPqRMCx95xzL1tiv/OBsnkzrq9ZnXDBuF+8K40e+sJgnc0PQAA5aYecuvt 5AWYWoQqDXEpn6uEc1sjLtgGcT5LQr5tJFW7mX61KsLdLmCGprdiucn0f1ZKVjxvihAmTKqbtZf Tp5kdfHSDNdtkCd1ZSeecz1aNwTOsOZuMx7rR/1vf2Nli+0Y2AFvKgmnTzuJ6RDSCYsbPsIz1Ti y7DjcU/CfRBv5TUYIYezIv85O6y5p/ZtAmB2gp2BnmlCHsrfkpRG9n+l95KkGzycCrKfFpAcQjk TdmjE8FCFOhp0I2OgultFhoh0z/8k1YBlYdSbvm2tVGJ/9wYdN/4tAlaI66WuIdCI5nMv/w25Ot o3vmovhX3o= X-Received: by 2002:a05:6000:471a:b0:452:f380:5508 with SMTP id ffacd0b85a97d-45ea0aac013mr1162596f8f.0.1779305093586; Wed, 20 May 2026 12:24:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 10/33] linux-user/mips: implement sysmips(MIPS_ATOMIC_SET) Date: Wed, 20 May 2026 21:23:15 +0200 Message-ID: <20260520192338.40036-11-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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: qemu development 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: 1779305192912158500 From: James Hilliard Implement the MIPS_ATOMIC_SET sysmips command as an aligned 32-bit atomic exchange in target memory. MIPS reports syscall errors through a separate register, so successful old values can overlap the errno range. Write the return value and error flag directly and return -QEMU_ESIGRETURN so the common syscall path leaves the registers unchanged. Reviewed-by: Richard Henderson Signed-off-by: James Hilliard Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-3-philmd@linaro.org> --- linux-user/mips/target_syscall.h | 1 + linux-user/mips64/target_syscall.h | 1 + linux-user/syscall.c | 31 ++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/linux-user/mips/target_syscall.h b/linux-user/mips/target_sysc= all.h index 3f36c1695a5..9206694f4fb 100644 --- a/linux-user/mips/target_syscall.h +++ b/linux-user/mips/target_syscall.h @@ -11,6 +11,7 @@ =20 #define TARGET_FORCE_SHMLBA #define TARGET_SYSMIPS_FLUSH_CACHE 3 +#define TARGET_SYSMIPS_ATOMIC_SET 2001 =20 static inline abi_ulong target_shmlba(CPUMIPSState *env) { diff --git a/linux-user/mips64/target_syscall.h b/linux-user/mips64/target_= syscall.h index 20ea7c6ab9b..e07687f8ac9 100644 --- a/linux-user/mips64/target_syscall.h +++ b/linux-user/mips64/target_syscall.h @@ -11,6 +11,7 @@ =20 #define TARGET_FORCE_SHMLBA #define TARGET_SYSMIPS_FLUSH_CACHE 3 +#define TARGET_SYSMIPS_ATOMIC_SET 2001 =20 static inline abi_ulong target_shmlba(CPUMIPSState *env) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 5a8e00337a0..3df42aa159d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6631,10 +6631,41 @@ static abi_long do_prctl_syscall_user_dispatch(CPUA= rchState *env, } =20 #ifdef TARGET_NR_sysmips +static abi_long do_sysmips_atomic_set(CPUArchState *env, abi_ulong addr, + abi_long value) +{ + uint32_t *ptr; + abi_long old; + + if (addr & 3) { + return -TARGET_EINVAL; + } + + ptr =3D lock_user(VERIFY_WRITE, addr, sizeof(*ptr), true); + if (!ptr) { + return -TARGET_EINVAL; + } + + old =3D tswap32(qatomic_xchg(ptr, tswap32((uint32_t)value))); + unlock_user(ptr, addr, sizeof(*ptr)); + + /* + * MIPS uses a separate error flag, but the common linux-user syscall + * path infers that flag from the return value. Successful atomic_set + * results can overlap the target errno range, so write the result + * registers here and ask the CPU loop to leave them alone. + */ + env->active_tc.gpr[2] =3D old; + env->active_tc.gpr[7] =3D 0; + return -QEMU_ESIGRETURN; +} + static abi_long do_sysmips(CPUArchState *env, abi_long cmd, abi_long arg1, abi_long arg2) { switch (cmd) { + case TARGET_SYSMIPS_ATOMIC_SET: + return do_sysmips_atomic_set(env, arg1, arg2); case TARGET_SYSMIPS_FLUSH_CACHE: return 0; default: --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305115; cv=none; d=zohomail.com; s=zohoarc; b=RGEaLooCdnyqOVmHBYvsRAyeoFcEtEpNJu0g/e7pqU8U8e72RFEWRV+fVIfM58h9dOM8btjRlU83oensPyCdTIUcht1yA2Zfq90H+8tkgkoB31yDyGvkXYoJTrZJMvQ5YeQUdqEuobUbL8aaGYm7BtEwCS8kKkjXCubPq5pUOpU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305115; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=3qwANRZBmfhl72g8qJbLId8AvrN+NTs16eU4PqpQK+8=; b=PBqWJMFkdj9k51spsdN5Jw//qxNAdlMK20z6mUrQv2EsbDiWSOVCeEavdR2erJslRMYn17zNwIC5oXB554QCLymOa13L6Zsuu/JYygeJw6HQLYqn5f7gbfNqIiRzz3YcAIf/hbAs0qTSlWIZ0ePDIyluxC/SY8xiL10W5paqpwI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17793051158471008.9204962308102; Wed, 20 May 2026 12:25:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmXX-0000ux-5o; Wed, 20 May 2026 15:25:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmXR-0000i3-PB for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:06 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmXO-00020t-9j for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:05 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-44985f4ab0fso2844936f8f.0 for ; Wed, 20 May 2026 12:25:01 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48febe6b60csm206582945e9.6.2026.05.20.12.24.59 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:25:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305101; x=1779909901; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3qwANRZBmfhl72g8qJbLId8AvrN+NTs16eU4PqpQK+8=; b=PAWzkwbSQESU45WnLess42RNDEekHgs5POVD53K8ee+tGG5Bpz09H4R4y7Gzw6Nb+E 4pLzxENEXNfedWctinbqLHu+4pyR5hXIMY33PScpVNc4aFnPP+A9n3+wiWho6ylHHyOs JbuZsc7u1d3Ke2+LYWo5D90E++JqFK1/ZdeyPGMA9r3ZWK0yTVGDGfMb3GzN6cJK9fn7 3mfFKjRW+yfEEfBOwfDv9D7Qe5Ffetio/0O5ZupT+H1zAANOchQ+pyP0iyWvvIvlNLP0 5f08M9SW0WZRWy/3FJAZfFbODuKpOwpuhrNzu6LgtL6HS1AmC4CDv5K8mUmNyvl1X939 BqWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305101; x=1779909901; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=3qwANRZBmfhl72g8qJbLId8AvrN+NTs16eU4PqpQK+8=; b=msYsAMWF/dZ4RYFc+3O40EMnDedGHvzf+xotCiAtz8sy0m90bZj7vs7qSlCjUPs7zL iq8LR3GMytyvmnrZxO+o3KMYlVFhTQLbHU2SNI5pXkKSLLBg84IQxRsKCqDYinshLgQd H063D0P9kH1I1be8Je5CFEdCTw1L169RDMLzdhVfwLrTOoFqMCMHuO8gGHsq4iCtmKoA Et5I1q9H3RegeCya6ft3xqeRXgcPaLgA0ZhVtUewBmshGDzXzIaIqCXTrvMZsWyMBn8z 1SS4yRqnkiD9jIukxsayBh8HSeTwmwfEpXRCiPB6mvYk1KqLlV5ozRK/4+ZANfvVfEIY drrQ== X-Gm-Message-State: AOJu0YzwdgLILS1d3MEhpeIEnhZNwpGf/p86G4Q3JaxvfhbY82HHiTXb 8KqIp4VaLWiZArWktvW77e0Od0RkfcqC1UdXrdYVbzvEEhDHLBktBWF2h9EXut9nNR295p02VCg 4MD8yIBM= X-Gm-Gg: Acq92OECes8iZZRjciuqvZmPynRe0km43+Jla3DeGxgMXuN4sPlnoDG4tRxQUnvYCJE 59nQXyxGhH34geVXSUdIky/J7tzkclflHXWo+GzZFRzy+TXum6I4QGcfB1RNBzJaDmF3CSWtc5G bgLDoz7v33LtJYyEOFijczwZUViw2dZQXSWQm7IwjYAkGj7JzULJGW4QUy/JjU5C2/g0qJdUWtQ p8dzPsabPgvrCmWd8wXUh5ISU47wgnPqdiDBIYTH0qHyw1Vu2zf5VijrBERAYSganVS8IyQLNeJ Nvcbyj/VyfVW+CgvEa+oKsyqqafcZDSuG5snAXqtftmeUkl8jk7oOSGmpTg96otdjgJ/VAl9FyL F9+fMdhie4JiR4D0E7K270HLxXLfoQBErxpEjaiJHgf8kiFHVd57Ifa8JiaHLRiPOIVghyC5gpW z77GaThQ4lt30SCSBzRkO4rQOT59zd8h8uIZwnQ5xx5yV+k4Yy2wnuPRUzgNA4PmMAOufNjdLC X-Received: by 2002:a05:600c:6992:b0:48e:6f39:f7be with SMTP id 5b1f17b1804b1-48fe60ea533mr379722435e9.10.1779305100573; Wed, 20 May 2026 12:25:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 11/33] linux-user/mips, target/mips: honor MIPS_FIXADE for unaligned accesses Date: Wed, 20 May 2026 21:23:16 +0200 Message-ID: <20260520192338.40036-12-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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: qemu development 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: 1779305116179158500 From: James Hilliard Linux/MIPS enables software fixups for user-mode unaligned scalar accesses by default through MIPS_FIXADE/TIF_FIXADE. QEMU linux-user did not model that ABI, so MIPS guests took fatal AdEL/AdES exceptions unless translation was forced to use unaligned host accesses. Key MIPS translation blocks on the linux-user unaligned policy, implement sysmips(MIPS_FIXADE) to toggle that policy, and raise SIGBUS/BUS_ADRALN when fixups are disabled. Reviewed-by: Richard Henderson Signed-off-by: James Hilliard Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-4-philmd@linaro.org> --- linux-user/mips/target_syscall.h | 1 + linux-user/mips64/target_syscall.h | 1 + target/mips/cpu.h | 4 ++++ linux-user/mips/cpu_loop.c | 5 +++++ linux-user/syscall.c | 8 ++++++++ target/mips/cpu.c | 10 ++++++++-- target/mips/tcg/translate.c | 6 +++++- 7 files changed, 32 insertions(+), 3 deletions(-) diff --git a/linux-user/mips/target_syscall.h b/linux-user/mips/target_sysc= all.h index 9206694f4fb..be6942445a2 100644 --- a/linux-user/mips/target_syscall.h +++ b/linux-user/mips/target_syscall.h @@ -11,6 +11,7 @@ =20 #define TARGET_FORCE_SHMLBA #define TARGET_SYSMIPS_FLUSH_CACHE 3 +#define TARGET_SYSMIPS_FIXADE 7 #define TARGET_SYSMIPS_ATOMIC_SET 2001 =20 static inline abi_ulong target_shmlba(CPUMIPSState *env) diff --git a/linux-user/mips64/target_syscall.h b/linux-user/mips64/target_= syscall.h index e07687f8ac9..c11d0a08888 100644 --- a/linux-user/mips64/target_syscall.h +++ b/linux-user/mips64/target_syscall.h @@ -11,6 +11,7 @@ =20 #define TARGET_FORCE_SHMLBA #define TARGET_SYSMIPS_FLUSH_CACHE 3 +#define TARGET_SYSMIPS_FIXADE 7 #define TARGET_SYSMIPS_ATOMIC_SET 2001 =20 static inline abi_ulong target_shmlba(CPUMIPSState *env) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index cbb9b3e1b1c..b478f834c13 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1161,6 +1161,10 @@ typedef struct CPUArchState { #define MIPS_HFLAG_ELPA 0x4000000 #define MIPS_HFLAG_ITC_CACHE 0x8000000 /* CACHE instr. operates on ITC ta= g */ #define MIPS_HFLAG_ERL 0x10000000 /* error level flag */ +#define MIPS_HFLAG_TB_MASK (MIPS_HFLAG_TMASK | MIPS_HFLAG_BMASK | \ + MIPS_HFLAG_HWRENA_ULR) + +#define TB_FLAG_MIPS_FIXADE 0x40000000 target_ulong btarget; /* Jump / branch target */ target_ulong bcond; /* Branch condition (if needed) */ =20 diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c index fa264b27ec5..ff9d293c296 100644 --- a/linux-user/mips/cpu_loop.c +++ b/linux-user/mips/cpu_loop.c @@ -161,6 +161,11 @@ done_syscall: case EXCP_DSPDIS: force_sig(TARGET_SIGILL); break; + case EXCP_AdEL: + case EXCP_AdES: + force_sig_fault(TARGET_SIGBUS, TARGET_BUS_ADRALN, + env->CP0_BadVAddr); + break; case EXCP_INTERRUPT: /* just indicate that signals should be handled asap */ break; diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 3df42aa159d..7d7a7b489cf 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6663,9 +6663,17 @@ static abi_long do_sysmips_atomic_set(CPUArchState *= env, abi_ulong addr, static abi_long do_sysmips(CPUArchState *env, abi_long cmd, abi_long arg1, abi_long arg2) { + CPUState *cs =3D env_cpu(env); + switch (cmd) { case TARGET_SYSMIPS_ATOMIC_SET: return do_sysmips_atomic_set(env, arg1, arg2); + case TARGET_SYSMIPS_FIXADE: + if (arg1 & ~3) { + return -TARGET_EINVAL; + } + cs->prctl_unalign_sigbus =3D !(arg1 & 1); + return 0; case TARGET_SYSMIPS_FLUSH_CACHE: return 0; default: diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 99d43613828..fccc7a711d3 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -560,11 +560,17 @@ static int mips_cpu_mmu_index(CPUState *cs, bool ifun= c) static TCGTBCPUState mips_get_tb_cpu_state(CPUState *cs) { CPUMIPSState *env =3D cpu_env(cs); + uint32_t flags =3D env->hflags & MIPS_HFLAG_TB_MASK; + +#ifdef CONFIG_USER_ONLY + if (!cs->prctl_unalign_sigbus) { + flags |=3D TB_FLAG_MIPS_FIXADE; + } +#endif =20 return (TCGTBCPUState){ .pc =3D env->active_tc.PC, - .flags =3D env->hflags & (MIPS_HFLAG_TMASK | MIPS_HFLAG_BMASK | - MIPS_HFLAG_HWRENA_ULR), + .flags =3D flags, }; } =20 diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 54ed253a7d0..dac30aff8d3 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -15070,6 +15070,7 @@ static void mips_tr_init_disas_context(DisasContext= Base *dcbase, CPUState *cs) { DisasContext *ctx =3D container_of(dcbase, DisasContext, base); CPUMIPSState *env =3D cpu_env(cs); + uint32_t tb_flags =3D ctx->base.tb->flags; =20 ctx->page_start =3D ctx->base.pc_first & TARGET_PAGE_MASK; ctx->saved_pc =3D -1; @@ -15092,7 +15093,7 @@ static void mips_tr_init_disas_context(DisasContext= Base *dcbase, CPUState *cs) ctx->CP0_LLAddr_shift =3D env->CP0_LLAddr_shift; ctx->cmgcr =3D (env->CP0_Config3 >> CP0C3_CMGCR) & 1; /* Restore delay slot state from the tb context. */ - ctx->hflags =3D (uint32_t)ctx->base.tb->flags; /* FIXME: maybe use 64 = bits? */ + ctx->hflags =3D tb_flags & MIPS_HFLAG_TB_MASK; ctx->ulri =3D (env->CP0_Config3 >> CP0C3_ULRI) & 1; ctx->ps =3D ((env->active_fpu.fcr0 >> FCR0_PS) & 1) || (env->insn_flags & (INSN_LOONGSON2E | INSN_LOONGSON2F)); @@ -15112,6 +15113,9 @@ static void mips_tr_init_disas_context(DisasContext= Base *dcbase, CPUState *cs) ctx->default_tcg_memop_mask =3D (!(ctx->insn_flags & ISA_NANOMIPS32) && (ctx->insn_flags & (ISA_MIPS_R6 | INSN_LOONGSON3A))) ? MO_UNALN : MO_ALIGN; + if (tb_flags & TB_FLAG_MIPS_FIXADE) { + ctx->default_tcg_memop_mask =3D MO_UNALN; + } =20 /* * Execute a branch and its delay slot as a single instruction. --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305190; cv=none; d=zohomail.com; s=zohoarc; b=XGs64fOKbvOQD+xOOh9XYbr5IKoS7eIz6qhiUyqKZWaLg7r3AwGOaXiUzQgM7Fax+E4mh045VmSBHOWIydttgukPGqSd6l8Uzdr62mJULBOjIIFfHs1Z7heVOiaJshPZovfPr2SYrmY+CsStczo69xVlwNSCp6VkHnYMgP4rglU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305190; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=XM8/ESUZyxARANoG97kDLPmVt2Q2WvRDXAoslUdYf3A=; b=CYi1tNc3B4UiYkBDlFYNi8i4S71PJ5zWTG3Et9nPNt8udcjr3CtwB0Xvo5VPGvLheZN/mYZGo0vdxtgqNk0SGQg3gYbamx/raydiWxDcsMhoHAUMIdR2PDD8H38uOcbEnw3ou/AHsD7DT0RtK1n5fT87UqjlCVam3FqvVjPG9GA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305190511129.31829667860552; Wed, 20 May 2026 12:26:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmY8-0001GD-6a; Wed, 20 May 2026 15:25:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmXX-0000yG-HX for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:12 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmXV-0002DY-EW for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:11 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-488a88aeec9so62401005e9.2 for ; Wed, 20 May 2026 12:25:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48feb8d838dsm140077555e9.1.2026.05.20.12.25.06 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:25:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305107; x=1779909907; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XM8/ESUZyxARANoG97kDLPmVt2Q2WvRDXAoslUdYf3A=; b=uIMdI7W15pj7E5SpF4vwSHuyPkQ9s6z25UZG0EsJGB40wc5oI+5CVsvkV8l4BjE31o wJF0CQT3+gZn6HIcht3RXBDvGfn0L00ITmxhNk1tg5lqTB8YVo3F95i58Ih7tzFcr/ae aTFo0E+2pYAMUW+38GP2q/89KyhXtmrAA6Y7epB8SaF2cJ8tap1zR1sTQSxexAJTgNPn h0HSJtcAPMLUd882Kz/NA+TACVLnIhIEGzxVaeh8E75vLbO/+VvTuEgDjOCFNsYHxARQ cZJxBhUahCxsGDl0A+ZrEAo99/W1L6UyPylXqxMYp/Z0+TzjU4FCSXOMLmz2418bez6M W8XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305107; x=1779909907; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=XM8/ESUZyxARANoG97kDLPmVt2Q2WvRDXAoslUdYf3A=; b=MMvd9zv35doaZVykdd2pYpkZmwRp5iww9Snl9S0FoxZ2tAuxtqUHb7uwiBiENJrCKq g3RrfQ+MBkijttPpQqbc4jqZ5fgyoBAEecpg2IVHZtkb1jYdxetSTVQ9lV4HY3F8zslC aMDSx/g2k3hifloG4n3dNI5CpTAXzmObxogVAdpBdaQrbgGTG4WK4xXkKqA6mFvZVV1q C0jamZRsV9E//1w8QeyFTe8Y7qK0SkzQ0jKNudau0/dy5GWK6R/Fsv/Am2HRgHrTDa3f Vx2gG8bcbflT+2Ot9paZrV0UDAz6NMKpljMbljpCzicUgjwdFsnR2Vo/rbjjOTwxn8fw 218w== X-Gm-Message-State: AOJu0YzanmwoyPev4GYbyosFS/8TqdjCWCEX82Ss3a2w+GKdpxnDN7Wz hV/oAZs8UYNbNu2B2tnctXyrEp3xs4CKUOC5OObHfCOam5nQxiFJIAjZvsXBuzNwQHyAUfCbx9b vPkaMutc= X-Gm-Gg: Acq92OGCzLYSFheks58r9SO9GdOiJA/sBSDjaNtAqZtobHAODy1/t9TAqmnRPXbsa38 eabwuXncd+yp3cxZdbahsPJNl8fYBUQSYa1lAGv9tP2xyRwA2a7vDi4e2+ZtfFqTjRARMiOuWFW h+pNAwm7+Fc0R7MCC2w9uPXvCKo4o9pq/2nEM3MmpiEfpprs52bflJ+jQ7LFK1zlGYKOwQCJuR6 Rb6AcfsNzU49zWY0k6/r5fODI8agSwXz+9SYkLqMn3Cs2NSQkIhuimzN8SHhAMT+QeuXKyCMWf5 sb7H89vwXeuz719Tmy7IVv4qp4KatMk0hnjrt1yWPxj1QU3Da+GYJwOHPdBeWGbsMJtY9+yhMlH LpgxpWTR+J2WzQuZQ7SNT7F9YAh3KYDqgQm7YEHVvHjVmcQQIx5LO6ilPuEt8EFCv2PtSejLviD GNbogI0kpHos7XJYDDfEQvyAtnu6Q5aODtlpXzymf2QgA1wUjUSoYDpNrsZZI6lLe9okfxNr7IG AR9z1YX42A= X-Received: by 2002:a05:600c:34ca:b0:48a:7676:30bc with SMTP id 5b1f17b1804b1-48fe60ee4c7mr404414015e9.14.1779305107476; Wed, 20 May 2026 12:25:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 12/33] target/mips: expose Octeon68XX floating-point support Date: Wed, 20 May 2026 21:23:17 +0200 Message-ID: <20260520192338.40036-13-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: qemu development 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: 1779305192825154100 From: James Hilliard Octeon68XX cores implement CP1. Advertise that in the CPU definition by setting Config1.FP, enabling the writable Status bits, and providing the FCR0/FCR31 defaults used by this CPU model. This lets guests observe the expected floating-point feature bits and use CP1 with -cpu Octeon68XX. Signed-off-by: James Hilliard Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-5-philmd@linaro.org> --- target/mips/cpu-defs.c.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/target/mips/cpu-defs.c.inc b/target/mips/cpu-defs.c.inc index faefab04738..cc1916232f5 100644 --- a/target/mips/cpu-defs.c.inc +++ b/target/mips/cpu-defs.c.inc @@ -997,7 +997,8 @@ const mips_def_t mips_defs[] =3D .CP0_PRid =3D 0x000D9100, .CP0_Config0 =3D MIPS_CONFIG0 | (0x1 << CP0C0_AR) | (0x2 << CP0C0_= AT) | (MMU_TYPE_R4000 << CP0C0_MT), - .CP0_Config1 =3D MIPS_CONFIG1 | (0x3F << CP0C1_MMU) | + .CP0_Config1 =3D MIPS_CONFIG1 | (1 << CP0C1_FP) | + (0x3F << CP0C1_MMU) | (1 << CP0C1_IS) | (4 << CP0C1_IL) | (1 << CP0C1_IA)= | (1 << CP0C1_DS) | (4 << CP0C1_DL) | (1 << CP0C1_DA)= | (1 << CP0C1_PC) | (1 << CP0C1_WR) | (1 << CP0C1_EP), @@ -1011,7 +1012,12 @@ const mips_def_t mips_defs[] =3D .CP0_PageGrain =3D (1 << CP0PG_ELPA), .SYNCI_Step =3D 32, .CCRes =3D 2, - .CP0_Status_rw_bitmask =3D 0x12F8FFFF, + .CP0_Status_rw_bitmask =3D 0x36F8FFFF, + .CP1_fcr0 =3D (1 << FCR0_F64) | (1 << FCR0_3D) | (1 << FCR0_PS) | + (1 << FCR0_L) | (1 << FCR0_W) | (1 << FCR0_D) | + (1 << FCR0_S) | (0x00 << FCR0_PRID) | (0x0 << FCR0_REV= ), + .CP1_fcr31 =3D 0, + .CP1_fcr31_rw_bitmask =3D 0xFF83FFFF, .SEGBITS =3D 42, .PABITS =3D 49, .insn_flags =3D CPU_MIPS64R2 | INSN_OCTEON, --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305154; cv=none; d=zohomail.com; s=zohoarc; b=ejBDzl0W5DZAf2zWFEWuCM+8KYNQF23W03HfsJ01tsHNqVsH2jFOsWHqnmGbpvumDOVbW9obvAAbJi0CFvw9qrQ9D/j0Fm/x2MLccHtp0bPkKl5ryp9y3Jiz0WV8dDWLrh6bvDtYchlzyD0Phy2eIeKAl8uUpnKSdResMv6n1lI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305154; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=FHjCZ7KVIxzeg05WmD+TUQ0R2S/YJeIXd2CK/WPq1eM=; b=JF4bJPsdS49E1OXl2XpZ/sz0PzmPS5cHwYJVMcv4cjYJ6t1faL21QbYZzddpeTz9gI8wGVdZz6bbh9RJUVxCNh8hW4axF2QQijGW3DrXgZDejKJf0TsTD06G/YBwnaqfSfmKkc0yV2Ku/2UvhWIwnz7FbTl3Hhs9sKpiiqsiOr4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305154772339.0617638240004; Wed, 20 May 2026 12:25:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmYB-0001N8-4P; Wed, 20 May 2026 15:25:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmXe-0001BH-D0 for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:18 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmXc-0002Et-9q for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:18 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-43d7e23defbso2962728f8f.0 for ; Wed, 20 May 2026 12:25:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45d9ec3acf7sm57181146f8f.12.2026.05.20.12.25.13 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:25:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305114; x=1779909914; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=FHjCZ7KVIxzeg05WmD+TUQ0R2S/YJeIXd2CK/WPq1eM=; b=dUOwBC6IWy8FJyA9tj6ngHV2Uoi9ocGbJdCuoiDR8fOmr00SddWoOMGwYcZZ4gYlJd yK3Jij7xQ093HB91Sk2IYeWOIyzds0bgESIvPMPZT24tYVoa8lYix06wvADG/ndYzwfo 4H52dCPzZqekfFIRBtUj+ajAxi2UgNC6NZp0GwBy/GCb9CIEIA7RyUkooJMN2np+JuzE IIiMBWvPDvPp8EAW+rt7efEw8kwNpMcaWWLmxhOUJ/CkzOhpFmeOZ/ZhuSF3ZoWtZTI6 40rV4yM3zqMLkKQeD+9o4aqWr/5/P2CRoEPxzY2L3LDtkewgWsznXeH+gpPWr5rmv6mk UK2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305114; x=1779909914; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=FHjCZ7KVIxzeg05WmD+TUQ0R2S/YJeIXd2CK/WPq1eM=; b=mS+N3psLetIvI7CArHBCAYh5OiN+3C9WGniHvgCtQVz9k2Dg79fJUlVqYsaZ/pIHj7 X9NA2qBK9EZb6G88BOQy/jwPnNuTYApkRu0RUHUE8TVYNbhask+b/b1t4Zu+PyOQfZ18 uydL/yOaynTqFbV0YxCayMCLzjZRYQ0UjpSwZlnk3G/YJLFd5NkacmJLc6thYv2unY+C fVGUUjNabrFXKUyAFcjy0Thec7yDWfhFo+fuEO4+V1ZrDXxpOZNrdVcP2n+JotCqF6zU CuIol/0E5q/atBT2kIsUHIJ4ocGNHBaymF5Q/ubzYCklw0ZwKgKKOSpoX9Zs8roPfcCE VBxg== X-Gm-Message-State: AOJu0YycJSZYQrCK4jQQC8iF7kdfaafvg7J2hX6+ZSBAU2tU8VS/VwtN 8g+INi5cLmcw3Y9/RUnuIVVwAJX4VLMSB2s/YjoM7OcLiLvSMIF2zv69hDugOIO0tRFIb95hSiD Z70Sw4sk= X-Gm-Gg: Acq92OHaGvPkbSvPWy+NRWiXTywK0Lou3r9wQHYmRAWCT0Rb+1dud00p4ia0sMmACrc V1diZ2hTXE3vPeKhcsqSpPmbbabevMCM5Ocu08zOtzJak9KcAUKi3u8eIT/Pu6mu1BZQZc8aGF3 XyvOp+3Ue8x0GWbfdtGGTTl24jJbSQESbZgmPnuEP5bMGXqmBIJbetAP3jvZMb062Peb2A+HHpL T+BHv8dMxXcNzCAZTcy9Q+WFKjbaStWzJCBmNT9zZafOUzjvTiBLrijfz9ZBHctz/FjREsegwwG qEFaK67jbzCKgH1/TerwbglfSpy077uykqny5Ib1xGJ++xWiShqS7GxLlmxxlmfyrxuYHl6Adum NIGESqTRPJ8js2JmgwH3jUiWgaqto5xuMiyqEsRx5RvdRaIqAHOdGEy83Wo5bSpBkZQHc/s/Xez T5TZyPiqVrr2Iq7j7CXmXfV/ONIK20natMdwdEAQ56Ipt5Q2vR+tLRqXNDBSRoELGNeXZFbDlW X-Received: by 2002:a05:6000:2503:b0:45e:93ac:769e with SMTP id ffacd0b85a97d-45e93ac76ddmr7663708f8f.6.1779305114270; Wed, 20 May 2026 12:25:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 13/33] tests/tcg/mips: add Octeon instruction smoke test Date: Wed, 20 May 2026 21:23:18 +0200 Message-ID: <20260520192338.40036-14-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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: qemu development 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: 1779305158133154100 From: James Hilliard Add a mips64/mips64el linux-user TCG smoke test for representative Octeon instruction paths. Run the test with -cpu Octeon68XX and share the source between the mips64 and mips64el target directories. Signed-off-by: James Hilliard Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260520172313.23777-6-philmd@linaro.org> --- MAINTAINERS | 2 +- tests/tcg/mips/user/isa/octeon/octeon-insns.c | 13 ++++++++++++ tests/tcg/mips64/Makefile.target | 20 +++++++++++++++++++ tests/tcg/mips64el/Makefile.target | 8 ++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 tests/tcg/mips/user/isa/octeon/octeon-insns.c create mode 100644 tests/tcg/mips64/Makefile.target create mode 100644 tests/tcg/mips64el/Makefile.target diff --git a/MAINTAINERS b/MAINTAINERS index 7496ace6d5a..0600d494588 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -310,7 +310,7 @@ S: Odd Fixes F: target/mips/ F: disas/*mips.c F: docs/system/cpu-models-mips.rst.inc -F: tests/tcg/mips/ +F: tests/tcg/mips*/ =20 OpenRISC TCG CPUs M: Stafford Horne diff --git a/tests/tcg/mips/user/isa/octeon/octeon-insns.c b/tests/tcg/mips= /user/isa/octeon/octeon-insns.c new file mode 100644 index 00000000000..aef23fb9465 --- /dev/null +++ b/tests/tcg/mips/user/isa/octeon/octeon-insns.c @@ -0,0 +1,13 @@ +/* + * Test Octeon-specific user-mode instructions. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include + +int main(void) +{ + return 0; +} diff --git a/tests/tcg/mips64/Makefile.target b/tests/tcg/mips64/Makefile.t= arget new file mode 100644 index 00000000000..042855844a8 --- /dev/null +++ b/tests/tcg/mips64/Makefile.target @@ -0,0 +1,20 @@ +# -*- Mode: makefile -*- +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# MIPS64 - included from tests/tcg/Makefile.target +# + +MIPS64_SRC=3D$(SRC_PATH)/tests/tcg/mips64 +MIPS_OCTEON_SRC=3D$(SRC_PATH)/tests/tcg/mips/user/isa/octeon + +# Set search path for all sources +VPATH +=3D $(MIPS64_SRC) $(MIPS_OCTEON_SRC) + +MIPS64_TESTS=3Docteon-insns + +TESTS +=3D $(MIPS64_TESTS) + +$(MIPS64_TESTS): CFLAGS+=3D-mabi=3D64 + +run-octeon-insns: QEMU_OPTS+=3D-cpu Octeon68XX diff --git a/tests/tcg/mips64el/Makefile.target b/tests/tcg/mips64el/Makefi= le.target new file mode 100644 index 00000000000..dbc5f8dc5fe --- /dev/null +++ b/tests/tcg/mips64el/Makefile.target @@ -0,0 +1,8 @@ +# -*- Mode: makefile -*- +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# MIPS64 little-endian - included from tests/tcg/Makefile.target +# + +include $(SRC_PATH)/tests/tcg/mips64/Makefile.target --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305232; cv=none; d=zohomail.com; s=zohoarc; b=NfXSaL+7pbO8z5ju4e18Ru+1rFHdTNV0TSbr/J7w8+riuK27MTtUub29TaCD70+A24rJKlnlL2flUhbWdXLYsMw95JzwivP60zDdJ0cl+DE6TptbSap02RbbawJL7d5q7gZoNFCB00EdilanNWz03CUiw2NRctKP4ho70rN7bzw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305232; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=UV1UK52bSabfrT6zByPj5m8iMxPKxH4NciG4IFW+suo=; b=mNSJoOAFcxo+pxy+0cSUgNEH56WMXgq63F8iDhx2rRNFSeR27EyBv9Vi8E8IwpJCMUnemEvlfGFvZMRnox4Npes+A8KN8FoX0/eFhOgu+gaP73OfrR+e/RsrwLMR0Vz35FAm06IZtcSdvO2Z0VFHBnLnqfhw7aQvW5IWL4WwLo8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305232943461.898621171391; Wed, 20 May 2026 12:27:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmYD-0001YR-Ss; Wed, 20 May 2026 15:25:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmXl-0001GH-DQ for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:35 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmXj-0002G0-7H for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:24 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-48909558b3aso55013525e9.0 for ; Wed, 20 May 2026 12:25:22 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49033d2fa88sm10442075e9.3.2026.05.20.12.25.20 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:25:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305121; x=1779909921; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UV1UK52bSabfrT6zByPj5m8iMxPKxH4NciG4IFW+suo=; b=vjAkFIBeT7iNSo/w7MQEg564pcApsPH6nXgJMzw/S/6KDVgaXis2Hci4HRcnRCUJbR gfLrxGeJGDZBeZvAYsmnVjzhDHyCIeWtdjf9A1d1NTCW6TYxFho2QHxDfdtUd4Q3cgpf 3zawSOORtsFnroLxgX2zg11hWiEcWfKmWfKFzatLjvelw7GpnREA7m/vIorB+P/5LYvn Ex7UEMCeN098vNNEi/+uQaIKSZpEcVDm4iJrE/gsHCwT3zPEKq2A6Uow2pDWaYhbbXxF 4yJN4bJbppicgoL1QSo8kdEqC1gMeVJypz9g7rQBHkk/S7Ua97PkZwiUsJPZe9EbqwBb fRpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305121; x=1779909921; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=UV1UK52bSabfrT6zByPj5m8iMxPKxH4NciG4IFW+suo=; b=U2AbuCVn8dTgSBJ8FPsvUbbcvP/wVYaosHivo6XLoPKVVhu9mtPy6U5I6HeTgXy73k TzJ3ZW9XVyQsyqyBWxcBfI9xApaxb6gColq3NJOskMRN3vOqEmeWFeI4YGfEjzUMg6nN O5eM4xGN1VFaQdIILrpphV7fOhldrGR1LwR+oLsZcGkmtLP8KsKI5Ds+XfZsxY6m/DS5 D7r2dnUyx4UKGVYDXsa8X5BvdZlYiTg3Lpjcjhd3ioR4OVeQDpBodV9tL01XbtEmQoVS a4CnRIuJGWh4BX7nA3q7/Tn39tt5gBwrl3URktj+FPZHyAfKS4bceGxhUhSGycsubE/8 +kFw== X-Gm-Message-State: AOJu0YwPRis2d4KpFtda3WdT77wpXCBYCqAKiKZRMZcmuI62nl8udLF8 CAZ7DrDM6sH6yNcSiqXjtEQ/Rfw/xekpiwvb2ZM5KSFODKOKxt9GZw7acYJWGsiVdgiCLBWUVZ9 tkF/tfSc= X-Gm-Gg: Acq92OHrfIuFFlHC8c24sPZWmWREwgh9ZgjDNRtUKcjggndlHlX9rj+fO0Nc2oWHCgA fUHKTo8ZAYFG9d5DPy4TuPHaVw9x51x/hf2Ns1HWEWTUsh5bTV7zNUNFwCobqIEw2n4ehR/8WoR iw15WfIEIwZhgJPDAcJHR56PtZNeO+0u+oZyJLcaBhpPBKjw+drxzcA1yGz+gIlTzFDb3mLEyAA 26yVxpwZ92+qwKm/q/WqZzqY7O9ub0b0pgiUkGIMVTAlhEcbQkGE3j6aMde/JNzcacx60Mfcreo AgNd8iffd3B82SxhMSn5tn6FsejD1X7naWKc5uk/RDkjZyJCfW4J3qR2EyPTMIl5qZUMSs7sC50 jFAgbiQ30iGmgo4uemTMT2hoIEQ5I00TiefY8fv/zRVjxzJ4624dIC2SKR6cHOrnYdZdpbDQIHu FguTeDD6P0KOU+/fCocnnkYJCpf9qvUl6AjWMo5PS7tEgrReAUQSao5Bhjh0PeDeBTtWrLdEtC X-Received: by 2002:a05:600c:46ce:b0:48f:d2b5:d7 with SMTP id 5b1f17b1804b1-48fe60edd2dmr373136285e9.12.1779305121532; Wed, 20 May 2026 12:25:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 14/33] target/mips: fix Octeon arithmetic destination handling Date: Wed, 20 May 2026 21:23:19 +0200 Message-ID: <20260520192338.40036-15-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: qemu development 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: 1779305235700154100 From: James Hilliard BADDU and DMUL write their results to rd, not rt. Route writes through gen_store_gpr() so rd =3D=3D $zero is handled consistently. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: James Hilliard Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-7-philmd@linaro.org> --- target/mips/tcg/octeon_translate.c | 16 +++------ tests/tcg/mips/user/isa/octeon/octeon-insns.c | 35 +++++++++++++++++++ 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index e1f52d444aa..4dd76268350 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -45,18 +45,14 @@ static bool trans_BADDU(DisasContext *ctx, arg_BADDU *a) { TCGv_i64 t0, t1; =20 - if (a->rt =3D=3D 0) { - /* nop */ - return true; - } - t0 =3D tcg_temp_new_i64(); t1 =3D tcg_temp_new_i64(); gen_load_gpr(t0, a->rs); gen_load_gpr(t1, a->rt); =20 tcg_gen_add_i64(t0, t0, t1); - tcg_gen_andi_i64(cpu_gpr[a->rd], t0, 0xff); + tcg_gen_andi_i64(t0, t0, 0xff); + gen_store_gpr(t0, a->rd); return true; } =20 @@ -64,17 +60,13 @@ static bool trans_DMUL(DisasContext *ctx, arg_DMUL *a) { TCGv_i64 t0, t1; =20 - if (a->rt =3D=3D 0) { - /* nop */ - return true; - } - t0 =3D tcg_temp_new_i64(); t1 =3D tcg_temp_new_i64(); gen_load_gpr(t0, a->rs); gen_load_gpr(t1, a->rt); =20 - tcg_gen_mul_i64(cpu_gpr[a->rd], t0, t1); + tcg_gen_mul_i64(t0, t0, t1); + gen_store_gpr(t0, a->rd); return true; } =20 diff --git a/tests/tcg/mips/user/isa/octeon/octeon-insns.c b/tests/tcg/mips= /user/isa/octeon/octeon-insns.c index aef23fb9465..b7610db812e 100644 --- a/tests/tcg/mips/user/isa/octeon/octeon-insns.c +++ b/tests/tcg/mips/user/isa/octeon/octeon-insns.c @@ -7,7 +7,42 @@ #include #include =20 +static uint64_t octeon_baddu(uint64_t rs, uint64_t rt) +{ + uint64_t rd; + + asm volatile( + "move $8, %[rs]\n\t" + "move $9, %[rt]\n\t" + ".word 0x71095028\n\t" /* baddu $10, $8, $9 */ + "move %[rd], $10\n\t" + : [rd] "=3Dr" (rd) + : [rs] "r" (rs), [rt] "r" (rt) + : "$8", "$9", "$10"); + + return rd; +} + +static uint64_t octeon_dmul(uint64_t rs, uint64_t rt) +{ + uint64_t rd; + + asm volatile( + "move $8, %[rs]\n\t" + "move $9, %[rt]\n\t" + ".word 0x71095003\n\t" /* dmul $10, $8, $9 */ + "move %[rd], $10\n\t" + : [rd] "=3Dr" (rd) + : [rs] "r" (rs), [rt] "r" (rt) + : "$8", "$9", "$10"); + + return rd; +} + int main(void) { + assert(octeon_baddu(0x123, 0x0f0) =3D=3D 0x13); + assert(octeon_dmul(0x12345678, 0x10) =3D=3D 0x123456780); + return 0; } --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305191; cv=none; d=zohomail.com; s=zohoarc; b=Tgc+0fptkFQpKxtA91pJqLvr2/qtyO625E9LrEq2W4R9DyF044vmrU/Acjm4/VowcL93h7dHqidc2/7lSLvjdPpsFeKmTPswNmneDxABZreGMmG8n49HYUl3p9k0xxBnysBY2iLN6w3xY/2CYVWXh3+/O18Y25Dy4kjC0I1k5cw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305191; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Lonuu/jFbxnJeN8rOKckLrLcyfPzV1Uide91cS0SLpU=; b=MHgyw9UO6HLfveo4WsPxo3932BLsQEvLEI74617eQbpcEppl5ZstQYhzdUw4o1nQFoCqT9w/ArZ2sq7wiup0xWqZxO5nn7+IDTZ4Ab7MiS9gY1A/5FGexutetVW/iISfYqkNg+XTyl98ospArvQqElUkm30CVguJ0Mtcd/JJ+OE= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305191564716.8012113795651; Wed, 20 May 2026 12:26:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmYb-000253-EV; Wed, 20 May 2026 15:26:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmXs-0001Gw-4S for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:44 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmXq-0002H7-Gj for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:31 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-43d75312379so4352327f8f.1 for ; Wed, 20 May 2026 12:25:29 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0a17a22sm56785631f8f.22.2026.05.20.12.25.27 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:25:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305128; x=1779909928; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Lonuu/jFbxnJeN8rOKckLrLcyfPzV1Uide91cS0SLpU=; b=ziMBPP8P5k2IYrN8VP+cqrHB3hWBhIHfceNhuH3StDUu0FrhEYXGYzzXmhX3b1QKKw Af/61ygQtrx74812/tgoVecuQiZauFX4ood2CRsmOm2073DEh0W+L49onVptLSnp6VFY 15HQwlcUmnuGrUNY+IG42i5ybflHZSOf1DeF4FS58p51LQ0LDPbBFDQ4C0cA+GXkFG+0 gGGnz4I6vYRDQgh+O/zwt1Jl7JWHnh3PTqSoa4iT4dQUAbFjSalmDBBj3uKMCDRngwIK D0fQtRBTSWJO+9enrRUOh2hL+rAOna+J5ttc/VGacsnjfCQ+hsNiddqyPKxkXCEWo4LT R9RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305128; x=1779909928; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Lonuu/jFbxnJeN8rOKckLrLcyfPzV1Uide91cS0SLpU=; b=GMzMqed+LOfXvqrDW2HaVNyyyf8hnuWokBbFiAiZoXoylFSpM+8Ed9kuFdIWjCHF+B tx+curn3JynXce/T++Vu53ryrs4MV/izTOLuMSGK5zLuR76QAdYP76PDUgaY5BQHMIrT akJTh3JlhoeOHKpwXAhcvxc4+Q5UTuf6Oj+QYby7EJLIQ2B5DD7ari3nHJgJqRW0z0+I UlssAutwzwG2lknYqihqO9ROz4j1eYvD6NlLLIwk7QH36z2UN/KzpvGYXWAGvigKxBtT HkFdc5WjggpJyU7nZcNmv9g7ecy+5w1BO9sadxFX6SdD1pmZONN34K56uJt4cAwhc3U4 Cv2Q== X-Gm-Message-State: AOJu0Yw5uNQ7FLM7JXXFyvvZzranFQHj+6X0GWaGKYG9Rip8hW1IL6kf OUji2PhZfLead5bla6UiPf7aIY1Yc9TPU/riruWSIu99tA4KlzybcE6wkUaW0sFKHRK5kJmPVA/ zqgSnJoA= X-Gm-Gg: Acq92OFrH2UylOCmwkr5HIJRdR29nEgEXJeNb/kFeizSsOIMRifNtGKJakbDjMrbgKK Lxtw/UvKAED7deGOm8eNmGCKSsgprm70E0xNPGVXbBoZGXQjQCilqXiMG802a6sRR9l14s2UVKJ KFCrgyw9JK0DNpjw6HKOv1PB7VKAZEJRuDmPdu9cncIqPRGQZNSkbC0YAtekirtChk1DGssiPdD +KpeU3iHuzOBsWVRHkEqtZRP9EhRa4Z3q0yYdIrm/DO5aJnwlWc5BY9CGRFEHisysJdUdcRF4o1 CgpTUNcFr/+H7f4JxMSK7S2e1+q03JQ/Zi6lJGXtTKC+HCQJUOgx7hj7bqV7i1Gtehh4HCzm+V1 j8LXk8XuN/w99qSjE/8fpXq0c+yMIsspGYP+45X+BtcMnYQzqhSeIIACmJcqu83VzDOPk9b0Piw 54/kOca5Ze5XNmt1XPq9auZDX242PWoaMN108RxBKHoP+A2f/l1YAGODh6OaLDkYnFJ+8oB1t19 gh7z6wBUVY= X-Received: by 2002:a5d:5f55:0:b0:452:bc74:b129 with SMTP id ffacd0b85a97d-45ea0d6c14emr1289402f8f.16.1779305128301; Wed, 20 May 2026 12:25:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 15/33] target/mips: drop Octeon zero-register fast paths Date: Wed, 20 May 2026 21:23:20 +0200 Message-ID: <20260520192338.40036-16-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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: qemu development 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: 1779305192920158500 From: James Hilliard EXTS, CINS, and POP route their destination writes through gen_store_gpr(), which already discards writes to $zero. Remove the remaining translator fast paths for destination $zero so these Octeon instructions follow the same shape as BADDU/DMUL and the generic MIPS translator helpers. Add a mips64/mips64el linux-user TCG smoke test for representative Octeon population count instruction paths. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: James Hilliard Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-8-philmd@linaro.org> --- target/mips/tcg/octeon_translate.c | 15 --------------- tests/tcg/mips/user/isa/octeon/octeon-insns.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index 4dd76268350..b7531653e58 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -74,11 +74,6 @@ static bool trans_EXTS(DisasContext *ctx, arg_EXTS *a) { TCGv_i64 t0; =20 - if (a->rt =3D=3D 0) { - /* nop */ - return true; - } - t0 =3D tcg_temp_new_i64(); gen_load_gpr(t0, a->rs); tcg_gen_sextract_i64(t0, t0, a->p, a->lenm1 + 1); @@ -90,11 +85,6 @@ static bool trans_CINS(DisasContext *ctx, arg_CINS *a) { TCGv_i64 t0; =20 - if (a->rt =3D=3D 0) { - /* nop */ - return true; - } - t0 =3D tcg_temp_new_i64(); gen_load_gpr(t0, a->rs); tcg_gen_deposit_z_i64(t0, t0, a->p, a->lenm1 + 1); @@ -106,11 +96,6 @@ static bool trans_POP(DisasContext *ctx, arg_POP *a) { TCGv_i64 t0; =20 - if (a->rd =3D=3D 0) { - /* nop */ - return true; - } - t0 =3D tcg_temp_new_i64(); gen_load_gpr(t0, a->rs); if (!a->dw) { diff --git a/tests/tcg/mips/user/isa/octeon/octeon-insns.c b/tests/tcg/mips= /user/isa/octeon/octeon-insns.c index b7610db812e..f406726fc11 100644 --- a/tests/tcg/mips/user/isa/octeon/octeon-insns.c +++ b/tests/tcg/mips/user/isa/octeon/octeon-insns.c @@ -39,10 +39,26 @@ static uint64_t octeon_dmul(uint64_t rs, uint64_t rt) return rd; } =20 +static uint64_t octeon_dpop(uint64_t rs) +{ + uint64_t rd; + + asm volatile( + "move $8, %[rs]\n\t" + ".word 0x7100502d\n\t" /* dpop $10, $8 */ + "move %[rd], $10\n\t" + : [rd] "=3Dr" (rd) + : [rs] "r" (rs) + : "$8", "$10"); + + return rd; +} + int main(void) { assert(octeon_baddu(0x123, 0x0f0) =3D=3D 0x13); assert(octeon_dmul(0x12345678, 0x10) =3D=3D 0x123456780); + assert(octeon_dpop(0xf0f0f0f0f0f0f0f0ULL) =3D=3D 32); =20 return 0; } --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305204; cv=none; d=zohomail.com; s=zohoarc; b=gHekC70O5Vpyfm5b5dEpjiv3UwGq6JIWFzW8WNBguRABAzw0m9Ie+OeW/evR7MYIiyKXqOT+8IYF2nFpoQv3ARgfj4ny4Wzuyum6848hNo/nMIc9K5Z/m4UipmzCY73t470YKjsdEk6xOkNAroREa7hgjhBCRQirdnC+a/AvA/4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305204; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=VDRhwYEqmpDSzo+v5sp6b2yZnyF/Vt7EldX72tuF8f8=; b=P1ZTkH6K3KS9X8wpbZC4rsrzlAcGR+MkedgRPipmlcI/O+OIhEjjmoaB1Pg36iHSAs5D7HtX3TW/hVx9TUr3JMIihY4GW7esJ8b2W0htwBZt7O5OxLn2a8aqjhKIzQqngTj0Haor1IzHAPjtZsOBiSSUa1YhPFQK1f8TkJySneE= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305204309165.78644762660383; Wed, 20 May 2026 12:26:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmYb-00022M-5P; Wed, 20 May 2026 15:26:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmY2-0001Kp-F0 for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:46 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmXx-0002JL-DC for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:40 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-49021532ebdso21601805e9.2 for ; Wed, 20 May 2026 12:25:36 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49033d34fd4sm13669685e9.2.2026.05.20.12.25.34 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:25:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305135; x=1779909935; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VDRhwYEqmpDSzo+v5sp6b2yZnyF/Vt7EldX72tuF8f8=; b=ViQEAlsDxe0mgEWCCgQcG05lbcT5tDD52pP/+pp9AyobZ5pEYVscwJ2SbchVei/KWT e1l3Y5CsSIKG9agvmvFGIZsXVj5Ak8P+l+Q+Z/TnrzTwErVin2SHEsYWG2tSk3BMabLl ILW2R1Ovfwns1Yd2qdhdkt95WgpB4vxq+YP60IvkZuyl5Q/ZAhFsBYLDUUKhpyY4cjc1 Ba9LVYE8cGmxGUA1sn5A4HG+DU/prhXePV+3UHIqMd+oBZycsdBwybJMEs+4lfIDiMic W99GmmuluqP+WgSXDC47rYC2R73f8PaQ0UsVJ+SAre1vF00yt8ujYe5BDJj6CKxIomlU 4eGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305135; x=1779909935; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=VDRhwYEqmpDSzo+v5sp6b2yZnyF/Vt7EldX72tuF8f8=; b=ftu691tOzvBOx/odpRNriPyE1060T1Dg6tiTtjx16wa1BXSbAz3X4mtw3nta8sdsw4 ahkcdL0GsXxU5OakJC6pai7sokr6/It/xsc2wakPQGXHI/+IGt3LpUgCRrwRbW5f/ArM nw9p2tnrPvi+XsQm8abYpG3bkUOKmZL3BYfPinXqvDmtt5xfonPe74WpS9CTtkRHFL8d k2pzcnL0ErcKFcQkWMOz58ePC/KaTMva7ZSsnM4cEBK9B6Xa8zb6wWLZa5lMGw3NM1yk qd3C9FopXBW67EhrwRvzkRsnA6krZVAkrBUVQiRRPf9RLj+AQbDaf1Rp4RwfwgiU1AJ8 SLzQ== X-Gm-Message-State: AOJu0YxAg8KeSRAMbwLRy0WK5P1cQEvlWMDpB16TNE6BHQnXfq3NEs/B gqJ8j0EgbN9/4YTYEFiC1jbkZEtjUaaqm6ilydwzdNCu9MokR/lHo1cVts6nr9SOTKLaIKfZ5V8 U0j+ak98= X-Gm-Gg: Acq92OF/K+wJtLTH4JZjUAQbUngrpE5OS8bsO310iVRW2z0pjCFpcqe5Wa1+1X6PxaM bEdX64YL3Ntxt6XKfDT/fH7705kclUh7UPXRIkvRnpYL7YkOZFNKsmX4Nfsk6vT3d17DYqgYMnC OZ/GPNeipFd1C359cWl2N1Vz7noRfE1RhGVIqg8ws+3Py2ZND+COnyZv09IhUNghg2/6ScaLNlR e3HiS9JHNN6WsVtvJYoDYtNk9xeQe3A+bpzzSH9LN9dv4HIw5GDQ+4plUrjt6/zAgF1hLWTKm46 gvG3sTRUJfF/EGZkCsxqdDEscavd+jz+ZvJfAdCz7stXzzMG87RSD4pg3w4EoRLPxNJdoQlTgvk ra7K8UnF3aM3aQ06MhgyDt90yCC57OOdtOMgYcf/kKQJpAObvaZ1U2qqrWVsaM+vxttvLdBsi1u SY7OMozuQOYxy96u9CrixxtAGCrH7WZJfwYaARZrEYM4g9hEZmf+k0y3g99pjlPmphVmYWBtKE X-Received: by 2002:a05:600c:8b67:b0:489:1d74:56d with SMTP id 5b1f17b1804b1-48fe6325a52mr453794695e9.29.1779305135074; Wed, 20 May 2026 12:25:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 16/33] target/mips: split Octeon SEQ/SNE decode Date: Wed, 20 May 2026 21:23:21 +0200 Message-ID: <20260520192338.40036-17-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: qemu development 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: 1779305207277154100 From: James Hilliard Decode the equality and inequality forms as explicit SEQ/SNE instructions rather than using shared generated SEQNE entries. The explicit decoder names match the architectural mnemonics, which makes the translator entry points and trace/debug output easier to correlate with the instruction set. Reviewed-by: Richard Henderson Signed-off-by: James Hilliard Reviewed-by: Philippe Mathieu-Daud=C3=A9 [PMD: Split SEQNE (this patch) vs SEQNEI] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-9-philmd@linaro.org> --- target/mips/tcg/octeon.decode | 3 +- target/mips/tcg/octeon_translate.c | 25 +++++++------ tests/tcg/mips/user/isa/octeon/octeon-insns.c | 36 +++++++++++++++++++ 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/target/mips/tcg/octeon.decode b/target/mips/tcg/octeon.decode index 102a05860df..2c54901f77e 100644 --- a/target/mips/tcg/octeon.decode +++ b/target/mips/tcg/octeon.decode @@ -38,7 +38,8 @@ DMUL 011100 ..... ..... ..... 00000 000011 @r3 EXTS 011100 ..... ..... ..... ..... 11101 . @bitfield CINS 011100 ..... ..... ..... ..... 11001 . @bitfield POP 011100 rs:5 00000 rd:5 00000 10110 dw:1 -SEQNE 011100 rs:5 rt:5 rd:5 00000 10101 ne:1 +SEQ 011100 ..... ..... ..... 00000 101010 @r3 +SNE 011100 ..... ..... ..... 00000 101011 @r3 SEQNEI 011100 rs:5 rt:5 imm:s10 10111 ne:1 =20 &lx base index rd diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index b7531653e58..dfbb55e3fc3 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -106,29 +106,32 @@ static bool trans_POP(DisasContext *ctx, arg_POP *a) return true; } =20 -static bool trans_SEQNE(DisasContext *ctx, arg_SEQNE *a) +static bool do_seq_sne(DisasContext *ctx, const arg_decode_ext_octeon1 *a, + TCGCond cond) { TCGv_i64 t0, t1; =20 - if (a->rd =3D=3D 0) { - /* nop */ - return true; - } - t0 =3D tcg_temp_new_i64(); t1 =3D tcg_temp_new_i64(); =20 gen_load_gpr(t0, a->rs); gen_load_gpr(t1, a->rt); =20 - if (a->ne) { - tcg_gen_setcond_i64(TCG_COND_NE, cpu_gpr[a->rd], t1, t0); - } else { - tcg_gen_setcond_i64(TCG_COND_EQ, cpu_gpr[a->rd], t1, t0); - } + tcg_gen_setcond_i64(cond, t0, t1, t0); + gen_store_gpr(t0, a->rd); return true; } =20 +static bool trans_SEQ(DisasContext *ctx, arg_SEQ *a) +{ + return do_seq_sne(ctx, a, TCG_COND_EQ); +} + +static bool trans_SNE(DisasContext *ctx, arg_SNE *a) +{ + return do_seq_sne(ctx, a, TCG_COND_NE); +} + static bool trans_SEQNEI(DisasContext *ctx, arg_SEQNEI *a) { TCGv_i64 t0; diff --git a/tests/tcg/mips/user/isa/octeon/octeon-insns.c b/tests/tcg/mips= /user/isa/octeon/octeon-insns.c index f406726fc11..3c3802ebfee 100644 --- a/tests/tcg/mips/user/isa/octeon/octeon-insns.c +++ b/tests/tcg/mips/user/isa/octeon/octeon-insns.c @@ -54,11 +54,47 @@ static uint64_t octeon_dpop(uint64_t rs) return rd; } =20 +static uint64_t octeon_seq(uint64_t rs, uint64_t rt) +{ + uint64_t rd; + + asm volatile( + "move $8, %[rs]\n\t" + "move $9, %[rt]\n\t" + ".word 0x7109502a\n\t" /* seq $10, $8, $9 */ + "move %[rd], $10\n\t" + : [rd] "=3Dr" (rd) + : [rs] "r" (rs), [rt] "r" (rt) + : "$8", "$9", "$10"); + + return rd; +} + +static uint64_t octeon_sne(uint64_t rs, uint64_t rt) +{ + uint64_t rd; + + asm volatile( + "move $8, %[rs]\n\t" + "move $9, %[rt]\n\t" + ".word 0x7109502b\n\t" /* sne $10, $8, $9 */ + "move %[rd], $10\n\t" + : [rd] "=3Dr" (rd) + : [rs] "r" (rs), [rt] "r" (rt) + : "$8", "$9", "$10"); + + return rd; +} + int main(void) { assert(octeon_baddu(0x123, 0x0f0) =3D=3D 0x13); assert(octeon_dmul(0x12345678, 0x10) =3D=3D 0x123456780); assert(octeon_dpop(0xf0f0f0f0f0f0f0f0ULL) =3D=3D 32); + assert(octeon_seq(0xabc, 0xabc) =3D=3D 1); + assert(octeon_seq(0xabc, 0xdef) =3D=3D 0); + assert(octeon_sne(0xabc, 0xabc) =3D=3D 0); + assert(octeon_sne(0xabc, 0xdef) =3D=3D 1); =20 return 0; } --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305239; cv=none; d=zohomail.com; s=zohoarc; b=MFPI5rlwOi7KX4ABjdH5To9trIbOcR7NP2bfAPeyqZvLe0M0+sOl5b+rATR5qjBkgC12Ki84dHCFYzjPSi6AW8Cuak4xtPxOuCRVbECMEn4pvwjlDndiItLr2QbGqkzyNe+mpl2rYRsduS+XPIrHIOmeEw1HxyPIxNhAxIUQOr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305239; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=U2Z40oWVLF/kpQasU7JFTmHMWs+RtYXMErFNxHICK6k=; b=nkFto4vjlfVkY0mw3+44rHiInR8SJWFdTAqVVdcEZXtJnt0ywjME5aU+3V5qUxakqQkzQdigxhFIDY2TGvFOoXoYUftOeJq4azc/tcyL5cdgLJ/9TyCJ1nsS1ED8lU/GjAFHDhjL+JJk+KKEQigATOfGtgLwabOIFuXGBFMgWOs= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305239962363.8416212873399; Wed, 20 May 2026 12:27:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmYk-0002O7-80; Wed, 20 May 2026 15:26:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmY6-0001NQ-KI for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:48 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmY4-0002QP-53 for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:45 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-488e1a8ac40so48914525e9.2 for ; Wed, 20 May 2026 12:25:43 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45d9e767ee0sm52486183f8f.1.2026.05.20.12.25.41 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:25:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305142; x=1779909942; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=U2Z40oWVLF/kpQasU7JFTmHMWs+RtYXMErFNxHICK6k=; b=yHp8lnIGScqLJgY2iQnhTKQzdXzzbNLBlwS4vxnEMefAGk2VakugAvm9FVPdHQrx7m aNBRjE2vNVKAQqlQab4WhgiCSkydqGZL2zZeDp1tJmSXw/M1yL5u8VdgNqkWgCI8FPZc zbwVPKprXv+jVrIlv1a0zamq0tmBYYAcEes6B30VXgC4F7jxW2U/FEk99J5/M80b8yt/ DGmHayjwwwScjn8w1Y9Fror5fitAUh8iQLQLoU5hhVbNMHRnPJN/ba2uz1OdMt2NaO1Y d6lfaj3z+7/QG8o4mG4uootak744EDzxx4bgmuymGHx3q2S4B+jyyi7ud5B2AX8XamZi 3rPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305142; x=1779909942; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=U2Z40oWVLF/kpQasU7JFTmHMWs+RtYXMErFNxHICK6k=; b=Ixuh5ve/YzChMdzht3worFFL7AoOgY/+d7vtdBHnrEf4LlJ0axw00wHtmzbGBn1ya0 ycZs8uk/TMnS5hVdyPlWjDPQpbuzKtlymvuA+oZXSr9quslmrsK2voCn5wWs7VFWBOGm prxNKDL3ys3NWrA5sPNhcNiiBgE6keYhGsAYq/s1UZuOOyURVmfCo3YmcT2iY9bHn3ep hy32nX2xs6Szof2s9gbplAPlWIlc5TW0X9DJxwkfryIjDHmMZHwOkvSJNRCF6x7k5x5n 8zDrmwFbynPGvFK8j80SBYGF/3CCJuu7SOW6KStfP1yz49yR5tad/o2WqfcJ+ll4qToq a/mg== X-Gm-Message-State: AOJu0Yy0dtiDqgteR3f3ojnLXyRg1oH3DSrLyk46YdiZfGx7LlCYeUDw 4mgTVqtEba1JalO3kbghbBv5LUc8qWXZ34mAWgbxHvbfuUswWW7QvP+xCtS/TdGaan58FdpiwI+ 3A5ydaS8= X-Gm-Gg: Acq92OFaZYLegyyqZ/QvUTtephhOjNA1qz9YsSkvK0VdEJamH+ATONFPKsw7JUL2boN zUvObH0d5Ze8M78IN244y9ylaLgQSeWv4kAH4A2w/6f1/+Vpy/TsoBoydNjTae+ItpwvsAwaVhU TeecFqDuXFTV4Lsra06VxPr8//dE90F8u2aRu1gkX14XzA5H4HWysI3NSRRXB+tApA/8jdBSiYf 5rPHv4qVAyTE/3OMRweGFDwJfY1QJw1DUYv3u1AkPTRLufZUTujUiNIU/vPH6KX5grWfk61NVwU namloUlc45/W8vZYMXHoviVhrvII9CtszarOMD6pFDUST7gF3WfvRQqhR6IbygMhrqR80ZuPjsu oALjsbewk/EDs95xd6wymvBnexPjtnb6W4Y+rQhq6jqqsOgB5uF7hKQr6DAjG7/iH2hhXz8vOQw 9DbVa1B8iAfJekOLUV0LYsuvwKyjuMgRFazQXh6IDPQQcamOtrP2ak4thiu3u0j3a3dmVDSlDK X-Received: by 2002:a05:600c:4fc9:b0:48a:7a10:4f17 with SMTP id 5b1f17b1804b1-48fe60e50b9mr352759845e9.6.1779305141919; Wed, 20 May 2026 12:25:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 17/33] target/mips: split Octeon SEQI/SNEI decode Date: Wed, 20 May 2026 21:23:22 +0200 Message-ID: <20260520192338.40036-18-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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: qemu development 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: 1779305241429158500 From: James Hilliard Decode the equality and inequality forms as explicit SEQI/SNEI instructions rather than using shared generated SEQNEI entries. The explicit decoder names match the architectural mnemonics, which makes the translator entry points and trace/debug output easier to correlate with the instruction set. Reviewed-by: Richard Henderson Signed-off-by: James Hilliard Reviewed-by: Philippe Mathieu-Daud=C3=A9 [PMD: Split SEQNE vs SEQNEI (this patch)] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-10-philmd@linaro.org> --- target/mips/tcg/octeon.decode | 4 +++- target/mips/tcg/octeon_translate.c | 27 +++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/target/mips/tcg/octeon.decode b/target/mips/tcg/octeon.decode index 2c54901f77e..a2bfd0751d3 100644 --- a/target/mips/tcg/octeon.decode +++ b/target/mips/tcg/octeon.decode @@ -30,6 +30,7 @@ BBIT 11 set:1 . 10 rs:5 ..... offset:s16 p=3D%bbi= t_p # SNEI rt, rs, immediate =20 @r3 ...... rs:5 rt:5 rd:5 ..... ...... +&cmpi rs rt imm %bitfield_p 0:1 6:5 @bitfield ...... rs:5 rt:5 lenm1:5 ..... ..... . p=3D%bitfield_p =20 @@ -40,7 +41,8 @@ CINS 011100 ..... ..... ..... ..... 11001 . @bitf= ield POP 011100 rs:5 00000 rd:5 00000 10110 dw:1 SEQ 011100 ..... ..... ..... 00000 101010 @r3 SNE 011100 ..... ..... ..... 00000 101011 @r3 -SEQNEI 011100 rs:5 rt:5 imm:s10 10111 ne:1 +SEQI 011100 rs:5 rt:5 imm:s10 101110 &cmpi +SNEI 011100 rs:5 rt:5 imm:s10 101111 &cmpi =20 &lx base index rd @lx ...... base:5 index:5 rd:5 ...... ..... &lx diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index dfbb55e3fc3..5497ddfb108 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -132,29 +132,28 @@ static bool trans_SNE(DisasContext *ctx, arg_SNE *a) return do_seq_sne(ctx, a, TCG_COND_NE); } =20 -static bool trans_SEQNEI(DisasContext *ctx, arg_SEQNEI *a) +static bool do_seqi_snei(DisasContext *ctx, const arg_cmpi *a, TCGCond con= d) { TCGv_i64 t0; =20 - if (a->rt =3D=3D 0) { - /* nop */ - return true; - } - t0 =3D tcg_temp_new_i64(); - gen_load_gpr(t0, a->rs); =20 - /* Sign-extend to 64 bit value */ - target_ulong imm =3D a->imm; - if (a->ne) { - tcg_gen_setcondi_i64(TCG_COND_NE, cpu_gpr[a->rt], t0, imm); - } else { - tcg_gen_setcondi_i64(TCG_COND_EQ, cpu_gpr[a->rt], t0, imm); - } + tcg_gen_setcondi_i64(cond, t0, t0, a->imm); + gen_store_gpr(t0, a->rt); return true; } =20 +static bool trans_SEQI(DisasContext *ctx, arg_SEQI *a) +{ + return do_seqi_snei(ctx, a, TCG_COND_EQ); +} + +static bool trans_SNEI(DisasContext *ctx, arg_SNEI *a) +{ + return do_seqi_snei(ctx, a, TCG_COND_NE); +} + static bool trans_lx(DisasContext *ctx, arg_lx *a, MemOp mop) { gen_lx(ctx, a->rd, a->base, a->index, mop); --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305205; cv=none; d=zohomail.com; s=zohoarc; b=M5tcPaZZtQR8dAYv+mVnLW+dpl+GvywVVJPTBc1U6zCZvrLAA0K5Cqo+JGp0xlRMrPsFweBB7JoYLt6eHfeQ2Qo7I6hE7LqBh1QE34uOg20TCNufi9tTcQK6DynMvUnfz57MRj1AwZo3B9gA8z0Uy1P/12PAQ9SV/VjTW3LRVzM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305205; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=NraKQUVW31QbKUPVKIEQlOzsQG6tUpBJXXvOVJ4Ctlc=; b=W9vU8DhgDm0lyUhyeZgaWwYbl6WSpdfZmtl/pPqLLBZ1JvIKxsZb+FR26QIjh+yVxcgzALRy3yIeM9O6bu1JtwmP8Bcgk04RAX7EUXoZ18xGkLcv3kH9r1D04/kVFEAGaOneoh3AchqXt2v1rK/XRbMkojCFrs7W1Ta5oliN/bo= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305205270763.6640879701896; Wed, 20 May 2026 12:26:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmYm-0002gA-P7; Wed, 20 May 2026 15:26:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmYC-0001Z5-LH for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:52 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmYA-0002TB-Tw for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:52 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-444826c16ffso4749487f8f.1 for ; Wed, 20 May 2026 12:25:50 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0a17a22sm56788098f8f.22.2026.05.20.12.25.47 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:25:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305149; x=1779909949; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=NraKQUVW31QbKUPVKIEQlOzsQG6tUpBJXXvOVJ4Ctlc=; b=ZkcXHlOg9iA31imYDPUXK6SHNqDKlG4ZIfdq7vFSRHFIgQnIbzZV0lf/+hHsxO9f0n 9fjYp8tTiIn0Rw3KKfiDD+9g3YLIO7f0Inwl81UOnPtktpUx9ZekQUadIY8r+NStduSf W77eCkCtehg91xSMy3VGh32uxryrjJ3TazC+2rAuWpPTy+8vdTxVu45WR8h4Z3Mw+3/E nGx5UJnSJ/GiFLQpfMLsOxR7VYq4kWHeKG985wISg4IVrMupsAt0PDr+UYjHrfhC34ok OlI0tkio73vOzDEHdYlsqIlVYHQQDK0ncbrqZ6F4YdiceCv44TaAq/ZgyKmGjo4xYDK5 S8iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305149; x=1779909949; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=NraKQUVW31QbKUPVKIEQlOzsQG6tUpBJXXvOVJ4Ctlc=; b=AW9bBfu2kJiMOOTp8ygmHAF5u/vccNs0lsJZIcWH7dNUPJr/5myiRSOM3Th16FougO bFZTDVD3Sv7VaJ7be9tRdwSZLoixg/2HrrP5gis5eD7+6FwDx0IBMURVl+CkByIVUrr9 qzpXE5gB/HNRZ5YfBaxo+2ZOXHliIxz56FukwLUhnjNeGdOBcJXUB1VjHUCjDdvinRj+ 80xbxGU8bBc/ty2hipZxVhrgVivn03cRs1MROrRNysksSpjgpA3DgMN/0O5EEkFxfJ7Q tJJ5XsS8lNO2Yx+4D1mPSNFW1g357uvHF/nbmNXVIqW9neTK03QDUvtabVq4ZH8vyXOq P/rQ== X-Gm-Message-State: AOJu0YzJyKNZs14LQ+0IJg4o+gK1H0F1XpdE4XiZaVEvPEKrTQ4RU45c yiciPjW2QwrkdqXHWIH7cRzIjuoUYHaTLh14/THaMzYwm6jQTPtqT3uFJHWqT6w7TaSIaxIazkQ NsB47ttM= X-Gm-Gg: Acq92OECPgqfjzpbkEAit7zFHYQ6LzM8HokPoyfKr7S13uFeS0PBx6VGmzYGs8zPKDQ fMxGWDY13/QavN7K4CTsg3/Ie/DEgf3DRTH/zoSGC9bffOxCXrjvCnxbiepzTFmEarKmp7XQiLu BfY1QPnVRdHyNsv0CqIJHeU/AsWRFGHo4fFFt/H8GwIEPd+TyhgjYOqw3csTWO9SpdjQv9sDcrc YmoUl+BcRbfppUCSyscqtDkq1iYBtOssxox6mxVuUUZVnJ+NxwD0sqmFE3LmnGSSoXKDQdkZ49r pm+BhuDEM4e99ITKmzn/8fO8MCajfyH3egH3xwsgpxnCozd6Rx6QRK7gpji7AAk1OTFslufmhnX OOLcyuk8iuv34tBTWp1XrAyb1jEPEVkVsv/X7YnVbiKSAKirExlDaDZ+h/0jRQJnGBuWjVGASCN TZI8friKdbuj3gkL27bJBnUllpupnGjlTPIzrOcgGRU44L088KH7ODmYItMrWFZ2AQiRKz6BAd X-Received: by 2002:a05:6000:25c6:b0:446:189c:ac4e with SMTP id ffacd0b85a97d-45e5c59f684mr40143450f8f.34.1779305148699; Wed, 20 May 2026 12:25:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 18/33] target/mips: add Octeon LBX instruction Date: Wed, 20 May 2026 21:23:23 +0200 Message-ID: <20260520192338.40036-19-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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: qemu development 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: 1779305207089158500 From: James Hilliard LBX performs an indexed signed byte load from base + index and writes the sign-extended result to rd. Wire the existing indexed-load helper to MO_SB so Octeon user-mode binaries can use the signed byte variant alongside the existing LBUX path. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: James Hilliard Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-11-philmd@linaro.org> --- target/mips/tcg/octeon.decode | 1 + target/mips/tcg/octeon_translate.c | 1 + 2 files changed, 2 insertions(+) diff --git a/target/mips/tcg/octeon.decode b/target/mips/tcg/octeon.decode index a2bfd0751d3..efb1a48b38a 100644 --- a/target/mips/tcg/octeon.decode +++ b/target/mips/tcg/octeon.decode @@ -49,4 +49,5 @@ SNEI 011100 rs:5 rt:5 imm:s10 101111 &cmpi LWX 011111 ..... ..... ..... 00000 001010 @lx LHX 011111 ..... ..... ..... 00100 001010 @lx LBUX 011111 ..... ..... ..... 00110 001010 @lx +LBX 011111 ..... ..... ..... 10110 001010 @lx LDX 011111 ..... ..... ..... 01000 001010 @lx diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index 5497ddfb108..451737cda1d 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -161,6 +161,7 @@ static bool trans_lx(DisasContext *ctx, arg_lx *a, MemO= p mop) return true; } =20 +TRANS(LBX, trans_lx, MO_SB); TRANS(LBUX, trans_lx, MO_UB); TRANS(LHX, trans_lx, MO_SW); TRANS(LWX, trans_lx, MO_SL); --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305191; cv=none; d=zohomail.com; s=zohoarc; b=duGMlfgb59RTPhj/ChuHWD6KCTLLnYizNR/dbv/H9btiWrl/QQXoPO2aPSnVx4Tco2h+1eFrAxC1e2rRtdbZ4M6l/ZBL8c1bS05/YriUbvgItPTdTHLjTzCwtIV+e7ccYYnFAjiBj0hn/r5eD4we3Vz7K2iTmtXvEzGygzH1lTw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305191; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=DxXDtkFhZKOWxRNtCtZ0V96NkTqI2RVN4zuIdmotLa0=; b=EsccQENNUoMG70ckK3ilC/K2r18QeS893OSJc2kCNu2MrhdSVRgW8LOre92iO2iFKF05LKCuXyxnYglTHtMj4CessRVlaw1nFeunsL5YP5jj9HaDi3ZQj1wHcLHqR0Mcj6tthInDTwJT1f4pIccLIW/ZaYlG/F9ERSeA0dOYb/s= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305191938339.953124533964; Wed, 20 May 2026 12:26:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmYj-0002NB-NB; Wed, 20 May 2026 15:26:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmYJ-0001vZ-Ho for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:05 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmYH-0002WK-NY for qemu-devel@nongnu.org; Wed, 20 May 2026 15:25:59 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-490229aa522so19586675e9.3 for ; Wed, 20 May 2026 12:25:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49033d3f99csm19435385e9.6.2026.05.20.12.25.54 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:25:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305155; x=1779909955; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DxXDtkFhZKOWxRNtCtZ0V96NkTqI2RVN4zuIdmotLa0=; b=cdpg4l8DUZA9CLh5oEfYspDs6beu+vVrnJxQt1T501o841ieaoeMgYDD+8ny/+OhXU btZFgkK5+jYqIw24j3L4VUSmTODhx45dWN65qKx3YCiwxyeGrb6+MQEF5x39e8gh7j0Z SRgmasmxTIlutxpuEDfTRJuTH/NO/nlSffah7p/Gc2UqG33kptfeO6CJwkMzEuTHKsK6 Dd/MPTaPWlKHVD0k7zdWcivoPY7aBQ//OIca+dOisacURWm0YOt4TPr44TYgPOIcPlq5 sfCrbTvls0s7dbSBOcRWjGPo0z5CWPeAB9QkwW5d6PCxE6hluM61mjQEq4O+I5I1z5A5 atxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305155; x=1779909955; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=DxXDtkFhZKOWxRNtCtZ0V96NkTqI2RVN4zuIdmotLa0=; b=UPPI1UB9rwLtw18Tr2Ois7RjP7aul6ItBPqIm1eji/VE/Ck9yGPDqp7uFsMLwNUY7i G8RMzjEEoKJ4kyqnLse2vKT6EbQccUzSmoJaAT4WuXYfvlTky/u+rv9HhHLBPfRasSe7 yA1TzkmR5+4sliEb7IGByR6XAvQApAbTTRSblp7Nk0gP3SYGJD+mFEoF5I3r9r31kYKl HNhC0D+juW6nGmnRzyQoLJT/PJA7plktUryaJI9/uklIpfmCz0SteBESah5MpWoOo+Gj zMOFw3EDjUD3tj/a5s69RpZLTjWNbsNme7i05fI/2SxZRlkMZM+UaeKWTA2ZdZ4sq+s7 NMeQ== X-Gm-Message-State: AOJu0YyeePLZBwRgBZ44sSAR6zmO8zPaI4mCc1RgHXRJg7BoML3qHR7O 8GSN00dx76W7CZyrhjtoKupMYw5JYYz87ZCXnQsRb11T82SznEn3l1OPNAWneiuzma9Sy8/vtsj JyIAD+hE= X-Gm-Gg: Acq92OF+AOKltKXCbxrpz55HRwhKOP5lPKJbSjv/5KAVE05ttOhnS0aUfAXVWTyWXv3 XmWmJ+t5vk33I2idPb2EpxtVl1+zwE16enmErvjgz2Kk0J8iMUsIBnPocE0v57sonvbrc4IyBtD YdJKYZL4B44FC/vUebEJwhf6Fkdp9r1Pw0b1ZVg70XLcO2NzHTmR96QCFeLlEKBOgukSk4Fb1Do fNR0uwMMF2xAGwrvCJGg97swQcenKScIMUJNA6DSzTDpaF4xpePRZT0iVbHfUon3WUC2Ay6wDMo Sd6CpnnZt+m7SH3M1HtRaUjkahCV3fyJ0hpXIU7/uEfJivEaDpfzN839C5Uj6YAQRQajJ2Rney0 m60roy4s1tNrSfhan7T/X/MmeNpL5P/miUG9zdbVE31LxhwjgjpJn8CEaI9kbZMjS0GoOtnxWRg HPy/VMXIQd2mV/1iko9qMUOANGu85mmxUwrOlhOZOn9m+skL5GVAylMuAnXLwe41LN802hW39s X-Received: by 2002:a05:600c:1d0d:b0:489:1ff1:74df with SMTP id 5b1f17b1804b1-48fe5fcdf50mr371960735e9.1.1779305155480; Wed, 20 May 2026 12:25:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 19/33] target/mips: add Octeon LHUX instruction Date: Wed, 20 May 2026 21:23:24 +0200 Message-ID: <20260520192338.40036-20-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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: qemu development 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: 1779305192906158500 From: James Hilliard LHUX performs an indexed unsigned halfword load from base + index and zero-extends the result into rd. Add the decode entry and reuse the common indexed-load translator with MO_UW. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: James Hilliard Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-12-philmd@linaro.org> --- target/mips/tcg/octeon.decode | 1 + target/mips/tcg/octeon_translate.c | 1 + 2 files changed, 2 insertions(+) diff --git a/target/mips/tcg/octeon.decode b/target/mips/tcg/octeon.decode index efb1a48b38a..8a755075e8e 100644 --- a/target/mips/tcg/octeon.decode +++ b/target/mips/tcg/octeon.decode @@ -48,6 +48,7 @@ SNEI 011100 rs:5 rt:5 imm:s10 101111 &cmpi @lx ...... base:5 index:5 rd:5 ...... ..... &lx LWX 011111 ..... ..... ..... 00000 001010 @lx LHX 011111 ..... ..... ..... 00100 001010 @lx +LHUX 011111 ..... ..... ..... 10100 001010 @lx LBUX 011111 ..... ..... ..... 00110 001010 @lx LBX 011111 ..... ..... ..... 10110 001010 @lx LDX 011111 ..... ..... ..... 01000 001010 @lx diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index 451737cda1d..f897b42807b 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -164,5 +164,6 @@ static bool trans_lx(DisasContext *ctx, arg_lx *a, MemO= p mop) TRANS(LBX, trans_lx, MO_SB); TRANS(LBUX, trans_lx, MO_UB); TRANS(LHX, trans_lx, MO_SW); +TRANS(LHUX, trans_lx, MO_UW); TRANS(LWX, trans_lx, MO_SL); TRANS(LDX, trans_lx, MO_UQ); --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305202; cv=none; d=zohomail.com; s=zohoarc; b=IOP3IO7QB8fANqfkIjv2E0X4coU0EA7azQbztgGk+Z2CJ3EX+++TTZeYJGPT+xEmWcWc/SoDDIZ8FhdJiCIxDjlNLQ4kWlpGSAd+kZWX7ckqNKY8i8hJyP/GXQRHlKAQIPUwLjI6mSvUMwNKT/taZa5dGgB/11eOJ53GIqy/kqY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305202; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=kBr+LBh4ShdLh2TbYc/Cau75o/rd59lVQzLibQM/zcc=; b=c1uM5vDmwRhn/WSke9qqZyudVJnseXRu5sWAQd8h0YBPL/zIXoGaPg25Q+/kLlgivNGmSTY1SbZoPsSTeHH9lXY0Es+LM3ksDcNpUyfU7SdUk6PHPSaS2R5ofx7GQ3WMWByfusuf4nTytw2K2WT0hiOV4Q6tGWlvB0VU0sE1WVM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305202656997.5604063829937; Wed, 20 May 2026 12:26:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmYl-0002Uz-35; Wed, 20 May 2026 15:26:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmYT-00022S-4Q for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:12 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmYQ-0002XZ-4D for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:08 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4896c22fcbaso44232525e9.0 for ; Wed, 20 May 2026 12:26:05 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49033d8e24bsm11874915e9.10.2026.05.20.12.26.01 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:26:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305163; x=1779909963; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kBr+LBh4ShdLh2TbYc/Cau75o/rd59lVQzLibQM/zcc=; b=QPZKPmAvHLF4q4POBFvK2nmgoqfOmi7Mg8emINlORB67DZMOvGCJV+V9xK5byrR3HI 0wSf+tOK1ukQOMQqefkttBzcFQZ/nNHjoEyCBuap1/MlPacTQGwGa5veJaVC7wg5dqtW H3MXxumlIX1DzkzzE1BvVcU4vTJ9R/uOCD/nWvdsw4QXKwhpMn9RSxBaoDzmsReoyt6s 1Ezsr59O4N1LQYZ19GR6saDioPiXD9i8MdpjsZ89TndrrlJfnAmouAHYvjldGz0FhAzx VxF5SN9X4f0exKyA2TCeHIBMcOzV7aJZ0F6obeQacWqnD0A+oWm6LPWgDMb5vGEg+TBp 2log== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305163; x=1779909963; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=kBr+LBh4ShdLh2TbYc/Cau75o/rd59lVQzLibQM/zcc=; b=sColPAaDi4ICD/48NDK6UWOBJ6eJgop0FSXCB3rJ5w2+Bigg/R9zvyjeOj37vASgt1 gmlrq57RDN7bdPKPXGCpFcSktiGEM8rz01hV4Awra/G1T4AAR6KpdIrBNKnQzmZOGZlq NVtGXoapA+6rN861SRR6K8c0/N+eFcygyjIeW+ATv2Y9nkzz564rq0DgwZZkoGqzhvFm u7zalXYxKiK/1UzVyI3a5oJ25zEakd4cb5I+sGaqItlTFR+PNaXV9mydLZHn+3otEgcN IGGL8y+Z4pxzoSGyN/3V5505O460xlaPWNaMUUGLjFIQ+0iBx6IOz0ZSJniyyhJbqQ8b 2oSA== X-Gm-Message-State: AOJu0YzodRLVZMmgOGchzmc5RhgHrGkpxO+uOJMV+l4BiDwTX21Yc1qe VAM5q7qUTDXtbWk2TIaeg4lY8t/tXhysKH7JwerPSwgFRIsiyKwFyuTAHnPNeyniR1H/GGhBwLI Amt81mHg= X-Gm-Gg: Acq92OGQ6KLczIv1nB0PZYAVRQ6GTSeKcMDclvF0BdE34WV3FereyOE7sgC0FTfWVnY QTvLJwtg4FpqmGzYQay61Sn2i6Vguw/3jspUTy5toSIkC1ky/QpfuJVRf3d0D14u6e7s26dWsG5 BUZcD77DHuidrgQwi3W2Ku4d8/zuNzBtlSVoS0+pwjRobEjZefMqejqYYdhI69A2clZFkPBJTxY mLdBI9NPUjAfVj9JgWse5V9tyXTMtljX8zn4CJ7AmH+vYdKzQWT31ZdB+SVElFCZFDSjXPQ+8lz I5enSdH41BaMrU4+48jemqmmcaXrEAaV7TXX4+s76Gnevs11uQdTf8jrBOnPmlOlQ7OAwgGh6Cp lYmlGw+Q55jS8xMv2QHQltZmyChkxx4qaPBeO373G4NHGS4J8Hw75HxtUR7E76FoeB/CPPF21Cv Buc+NuwL6p6fdEHjbe3LaY18PAwASalLZS6p31Y2+uvuoJRad1c/+j9AlQMaMcgwkVIHaNoLyiX rBRxbapyaM= X-Received: by 2002:a05:600c:6d2:b0:48f:f199:4c02 with SMTP id 5b1f17b1804b1-48ff1994c86mr202027545e9.9.1779305162912; Wed, 20 May 2026 12:26:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 20/33] target/mips: add Octeon LWUX instruction Date: Wed, 20 May 2026 21:23:25 +0200 Message-ID: <20260520192338.40036-21-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: qemu development 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: 1779305205016154100 From: James Hilliard LWUX performs an indexed unsigned word load from base + index and zero-extends the result into rd. Add the decode entry and route it through the common indexed-load translator with MO_UL. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: James Hilliard Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-13-philmd@linaro.org> --- target/mips/tcg/octeon.decode | 1 + target/mips/tcg/octeon_translate.c | 1 + 2 files changed, 2 insertions(+) diff --git a/target/mips/tcg/octeon.decode b/target/mips/tcg/octeon.decode index 8a755075e8e..db7d5f55f0a 100644 --- a/target/mips/tcg/octeon.decode +++ b/target/mips/tcg/octeon.decode @@ -50,5 +50,6 @@ LWX 011111 ..... ..... ..... 00000 001010 @lx LHX 011111 ..... ..... ..... 00100 001010 @lx LHUX 011111 ..... ..... ..... 10100 001010 @lx LBUX 011111 ..... ..... ..... 00110 001010 @lx +LWUX 011111 ..... ..... ..... 10000 001010 @lx LBX 011111 ..... ..... ..... 10110 001010 @lx LDX 011111 ..... ..... ..... 01000 001010 @lx diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index f897b42807b..401c4bd14bb 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -166,4 +166,5 @@ TRANS(LBUX, trans_lx, MO_UB); TRANS(LHX, trans_lx, MO_SW); TRANS(LHUX, trans_lx, MO_UW); TRANS(LWX, trans_lx, MO_SL); +TRANS(LWUX, trans_lx, MO_UL); TRANS(LDX, trans_lx, MO_UQ); --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305195; cv=none; d=zohomail.com; s=zohoarc; b=Y+gvH4Bxqdxxy9uCo94tts4GNcpKntjnSZsqjg77jIFi7MWqcIEBH2M10DQqc0sRZUFqMApzvjewGz9PMkxPWxi5ZGXAEoikwlvP1f2nICj8/FIyDCHwjmzhxLKf4FXTGKQsSrsWcyghF6rifDUF/yLgWTao06OkBaVYw6GI4lY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305195; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=vT462afn82wNhErHYgh3JzlrG5paUe6twTvvhdpnxCU=; b=hCoEk+u+7F3kMqqhLErFf9J2IKjqRZP1Qz+G0F9jZ8R/MDu/DGJDGnWUjm9X/1gBX4NLu7oMoW572c6BotEsIt4nO4Vr6JNq3bS+CpEPhJCupTPr0zAxIXManbsN6DXrsePYUk0267vAX02x6n+TU+bH9PnI1XvSivqnHMxFl+I= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305195408202.07003752347737; Wed, 20 May 2026 12:26:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmYn-0002pA-Kq; Wed, 20 May 2026 15:26:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmYZ-00027U-M5 for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:17 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmYV-0002Yw-IL for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:14 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4891e86fabeso70066945e9.1 for ; Wed, 20 May 2026 12:26:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49033d4ad9bsm11053775e9.8.2026.05.20.12.26.08 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:26:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305170; x=1779909970; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vT462afn82wNhErHYgh3JzlrG5paUe6twTvvhdpnxCU=; b=IvcdM5TMpIee1PnFTpUWZ3D6kTNW+AvsDG2T1pEuF0k1136+4ye+0TL3LNmKzAnPt1 6lToHO2ramJEAIlHb6LGX5XW5QPpWBn1NY//46up75AbQ+Fj9TfEff+VdeXeQ0qPdicM tHarFzpHMfm3R7TIV6jjj6euUAXgiuLLV8JrAYXEwQEgFuy1WKhzkxv119bLKS6wiuFh +HepVcn3wELoT5rHXUsLWPm8KxW6BU0/PMTb/0PXbwBoJ8n0P1Wm4UIKdwT5UoD6UksQ pIRl9nLNxMNjRlflaABrW9QLQKMmtkgwTgw5HUZkkIt5O/tFB5JqVDK5gwNem575uSIl anwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305170; x=1779909970; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=vT462afn82wNhErHYgh3JzlrG5paUe6twTvvhdpnxCU=; b=ce7Qad9H1zJpGsjKYWv45fhvmJzDZh4xHvUzHki8I6cVlK7MUj7jB1UDN6mtvmOE8Y qqNyQd1kG8to0ccgAApsXR3z/mzq9obBr2EuKWddoJmjhoWBNbzdajXRg3JydVBMRzCe tBuP6uhCBkw+i+vv1HgqF0JCEdCvsNN/8f7f/66peW1wVWr8fZWFSeYeKOJrN5kCOnMh lqwS/3JpqTq7r28w1sQ7xbX0U62T1T9Uscm4iRW4BIHI+j4BIFdYe1JC7YepJPSG/kIK GFyfPYTeID+qf+ay+CsDY6tdn0cjcLCHIOzNNqGfWqSxmvoo+tfu9W5Wpn/7JyU2HJkC QxFg== X-Gm-Message-State: AOJu0Yw0ZsSnh47sx0qi1fiq5XoHeMDmwMOHtNj3Po9gAa9/zK6BddOa mwqFPcu7odMkAuUJDNAiM5RAyYVdgnIGkZe9nTFsBLZh5mFUGCd6lV+kO3F+TdA0JoXdAdlEU4f av/OnsOM= X-Gm-Gg: Acq92OEcEKDPgPrWM12YVLQBjQfHYuzE0qXOeg4yqJ/4gaftZG7+zXlyNx51pYWJYn6 uQD3tcuI7FDIzr+yFC52tN/kpNFQOjdx8pgHYXHCiG4qMVbH1+qoJkUiY87otALNQJsn3oUQ//i oSNRdXFEX4OPed21hQjSqG4cWEyrUB8HEb6REWO9UCQrXp0sOYF59Hc1B9oO57z/KN7HijX/R5q YetP/9M74bZ5l6SEsUQdQG1PXOxGR2RUdmUkUniyIHnxdsLRGO3TERbmKn4nrH4Pe41SLYlMPqj gMW33HpjgezuBSpvgeD/d76useIUstg7LjBEPRzrmcr2EheLI9IRYdUXcOO08mhR3X5pqCWUjwQ jo1Y/iP3xEFCFfYQTk4iMUg2Zuav/ip/RsvEsqOCLRSq0EzWT4USKXFM5PoDftHK9cUs113cYvg FE0KXDnuVnySGnk/r592D64HPa58tdGvQMXFXWGEztlbSNt2LkZwkiFQtmcGiJqVKELsdMRbYz X-Received: by 2002:a05:600c:34c3:b0:48f:d0f7:78f1 with SMTP id 5b1f17b1804b1-48fe60e4e27mr411195505e9.4.1779305169636; Wed, 20 May 2026 12:26:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 21/33] target/mips: add Octeon SAA instruction Date: Wed, 20 May 2026 21:23:26 +0200 Message-ID: <20260520192338.40036-22-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: qemu development 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: 1779305196943158500 From: James Hilliard SAA atomically adds rt to the naturally aligned 32-bit word at base and discards the old memory value. Implement the common SAA/SAAD translator with TCG atomic_fetch_add_i64. The MemOp selects the word or doubleword transaction size. QEMU only has one Octeon CPU model today, so keep SAA/SAAD under the existing Octeon instruction feature bucket instead of adding a finer-grained Octeon+ feature bit. Reviewed-by: Richard Henderson Signed-off-by: James Hilliard Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-14-philmd@linaro.org> --- target/mips/tcg/octeon.decode | 4 ++++ target/mips/tcg/octeon_translate.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/target/mips/tcg/octeon.decode b/target/mips/tcg/octeon.decode index db7d5f55f0a..d6b241de421 100644 --- a/target/mips/tcg/octeon.decode +++ b/target/mips/tcg/octeon.decode @@ -44,6 +44,10 @@ SNE 011100 ..... ..... ..... 00000 101011 @r3 SEQI 011100 rs:5 rt:5 imm:s10 101110 &cmpi SNEI 011100 rs:5 rt:5 imm:s10 101111 &cmpi =20 +&saa base rt +@saa ...... base:5 rt:5 ................ &saa +SAA 011100 ..... ..... 00000 00000 011000 @saa + &lx base index rd @lx ...... base:5 index:5 rd:5 ...... ..... &lx LWX 011111 ..... ..... ..... 00000 001010 @lx diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index 401c4bd14bb..33b45611f20 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -168,3 +168,18 @@ TRANS(LHUX, trans_lx, MO_UW); TRANS(LWX, trans_lx, MO_SL); TRANS(LWUX, trans_lx, MO_UL); TRANS(LDX, trans_lx, MO_UQ); + +static bool trans_saa(DisasContext *ctx, arg_saa *a, MemOp mop) +{ + TCGv_i64 addr =3D tcg_temp_new_i64(); + TCGv_i64 value =3D tcg_temp_new_i64(); + TCGv_i64 old =3D tcg_temp_new_i64(); + MemOp amo =3D mo_endian(ctx) | mop | MO_ALIGN; + + gen_base_offset_addr(ctx, addr, a->base, 0); + gen_load_gpr(value, a->rt); + tcg_gen_atomic_fetch_add_i64(old, addr, value, ctx->mem_idx, amo); + return true; +} + +TRANS(SAA, trans_saa, MO_32); --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305233; cv=none; d=zohomail.com; s=zohoarc; b=JPFLSJhPCqx+JxuDkWNPU8fcWHRCEUQWMT4+hSKQCAt0eq84B5fwRA6Cbt6YZ9HeBPJ5b7tdoFPxIWxSZdhXdRU97Jm+AXFQpfTFRrhyO9aLG6YNY9evla1JMQ/bKOelMRrmaiMM1dzYpZvxu4Sfi7yYKjXdN1T4P692/0B2ehU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305233; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=D2tq82yI60+rZ9tglV17LktFpgu56FwTNLrlnTN4T5c=; b=U1g9osPiO7+T5mnqY6naVnEFZcEuxzRIEGG23d2EtzcySYHhk6Ba2h4c9sndMgzqgn/zIIoAny45in7Zq+jdALmWm0Clq0jQKKrbFV5bNM5FF7NVxJQ5iinaDllYITAhtXNszJYQrhnEme4SZpJ9oWclejohtY9HYg76aelkcKk= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305233081906.1442838952901; Wed, 20 May 2026 12:27:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmYs-0003N1-53; Wed, 20 May 2026 15:26:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmYe-0002IH-FM for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:21 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmYc-0002aP-MG for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:20 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-43d76dd4ee8so2157630f8f.2 for ; Wed, 20 May 2026 12:26:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45d9e767cb9sm53927589f8f.2.2026.05.20.12.26.15 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:26:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305176; x=1779909976; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=D2tq82yI60+rZ9tglV17LktFpgu56FwTNLrlnTN4T5c=; b=YlekA/8OEwNIRBOVxvELf00Banmde8zX6hBnTTtXZXdwF5FCxN6YEMluGekSil2cN/ Zo44LKcSSjX6VMmP0349rvVab8hkpCzkBFlNJjHfl1pmEA14c9opLQTLYgUVtepdSxX1 Uzu7KMIMt1Xtm+CWIyVCcz1/Bu+BgtrEoy47UR7x8K251jwFQ2usykg/yW8Hg85U22cO cNE9z9MOAtKN16z0wJQVa1UZPAN9HWrTk0Z5Q6brfjTwgOC/Vbqbp10NDg+kEJa3TYHm cBJsREDGADDZ+u46wwWzv+78n4V+KO9gwfk1euCYuKppEOn7xDWxuY/LsGk5O+q8DIqZ VwHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305176; x=1779909976; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=D2tq82yI60+rZ9tglV17LktFpgu56FwTNLrlnTN4T5c=; b=jnCylVxrRxPuTSu7SMnw6BIawOAfzuJQ8mCgJRlszDSehaiFtVRlYk/XuNuiCq6du1 8HcHvWAwYyjhEq+8pRca5/yF/28cRuEr1Evspyz0nphRx9ksPq8wbCsUGrwEiO5ADwzf XWWz64bzplSR2gGxRNNLviEZVBBpFkae9gvo2XOhxKgTaVMyOfmJxv/V1nFL7QsDsdet 4pKjz57Ys+HAl+KPNri0SoN0ez8+V1LsNO4dm82oyvfiRifOEdbkE17i1Yi50KNjqkcw rSJ5OzEfow7VcwChvF4uOFkF7wiZ3F/V+llkBLfLgDIunw4tE0UudgmhaKu/1MYoKg7R bzZg== X-Gm-Message-State: AOJu0YyKmq07kJ4jKk5PI4Bp9urWcQGmiLOCHmMoGyP24Mia8O+r1xrt Zcd56IqjqwLSkc2YQzc4+fT7f3NrmlQa/7AFzbe6vZth30gPiKs+o/gn/yL1M9XB4hRTt+zwS3M 3fL6S/uk= X-Gm-Gg: Acq92OHqIedA1dWGx6ILm1H7DQ74GmcBSille2x655uwXUSfbnQMQm47BM+6wU8WbBU Sg9LlmhYu/G5drasOtH+I4ph1SmAYFCIbvoMl7GL9Pc40kymFMw6OqgeTcPULaaew0Lm758GR/y eHbzCCVFvQE2XoKSR1KpR+irJ2Ygz32raqOGFLfeKi1Bd4Rb3OzOya4MwnUdlSOAkh5pwuJHhnD z1w96lg2ZUQXgXhLmdCeDOWd6VkPrjg3ikSDKioBI3/ugLf7QmGL/xycgINA9UG4sBQg6Ay2vju 13dT8hkccMOU8GgS8nNVpAKy+ikPgujhf+pRiFWk4XLlxVMIlwOmuQuDwNyH8xsxc5wV41hh0p+ 66/7evqaRVT5IwIoSamSIg3dW23vgVd0Dt+MvpRceocXCWdmU/FR9znlJI7tz8XF5rGRgeca61U N4LYm2v793iNHk8cTj4hBKIKBQje+3qSKCVvTetmiYz806KzyXDKA4XgoXt5wYMg/PQwYgdhc6 X-Received: by 2002:a5d:584c:0:b0:446:db72:e8ec with SMTP id ffacd0b85a97d-45e5c587281mr41881500f8f.23.1779305176376; Wed, 20 May 2026 12:26:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 22/33] target/mips: add Octeon SAAD instruction Date: Wed, 20 May 2026 21:23:27 +0200 Message-ID: <20260520192338.40036-23-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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: qemu development 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: 1779305235729154100 From: James Hilliard SAAD is the doubleword form of SAA: it atomically adds rt to the naturally aligned 64-bit doubleword at base and discards the old memory value. Route it through the common SAA/SAAD translator so the MemOp selects the aligned doubleword transaction size. Reviewed-by: Richard Henderson Signed-off-by: James Hilliard Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-15-philmd@linaro.org> --- target/mips/tcg/octeon.decode | 1 + target/mips/tcg/octeon_translate.c | 1 + 2 files changed, 2 insertions(+) diff --git a/target/mips/tcg/octeon.decode b/target/mips/tcg/octeon.decode index d6b241de421..d77717cd507 100644 --- a/target/mips/tcg/octeon.decode +++ b/target/mips/tcg/octeon.decode @@ -47,6 +47,7 @@ SNEI 011100 rs:5 rt:5 imm:s10 101111 &cmpi &saa base rt @saa ...... base:5 rt:5 ................ &saa SAA 011100 ..... ..... 00000 00000 011000 @saa +SAAD 011100 ..... ..... 00000 00000 011001 @saa =20 &lx base index rd @lx ...... base:5 index:5 rd:5 ...... ..... &lx diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index 33b45611f20..23748695a14 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -183,3 +183,4 @@ static bool trans_saa(DisasContext *ctx, arg_saa *a, Me= mOp mop) } =20 TRANS(SAA, trans_saa, MO_32); +TRANS(SAAD, trans_saa, MO_64); --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305222; cv=none; d=zohomail.com; s=zohoarc; b=W3AikrANJYfKihneZ2zgSXpFAl3JSlJNM2VEfbjSa6VZHQb72ki7VMI5kIo61iFgGQWgr9jogVJwHHgyL88bSCBAGjZqRmPhANLba1JJFy078xCEbnbIsg3PSAxe0esaqWpKK2i3PMiP7xmu8L7HWPpKQAb1wzRw8BAaMBPMw04= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305222; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=+IShrOJdoAnXhE6bNJkPoCD2JYelB8KnTrT0I3ViK0Q=; b=MIEvp1ecXl5gYQvD/9ISXX0mFlY0lT4W2AgFY/JaNt/06i+ol18KBwoQ+OpD2E5ZwMLyQKPyVDVhD0ilwtQgoqP1T8FLs76/xBJAxFxuchTKfwIhbKPxiGrwfAI3NPQ5tOyNQb44CDlLxA4AWK0HEGsRLWsYoDY7vPng9XCAbq0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305222199787.2970053258047; Wed, 20 May 2026 12:27:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmYp-0002yj-2l; Wed, 20 May 2026 15:26:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmYk-0002Wl-Uy for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:27 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmYi-0002cc-Q7 for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:26 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-488d2079582so50989205e9.2 for ; Wed, 20 May 2026 12:26:24 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0fe2464sm57109780f8f.32.2026.05.20.12.26.22 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:26:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305183; x=1779909983; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+IShrOJdoAnXhE6bNJkPoCD2JYelB8KnTrT0I3ViK0Q=; b=Bd2SGz2ED+vCEDlg7BkfvT1+A1ShzEsmf4BEniKcqieN/jwcYy/6bd0TVFKNRpbIMy HVmqvo11YaqwwKw7iv+x4zYaCwUDCOpqgMQBQTh1Jna/qzGtq/LuOfR9wVzk6tp4Ug1p H2EObrW9EQMTPZfPEfBHUib8vEqOIrTjICCQ/z2cBFZBBsFVqDk6proLLiXSpn/jYqw/ YV1UVwmuew1SuCdHhZjUesc+7J+BEku3JvtHZpUt2a1NVxPN81EJVjOsA5r4aBc6ud6k Q0c/KlCxzht14QhPlax2DUzUipK/rdhTDWvViIBwLt1bhTaz6fev7fbMHdHqbZgXjVJD 4Uyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305183; x=1779909983; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=+IShrOJdoAnXhE6bNJkPoCD2JYelB8KnTrT0I3ViK0Q=; b=d3tifDKH8YL61LTdqEnwtDT1sZY/GYP7CkByOZrKNzOksOdhNpQjW+U+gvOMDB4Rrj 9zGgWTpK7nBaljUQZG4Au2D424Ab4nTaAft7+xsvkFTqdm9PJk39At1xf6vgsPRurBk1 UCReDgAfjtIcEZCfyMe6AAtwSknigC4WiDvB+zASXrwmqaO/R/FHRSnSh28w1hNR9Ee5 YJBymP8iQT8SrLo8k70sVXmZyC8TNQFBufpVJwiexeiRdebvj/qlqVJDTOrkAojPFklV ITFmpuJ0H+oKB2VCXQog83C2xQFqAzfE5CymC3owBObzBgzBLhI30JSsQMQ7CAio4KS9 u2Wg== X-Gm-Message-State: AOJu0Ywr7vbjpnD5nSYkl0Xwj7Kl/r+VUIqpRPfFOsb3uPLOsP5wcQTP YCv6Zyr/ABixx3zhnUZvge8AN9fKrtgfpt662/Ev126wrNWxMxwKbisjHFtASRSn0M/rGCXys8+ sX3yGhLE= X-Gm-Gg: Acq92OH823YuTuXVNrGECMDVrYnDHRt2g8c80/9zkIihbr8eYNLE5eW1oXeYfznJ3WI i+QEVFI0ROXrf5bjamSSSLJ5X4bKSldjcVNvsxPlAGi+FvG83q59mG2bawLMolf6EZLFMNlbqzb P2ohAqhIyxG4w8GXIotR+106qXlyqmFvHcPhLcySwYWoOTaAd8QPmMlBwgiI69qKZtX2m7MvNyk F1Bci341yemKZ6XfzEUuiqmDuXC4G+XB5BqexwqqQFZwSRKGQb3QgmFd5fal4nM7EfehXJcw/0O mW17Hg/cR5LLk38KiUlwyLW/EvRUk9oqh77nEMZNJTjoJPrC0o9iVvQ1Emz4Ql6CfymXpu8VIYa oej+iV2W1OxXVWQxMVn5Z/pn0tlCV8MqK0Cq6r3G6tqO6kJZ5vnkVeRj1MzkgmnHedSKkDdyLA4 F5rYRTZskiUYuIxl7tjrd9NmR1kHf9l3nHGPbbIyFoif9bw+DoeWJtI9Xryk3wYz6ux3LQriSr X-Received: by 2002:a05:600c:138f:b0:488:ae6c:42c6 with SMTP id 5b1f17b1804b1-48ff4f4f44dmr308996675e9.14.1779305183141; Wed, 20 May 2026 12:26:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 23/33] tcg: Introduce tcg_zero_i128() Date: Wed, 20 May 2026 21:23:28 +0200 Message-ID: <20260520192338.40036-24-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: qemu development 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: 1779305223430154100 Extract tcg_zero_i128() helper for re-use. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260520121644.10835-1-philmd@linaro.org> [rth: Move the function to tcg-op.c] Signed-off-by: Richard Henderson --- include/tcg/tcg-op-common.h | 2 ++ target/arm/tcg/translate-a64.c | 5 +---- tcg/tcg-op.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h index e02f209c093..aff99754160 100644 --- a/include/tcg/tcg-op-common.h +++ b/include/tcg/tcg-op-common.h @@ -18,6 +18,8 @@ TCGv_vaddr tcg_constant_vaddr(uintptr_t val); TCGv_vec tcg_constant_vec(TCGType type, unsigned vece, int64_t val); TCGv_vec tcg_constant_vec_matching(TCGv_vec match, unsigned vece, int64_t = val); =20 +TCGv_i128 tcg_zero_i128(void); + TCGv_i32 tcg_temp_new_i32(void); TCGv_i64 tcg_temp_new_i64(void); TCGv_ptr tcg_temp_new_ptr(void); diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 9a27c4c6ec7..3e3971db3fb 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -4804,13 +4804,10 @@ static bool do_STG(DisasContext *s, arg_ldst_tag *a= , bool is_zero, bool is_pair) =20 if (is_zero) { TCGv_i64 clean_addr =3D clean_data_tbi(s, addr); - TCGv_i64 zero64 =3D tcg_constant_i64(0); - TCGv_i128 zero128 =3D tcg_temp_new_i128(); + TCGv_i128 zero128 =3D tcg_zero_i128(); int mem_index =3D get_mem_index(s); MemOp mop =3D finalize_memop(s, MO_128 | MO_ALIGN); =20 - tcg_gen_concat_i64_i128(zero128, zero64, zero64); - /* This is 1 or 2 atomic 16-byte operations. */ tcg_gen_qemu_st_i128(zero128, clean_addr, mem_index, mop); if (is_pair) { diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index d8ae57d6047..971ac2fb359 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -2475,6 +2475,16 @@ void tcg_gen_concat_i64_i128(TCGv_i128 ret, TCGv_i64= lo, TCGv_i64 hi) tcg_gen_mov_i64(TCGV128_HIGH(ret), hi); } =20 +TCGv_i128 tcg_zero_i128(void) +{ + TCGv_i64 zero64 =3D tcg_constant_i64(0); + TCGv_i128 zero128 =3D tcg_temp_new_i128(); + + tcg_gen_concat_i64_i128(zero128, zero64, zero64); + + return zero128; +} + void tcg_gen_mov_i128(TCGv_i128 dst, TCGv_i128 src) { if (dst !=3D src) { --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305265; cv=none; d=zohomail.com; s=zohoarc; b=E7lbO3YlSb6ofEYKaFiPynfOn8ftznEmq+EAsa1UH0pbNByAUsL8hs+oxappcVZfVwL13dw/bTQn/SeXGxXoDSNjtiqGenD4QjBOFQPuMoBt1I4PlojsabVUyEA20hnRFYNK8REjdiiKT5SxtB97l5XNI6dj8bzDoMXL2tX8AcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305265; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=JYV/kaaC7k38g6qL5qazYDyJyJKp/5xNFedOOo711+k=; b=Z0G5nTRFtUzwHQcUE0wrpyOx5hMHCGjnXn2+ikEyQHB4HzihxPrNS/hexGNn6ETMvHNWs5io31Db2PtaEYiHIA6uj1k1HcOocjojxS1U+zHWSBpApxm0WAzZO7naRplMg8Kk9oRF1sakSJxuRnzhf3SGzhgUjI6NAwIQfyX6olo= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305265242872.902503455418; Wed, 20 May 2026 12:27:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmYv-0003gw-IU; Wed, 20 May 2026 15:26:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmYr-0003O8-VP for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:34 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmYp-0002er-SG for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:33 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-48e82c23840so43136915e9.3 for ; Wed, 20 May 2026 12:26:31 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49033d5987esm11252755e9.12.2026.05.20.12.26.29 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:26:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305190; x=1779909990; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JYV/kaaC7k38g6qL5qazYDyJyJKp/5xNFedOOo711+k=; b=i1K9lUZCqKkE+xBzGBhCegy++DY+ndS4WuUVqc7wZ4MEaVr3a6h/0vXSDsGgUz0t5+ k1pknzITrMdCMf4fr43+Vd/Hz1si6KO+pG4/3ASudSY68+EyXM8hv/KEqxqbiNWCRgjK OSBEo4ilceVMUlWCadKyns6RGC2+OmoWi4MFom5sQ7TD2gd3CEtoSc+jtpuH1zGNv+aq TerI29M3uLYjodWX3+ZWAXNT1WFbz64cCuylabCvF1yGGi3GaaONTMJn0dZFetJIbJ8w Vy/GljcsDnw7H9JMlrJ9ZdfA4HwPwEHc9oyGt80r3kTnr8gHX3voCES1ZkMjqu9YLuRw AI6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305190; x=1779909990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=JYV/kaaC7k38g6qL5qazYDyJyJKp/5xNFedOOo711+k=; b=CPqNc3qyvVTIAC1rS8i8DeUARRUPzYUf14PPHP/rt/ORUKszBS7yOh7YUxeCzMvECB R3kTHMXvtKinw1MM3+jNzn2M7h5l68LfBrj+Vb+7/c85+rHAWyo+USh72xN2An7LsW15 Vc79D3kQFsG2b5hVuUbQjy7T/sW6+h4t0nEFxoY3AfIJxAIRebJScPTCZ4HU6TGjTpYO HrgsQj0G2Nmr08rXgHcO4lFCoYbLL2QKkEl5YZcMNV/ZPbSRtv/q+xBpVppdvdrlNOIf GtxNCaJRdvCWJcTxlT5UhkVXwWOUCrplMWAypUoKc6+XRXJLELqtiE23jfvf68JV+gVv 1BfQ== X-Gm-Message-State: AOJu0YyR84mpSAKSDo2FVs/mK8xKHoK8pCcR/e9cT3ERPuKUkbxtaneS 0ICJWzNnwAtMWpO0rcWBimRbQZg8VVaUwpZAFguICtUmb4UEQ97hIZYCbmI2vU9/Bnj2Rf3NI28 L5tH7Wbo= X-Gm-Gg: Acq92OFmlPq6UA6DCHL7FTv3OAfYwL3xlbfe3AtUsj1w4d3bZytt8TCeyWaH5tk4pwx T1qq4Op62mCmA51OtDNCw2R7laO/T72Xhi8qZxCDfm35ASALxzYZle89l1yqZmpnhXntV+KTj6l +Rwe+SxMJrXjE5ER6raDXGYjIdUuMtBgF0JwlEel36BBdLY+OMCI1xEg8Tp8RvT3u0nzYIipib6 4IZKph96Fo4CVZJC8gpS4jCPFGyKyt7RQMIC4N2h9t5yDuDyInHiRUyS5kCGXQ9q6Q3nmuqF2rj GY4p9moi0t6yl5TEvJ0to6Nx5dtQlgI0au8PzLtGhdSjL3ekqt5RvR2NgtE1WGKvspyQ6Ax/VOJ PDxYgyq2UNgPstXIZSLbxezYD6pobeeHPwVOfMsM4+hrnkUrvguQ0QatnY3/tcTtQoLwkHqYLCC 7FFAuiuyGO0jLBe0argIEvpW6YJH5n8zyDH2L227TYkmCKDi2zPZ8AZhTrJHsUgTZ48wvYe7Eu X-Received: by 2002:a05:600c:35c6:b0:48f:dfe3:dae4 with SMTP id 5b1f17b1804b1-48fe60e9f8cmr432622935e9.13.1779305189911; Wed, 20 May 2026 12:26:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 24/33] target/mips: add Octeon ZCB and ZCBT instructions Date: Wed, 20 May 2026 21:23:29 +0200 Message-ID: <20260520192338.40036-25-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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: qemu development 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: 1779305267683158500 From: James Hilliard ZCB zeros the 128-byte cache block containing the base address. ZCBT has the same user-mode-visible memory effect for QEMU purposes. Model both forms with a single decodetree wildcard entry, align the address down to a 128-byte line, and store eight zero 128-bit chunks to guest memory. Acked-by: Richard Henderson Signed-off-by: James Hilliard Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-16-philmd@linaro.org> --- target/mips/tcg/octeon.decode | 3 +++ target/mips/tcg/octeon_translate.c | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/target/mips/tcg/octeon.decode b/target/mips/tcg/octeon.decode index d77717cd507..01ed3b50beb 100644 --- a/target/mips/tcg/octeon.decode +++ b/target/mips/tcg/octeon.decode @@ -49,6 +49,9 @@ SNEI 011100 rs:5 rt:5 imm:s10 101111 &cmpi SAA 011100 ..... ..... 00000 00000 011000 @saa SAAD 011100 ..... ..... 00000 00000 011001 @saa =20 +&zcb base +ZCB 011100 base:5 00000 00000 1110- 011111 &zcb + &lx base index rd @lx ...... base:5 index:5 rd:5 ...... ..... &lx LWX 011111 ..... ..... ..... 00000 001010 @lx diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index 23748695a14..5392fed08a8 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -184,3 +184,28 @@ static bool trans_saa(DisasContext *ctx, arg_saa *a, M= emOp mop) =20 TRANS(SAA, trans_saa, MO_32); TRANS(SAAD, trans_saa, MO_64); + +static bool trans_ZCB(DisasContext *ctx, arg_ZCB *a) +{ + TCGv_i64 addr =3D tcg_temp_new_i64(); + TCGv_i64 line =3D tcg_temp_new_i64(); + TCGv_i128 zero128 =3D tcg_zero_i128(); + const MemOp mop =3D mo_endian(ctx) | MO_128 | MO_ATOM_NONE; + + gen_base_offset_addr(ctx, addr, a->base, 0); + + /* + * QEMU models ZCB/ZCBT as zeroing the containing 128-byte cache line + * in guest memory. + */ + tcg_gen_andi_i64(line, addr, ~0x7fULL); + + for (int i =3D 0; i < 8; i++) { + TCGv_i64 slot =3D tcg_temp_new_i64(); + + tcg_gen_addi_i64(slot, line, i * 16); + tcg_gen_qemu_st_i128(zero128, slot, ctx->mem_idx, mop); + } + + return true; +} --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305236; cv=none; d=zohomail.com; s=zohoarc; b=W11x9Cn2LvK8LN77FNPzcAJlVPmIXhcWYncDnu93GxsnunUmY44rU63nRmSMIyZByju9hdaOcuemd6eOffFTpNvIATjsFyMZULa1kstHxtmUDURufYAlFuPNSTp5bZKfzR1sAynUykZkwfnzY0xav3AhHR6hZ+lC6eulVKX5vMk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305236; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=LGohp7dlyjWh+7CBb01fjLibw7y1O5nFqdvOmwWauJ8=; b=Zc/usUcTrSavnHfZxXk0TQEOWa+HDl+A0bedykZJYg1ZRWIFH0wIgQysqusudwn58lZsNclgLabk7LDJj6K5oOf3AJIQ4vE5KIelYHU87FTQR6ID8DohiP8AReICorq6IqMncoDYJDRZ69JhggDRzL5cgXabZgUprFUVYL5Eu0I= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305236288770.4329519634978; Wed, 20 May 2026 12:27:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmZ0-0004Mj-PA; Wed, 20 May 2026 15:26:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmYy-0004As-Qt for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:40 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmYw-0002fT-Nj for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:40 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-488b3f8fa2bso50332255e9.1 for ; Wed, 20 May 2026 12:26:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0a178adsm59648554f8f.18.2026.05.20.12.26.35 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:26:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305197; x=1779909997; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LGohp7dlyjWh+7CBb01fjLibw7y1O5nFqdvOmwWauJ8=; b=KCCJHp1AA2nhbfyNlVVb+zI4Mc+0qYHCameuPRtamq1YsKK5KFn2pOAcxaFOT45MNO vDRCKarr1hVBCU0ipPVSBdeMQxIG9/aFml9zIuFnY6SaUYthX+FSUcTpRkXc1ZWskE8w 6rI86r4OdIab6/FbXEuapZaPEMCWqsGFa8oSd6J4/GCZ0EUXMcz+uF3SmgeIobSVV6ZU 55TZchgutJBJZrDYxO6qf7tiA8wXeUHJD22/3EK2hVB9wjznzBqSDB9BXAS4L8Uo9gft Ak/zNaza6XUhktmEV+MosWAHbQHhKnQ5bmtA9cuVwgWqusI96O89RsiWsyy836OIfBFw Lcsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305197; x=1779909997; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=LGohp7dlyjWh+7CBb01fjLibw7y1O5nFqdvOmwWauJ8=; b=fbVZbENfKOI9/y6VLA8h14tE4qIjDclz0aMszz/r2HKGLD1UX75CTpPtQ+cg8KCwiW IrC59/IHD3Q27L+nyFmXWvOmgaltzOP6l1tMrR0oFCLiM7Wl2kGb6qkeuL39G3Zfni/A OkjNUAVPHw4d16Y0UpYT/NE+Zx4dSj6V5t7khLd3QPEKEf/z4jfEltgTdnYd9OfZoIKZ PYZDzn5yB7T+8awhmpqPIOE9sfI3boWAPjx/A6F8Bn6+2Xf95Ly6BLv3c6HBmYM/lyYS onBrxxWJjKDwWeXCUhUtIokAy3ueZ+UOHFUfQ8p3mINeRaenyB8lQmWIAJkKld5iqgWI WwbQ== X-Gm-Message-State: AOJu0YyZW35idxvgiq83RyZoAwSm/z0EcbliVX2dDL7vJ5Jo/pFCiFxg xRx88Kcrgq17Ep7TQ6CLAyTbugZbhfSW15J4iOgJCgdJUll0m5Xd7w5UyNm6SLNOMvLJx4o5Vhp /sEoWkWM= X-Gm-Gg: Acq92OEUFbHTZC1756qO1BDm7nPB2T9Xie6zhBN4AyKulylWOg4CK6PShPIyLiDU5pF 4ECrWVBrU4tLyjUjKWc5kfhex8c9jlvM9IYnFD1Y+k0kTOXc3fphyyClSHJVSNmyeyNZIU25DjL aGTZeWjVAp8nZlr0I0PoYyjlVTcRMrQn+427h1wCTw06Fr0F//U20L5GAGCKm5Voyrd1gylUcGo 3nf8d0OCaaABYlpXCzn4PlEUJwRZvSlW4oLS4AaMXhrA2dNShjpfqS5IZnPlxIeW24w+WU8/q1s rHFSy5x4OnhkXdPgN2wmeW1xCYHV6LXN8LYYNldoE4BXzyrPMFSAq1CSwvsIBGcvUxdi+02cFLA JgJS3WSxuAEQwsWiPChBpVJtRHljj8tYtOtA023ZSoF7PQiC39e8RGfI35+AOwMbH9K+pbrJlOz pIkvLvduAwBH8CqJy+yoBl/sPr1qegp8V8kXp27ityA0j4WB1LjmHWnYhUuvpzpQDzbGLvB+I9T aK8fx9FmAc= X-Received: by 2002:a05:600c:6d83:b0:486:fcc7:6811 with SMTP id 5b1f17b1804b1-49033d568e2mr8411035e9.10.1779305196661; Wed, 20 May 2026 12:26:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 25/33] tcg: Introduce tcg_gen_addN_i64 Date: Wed, 20 May 2026 21:23:30 +0200 Message-ID: <20260520192338.40036-26-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: qemu development 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: 1779305237357158500 From: Richard Henderson Add a helper for multi-limb 64-bit addition. The helper emits native carry-chain TCG ops when they are available and falls back to explicit carry propagation otherwise. This lets target translators build wider integer accumulators inline without open-coding the same add-with-carry sequence at each use site. Signed-off-by: Richard Henderson Signed-off-by: James Hilliard Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-17-philmd@linaro.org> --- include/tcg/tcg-op-common.h | 1 + tcg/tcg-op.c | 42 +++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h index aff99754160..1fe342db0d4 100644 --- a/include/tcg/tcg-op-common.h +++ b/include/tcg/tcg-op-common.h @@ -253,6 +253,7 @@ void tcg_gen_sub2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i6= 4 al, TCGv_i64 ah, TCGv_i64 bl, TCGv_i64 bh); void tcg_gen_addcio_i64(TCGv_i64 r, TCGv_i64 co, TCGv_i64 a, TCGv_i64 b, TCGv_i64 ci); +void tcg_gen_addN_i64(int n, TCGv_i64 *r, TCGv_i64 *a, TCGv_i64 *b); void tcg_gen_mulu2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 arg1, TCGv_i64 a= rg2); void tcg_gen_muls2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 arg1, TCGv_i64 a= rg2); void tcg_gen_mulsu2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 arg1, TCGv_i64 = arg2); diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 971ac2fb359..bbcb510c764 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -2275,6 +2275,48 @@ void tcg_gen_addcio_i64(TCGv_i64 r, TCGv_i64 co, } } =20 +void tcg_gen_addN_i64(int n, TCGv_i64 *r, TCGv_i64 *a, TCGv_i64 *b) +{ + tcg_debug_assert(n > 2); + + /* ??? Don't allow overlap for now. */ + for (int i =3D 0; i < n - 1; ++i) { + for (int j =3D i + 1; j < n; ++j) { + tcg_debug_assert(r[i] !=3D a[j]); + tcg_debug_assert(r[i] !=3D b[j]); + } + } + + if (tcg_op_supported(INDEX_op_addci, TCG_TYPE_I64, 0)) { + tcg_gen_op3_i64(INDEX_op_addco, r[0], a[0], b[0]); + for (int i =3D 1; i < n - 1; ++i) { + tcg_gen_op3_i64(INDEX_op_addcio, r[i], a[i], b[i]); + } + tcg_gen_op3_i64(INDEX_op_addci, r[n - 1], a[n - 1], b[n - 1]); + } else { + TCGv_i64 t =3D tcg_temp_ebb_new_i64(); + TCGv_i64 c =3D tcg_temp_ebb_new_i64(); + + tcg_gen_add_i64(t, a[0], b[0]); + tcg_gen_setcond_i64(TCG_COND_LTU, c, t, a[0]); + tcg_gen_mov_i64(r[0], t); + + for (int i =3D 1; i < n - 1; ++i) { + tcg_gen_add_i64(t, a[i], c); + tcg_gen_setcond_i64(TCG_COND_LTU, c, t, c); + tcg_gen_add_i64(r[i], b[i], t); + tcg_gen_setcond_i64(TCG_COND_LTU, t, r[i], t); + tcg_gen_or_i64(c, c, t); + } + + tcg_gen_add_i64(r[n - 1], a[n - 1], b[n - 1]); + tcg_gen_add_i64(r[n - 1], r[n - 1], c); + + tcg_temp_free_i64(t); + tcg_temp_free_i64(c); + } +} + void tcg_gen_sub2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 al, TCGv_i64 ah, TCGv_i64 bl, TCGv_i64 bh) { --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305299; cv=none; d=zohomail.com; s=zohoarc; b=ZUV4e+t+rYYikIqV3cGTZnOgEZFzrUBz0cnl+kE21HbIYE/cyRUkqKbmiBZcyU/cLzvHm1qjf6+kDbEctTLRg4hCXzsiRSrjpbENVqC9Q5Qx1uako6j8kipZ4H0QzdLQym8W9xYSXMYFTxFuf3J5QnW75lL0JEFShC5kdF0clu4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305299; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=FpulllsTUG6FzpTkprRKojqMKoB/gsAWNKKQzts57F0=; b=hPWPMwCYoINFtD2w1FEAuiZjiJMYBNQYBuSblqgTcmuaSQh9XT8sWTQapAWSr6Luq7ML2rowU2azkJ7vTBljy43USuLzzvsmCjxCG/TxQoE8buj3Pv5w3PcvGyrmUKJVMlongK9ZRtky9BZAaxmclscU3h/4wixdOTE4HFR2Xvg= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305298993665.0622808424131; Wed, 20 May 2026 12:28:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmZD-00054k-Aq; Wed, 20 May 2026 15:26:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmZ6-0004m7-P8 for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:49 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmZ3-0002fx-FQ for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:48 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-453903ee4adso2269037f8f.3 for ; Wed, 20 May 2026 12:26:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0a19b1dsm55842762f8f.17.2026.05.20.12.26.42 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:26:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305203; x=1779910003; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=FpulllsTUG6FzpTkprRKojqMKoB/gsAWNKKQzts57F0=; b=ljndaPnq8OMjnZ4jHy8usjvE7KLrP0xmMSkvFSQ/ENtOWU2QUd82gW+yop8sIrIDrc r9jJV29+4CSCoU50nVPi5Vi+yeiBKUQsxDrXrkJ03N6ea9uvAl+ccw0uiRegnRxCooYE EMxV7mTEsJOEnHUsgdmXo+zfRlDZgBLojOd2BKDKbe0VtIZzgXn5/uZ8x8UiLdYDtEiO l97dPYofvToFS1T2TQuxfRjT8jSbU6DyT7dRYdAN5Y9ILOpPodFONCKYYIDXE7CKgWKM iqrlFm9BGsF+PRStdPsalKv88qryB/MNQZWKiedXGQBxKVm0LwVOoiwmszWEbVuW/fYA GlCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305203; x=1779910003; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=FpulllsTUG6FzpTkprRKojqMKoB/gsAWNKKQzts57F0=; b=OUGIqnyq3AvJNpLvDZbzTmldz+uQ/yvBuFtsutiFGm6IrX0+QFTpCi3NDKeP5bi2B5 vjGTKxA97TkEBvjDfHLp8lQZt9HK2CPoqJaGGr8GQGApffnepcIZnIShndEiYHeG5wRw nk7ZQ/Kup+I8XHqFNIHsGMJKh8qhqdvUiSbE0s38LOXVabrkjCN8bDLMlsBW5TUSyVPs l5gl+I8FjG5ms+4ofL3Lab9yLxieMXBEzkKfaqiuolCxMwZXdj6x6/BHBP31DHS34cd5 G4hRPRO/HDhexH6XjR8LPPZ8k7wCjnjrcD/fCf8BKKJ3XzTOhV3Xf4AmWZC9F6nCuy7m ygqg== X-Gm-Message-State: AOJu0YzrWRdMZ4A103iviaBP4jOIVbpyqQ4ct4K5xzYqWE6+3ygyAtwO n1W/EBjqgzEtXPKsTSbqndqJp8x/3OKIIss46+ala/nEqVfuDimz5Wk4WNnXNI+OgmJrJCPWTed uzBcK+C4= X-Gm-Gg: Acq92OFdfLXyaK16NoBt6LEt7CLlC3ogALRdtqQZ+qNnAinSzP45ePHX86zGQDegvVw soiII0laBt35H3phntHEbNZfICI9gtlZXbt2YQmXA1I5SUnTN542EucRTBT6O+eucPJwkWmbMfY bE2fH7GnRF/G3DOYWvyCDIuewpPOGymnjHKP45CyYEW/I0PcHYXPUM/q6o52dA5uAZIvBq16b6M r1C4oX+3uVnvDMAxxy4/VDc7D86TjhurcTXGTycAAY2omh8P2I/U9+wRtA/F8blUMkZBTT8cF2N zBi0/lDgKDUGSPLy31Gb6jbY+2kPl8A4d1rQoNvOyB0T98ttewMX5oaihXr7ehittIgjuxryS4x 8roF41hJkZRtFl3aUjjAYgdzyWebgBRaJKk8wqyGdPYEgw/XRce5S4GMu1k2Yi8Fu0omcMhs8HX 9qOz+oI10T3CuwJsC88uQcbKAKUOQYyX3uPq3/cs9sLStxv4nr2YKWZukBfCbZJ+RY3b6CF2KVg +fKtosfx5w= X-Received: by 2002:a5d:64c6:0:b0:43d:71b:204b with SMTP id ffacd0b85a97d-45e5c5a518cmr40095565f8f.39.1779305203417; Wed, 20 May 2026 12:26:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 26/33] target/mips: add Octeon multiplier state Date: Wed, 20 May 2026 21:23:31 +0200 Message-ID: <20260520192338.40036-27-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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: qemu development 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: 1779305301309154100 From: James Hilliard Add per-thread Octeon multiplier state for the MPL and P limb banks used by the VMULU/VMM0/V3MULU instruction family. Octeon3 extends the older MPL0-MPL2/P0-P2 state with high lanes MPL3-MPL5/P3-P5, programmed by the two-source MTM/MTP forms. Represent both banks as uint64_t arrays so the TC state matches the architected 64-bit limb layout used by Octeon68XX user-mode code. Expose MPL/P as global TCG variables so the multiplier translators can expand inline without helper calls. Migrate the multiplier registers in an Octeon-only subsection so non-Octeon CPU models do not grow migration state. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: James Hilliard Signed-off-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-18-philmd@linaro.org> --- target/mips/cpu.h | 12 ++++++++++++ target/mips/tcg/translate.h | 2 ++ target/mips/system/machine.c | 33 +++++++++++++++++++++++++++++++++ target/mips/tcg/translate.c | 18 ++++++++++++++++++ 4 files changed, 65 insertions(+) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index b478f834c13..346713705a7 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -459,6 +459,14 @@ typedef struct mips_def_t mips_def_t; =20 =20 typedef struct TCState TCState; + +/* + * Octeon3 adds a second bank of multiplier/product limbs used by the + * two-source MTM/MTP forms: MPL0..2/P0..2 from rs and MPL3..5/P3..5 from = rt. + */ +#define OCTEON_MULTIPLIER_LANES 3 +#define OCTEON_MULTIPLIER_REGS (2 * OCTEON_MULTIPLIER_LANES) + struct TCState { target_ulong gpr[32]; #if defined(TARGET_MIPS64) @@ -497,6 +505,10 @@ struct TCState { target_ulong CP0_TCScheFBack; int32_t CP0_Debug_tcstatus; target_ulong CP0_UserLocal; + struct { + uint64_t MPL[OCTEON_MULTIPLIER_REGS]; + uint64_t P[OCTEON_MULTIPLIER_REGS]; + } octeon; =20 int32_t msacsr; =20 diff --git a/target/mips/tcg/translate.h b/target/mips/tcg/translate.h index 89dde1e7124..ab2e2173674 100644 --- a/target/mips/tcg/translate.h +++ b/target/mips/tcg/translate.h @@ -189,6 +189,8 @@ void gen_crc32(DisasContext *ctx, int rd, int rs, int r= t, int sz, int crc32c); extern TCGv cpu_gpr[32], cpu_PC; #if defined(TARGET_MIPS64) extern TCGv_i64 cpu_gpr_hi[32]; +extern TCGv_i64 oct_mpl[OCTEON_MULTIPLIER_REGS]; +extern TCGv_i64 oct_p[OCTEON_MULTIPLIER_REGS]; #endif extern TCGv cpu_HI[MIPS_DSP_ACC], cpu_LO[MIPS_DSP_ACC]; extern TCGv_i32 fpu_fcr0, fpu_fcr31; diff --git a/target/mips/system/machine.c b/target/mips/system/machine.c index 5880b401b07..f988b3695bc 100644 --- a/target/mips/system/machine.c +++ b/target/mips/system/machine.c @@ -120,6 +120,17 @@ static const VMStateDescription vmstate_inactive_tc = =3D { .fields =3D vmstate_tc_fields }; =20 +static const VMStateDescription vmstate_octeon_multiplier_tc =3D { + .name =3D "cpu/tc/octeon_multiplier", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (const VMStateField[]) { + VMSTATE_UINT64_ARRAY(octeon.MPL, TCState, OCTEON_MULTIPLIER_REGS), + VMSTATE_UINT64_ARRAY(octeon.P, TCState, OCTEON_MULTIPLIER_REGS), + VMSTATE_END_OF_LIST() + } +}; + /* MVP state */ =20 static const VMStateDescription vmstate_mvp =3D { @@ -247,6 +258,27 @@ static const VMStateDescription mips_vmstate_timer =3D= { } }; =20 +static bool mips_octeon_needed(void *opaque) +{ + MIPSCPU *cpu =3D opaque; + + return cpu->env.insn_flags & INSN_OCTEON; +} + +static const VMStateDescription mips_vmstate_octeon_multiplier =3D { + .name =3D "cpu/octeon_multiplier", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D mips_octeon_needed, + .fields =3D (const VMStateField[]) { + VMSTATE_STRUCT(env.active_tc, MIPSCPU, 1, + vmstate_octeon_multiplier_tc, TCState), + VMSTATE_STRUCT_ARRAY(env.tcs, MIPSCPU, MIPS_SHADOW_SET_MAX, 1, + vmstate_octeon_multiplier_tc, TCState), + VMSTATE_END_OF_LIST() + } +}; + const VMStateDescription vmstate_mips_cpu =3D { .name =3D "cpu", .version_id =3D 21, @@ -363,6 +395,7 @@ const VMStateDescription vmstate_mips_cpu =3D { }, .subsections =3D (const VMStateDescription * const []) { &mips_vmstate_timer, + &mips_vmstate_octeon_multiplier, NULL } }; diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index dac30aff8d3..123d2c89c3d 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -1179,6 +1179,8 @@ static TCGv cpu_lladdr, cpu_llval; static TCGv_i32 hflags; TCGv_i32 fpu_fcr0, fpu_fcr31; TCGv_i64 fpu_f64[32]; +TCGv_i64 oct_mpl[OCTEON_MULTIPLIER_REGS]; +TCGv_i64 oct_p[OCTEON_MULTIPLIER_REGS]; =20 static const char regnames_HI[][4] =3D { "HI0", "HI1", "HI2", "HI3", @@ -15276,6 +15278,22 @@ void mips_tcg_init(void) active_tc.gpr_hi[i= ]), rname); } + + for (unsigned i =3D 0; i < OCTEON_MULTIPLIER_REGS; ++i) { + static const char mpl_names[OCTEON_MULTIPLIER_REGS][5] =3D { + "MPL0", "MPL1", "MPL2", "MPL3", "MPL4", "MPL5", + }; + static const char p_names[OCTEON_MULTIPLIER_REGS][3] =3D { + "P0", "P1", "P2", "P3", "P4", "P5", + }; + + oct_mpl[i] =3D tcg_global_mem_new_i64( + tcg_env, offsetof(CPUMIPSState, active_tc.octeon.MPL[i]), + mpl_names[i]); + oct_p[i] =3D tcg_global_mem_new_i64( + tcg_env, offsetof(CPUMIPSState, active_tc.octeon.P[i]), + p_names[i]); + } #endif /* !TARGET_MIPS64 */ for (unsigned i =3D 0; i < 32; i++) { int off =3D offsetof(CPUMIPSState, active_fpu.fpr[i].wr.d[0]); --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305232; cv=none; d=zohomail.com; s=zohoarc; b=DkxSC2XShOWmeXxbITL8+yYJPLhewuSxN2nvZckLiGumQZ3OvJqKtmdzUjHm9lDibhFCwAvT23DqUWBA+ATv+Ch4NAuOjnaSjq3Z7h5tZO+iBM/AQZbk/dGsDqsekEI8uuBemiRFMp8ecxpz6ynEB9fENFgUO4wu2gDtqTYKkl0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305232; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=QQe8el8l0dZggGcXo3+tA+kFE0E6zkvuFFTrX++sfb0=; b=ncEtsoRE4GmQufZQkkJpS5L2oTkXL5eHLMi8GRSr4kPpk3kQJm0c8Bk1jtwlU3kvz3XejAHA6Wvz1UbCmS4fAObu/qwzg7qhUHY9Um1whkgs4bQa9PvYOWFOjPzOU+Urv090BTMH/6xfgWZzS/y59gmThbGuMf38XLf5fk363Ic= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305232097766.44709979919; Wed, 20 May 2026 12:27:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmZP-0005LE-J1; Wed, 20 May 2026 15:27:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmZE-0005CG-Fw for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:57 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmZA-0002hQ-7z for qemu-devel@nongnu.org; Wed, 20 May 2026 15:26:55 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-488af9fdaa7so26132535e9.1 for ; Wed, 20 May 2026 12:26:51 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48febe6faeasm138727165e9.26.2026.05.20.12.26.49 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:26:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305210; x=1779910010; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QQe8el8l0dZggGcXo3+tA+kFE0E6zkvuFFTrX++sfb0=; b=sniL1vUrC60VgzwUYg54eJ7fZPMxU7v6//8XWSrvl7on6j+cktTUwlZNMmFvbkT/Bz DU3CKcq3dMUmVBjmHAz+MbJQGKE3GW2P8dMAvU9CH+TF2V7DuLfLjErALcVkUx0qmjbE 9ke4axpVC3xYSUt46YRJ1brYzsHEeOF7moeJfVbDzgBK3LlBKHpvqvO4wvyxKvCJcRxP ZmNWP4NsNVXSGVCSxxHunwpV58zarTVchoRbkXs8mGRTw7xZ4hQ5veu7A6ISUbQu/PwL JHCFUA1filxHwIixRe00R2kR+fdeOtD7padCxzWZoxOk+PktJXDRyulCfu9tdNDXq77E 9xow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305210; x=1779910010; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=QQe8el8l0dZggGcXo3+tA+kFE0E6zkvuFFTrX++sfb0=; b=Z4jOPtrTb7RFajhmdQNDJhIA0/zbGbuY0aa6UaL5t7ZfhbuY8l7XUxj66G5eJ/Z6uM XhmkHs6e/AV5IG/T4EZUSapm/E4mvUGrLGQnpic591H7cKLhE/VfzprmZVhJ+MR/WAHT s+3hN1D/t9VveBHY+s88VBWYvHeCH687fSxzuiEf4EOH/V62vArKCy1SAT1/g1PY2wFz pKls58vxHvuL24bBidh38w77pLDKF2M9kFvLwqPqk+08ghg1iyFeWhcGkVkKT6Ic7j1Z CB32PXt/bWBhzWb2AvsGG9vjMaIufAvlgHyQWBbe3hxeZn7UTYpJRwQafQEwWnN6MOM9 9o6Q== X-Gm-Message-State: AOJu0Yw0vovUR9y2jojRce6lfT/bTuzV1jtyYfXwDriXS5Ox4u5yDlw2 +vUiFst3smRUG0hEINJMM+bLPfFmoWikYXZ6G9YFfRP7pquf5rSDfoIUl+CAxLYJ+V/zf+UcVu+ e9UMAUcQ= X-Gm-Gg: Acq92OFvRcCvgliYWXdpYLLDl1omjolvRT47xoTqyGpou/6u5KduWwUGvYW6xYgW3Ap y4s8DGR6h7Q51o9ZkCRRjSLUMjx8lQe0rR96hhg+CtuYOGJPB86ZR0rFTrFOgK9xLm5WMzo4MSG ZBP6nZ7rhytXlxDCeXnFGlI9VZI8rbYbGrX9iKJ1X/vcv44gXE5Q6iSnzLJxit6f3Z7RIPKJq8G yDgP2fJvl9jo6tRYqKWrDGW7460XyyeTsmrexiN2oa8IaZgYRHpYnj8a+nQWMMm3Bc36JmkBC2K adxLb6CLj+LIY/R75CJ9ITvVwwrJyB++vIdj4gh87NJTux5E+gCiOlQnpEqRaDrPIBSK8LwlnFH 2mo7DTlZ0jmeaSroknm2yTlq4oeZCeUJU9AR60GZbgihcpgDOrWmEiOmG3u/IyN24cqxDY5aQUW JIlfV4KstqHRopG2jZKZKenof99+z4lW74u77HqRR1eZ4fgMTJlFs/0XE72kyuTs8/Kpm5WWms X-Received: by 2002:a05:600c:3104:b0:488:ab1d:dcc5 with SMTP id 5b1f17b1804b1-48fe651b57fmr363829845e9.27.1779305210208; Wed, 20 May 2026 12:26:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 27/33] target/mips: add Octeon MTM instructions Date: Wed, 20 May 2026 21:23:32 +0200 Message-ID: <20260520192338.40036-28-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: qemu development 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: 1779305233356158500 From: James Hilliard Add the MTM0, MTM1, and MTM2 forms that load the Octeon3 multiplier operand pair from rs/rt into MPL[x] and MPL[x+3], then clear the partial products. For MPL0, also set MPL[1] to zero for backward compatibility with Octeon2 VMULU. Legacy single-source encodings have rt encoded as $zero, so the same translator path also preserves the older Octeon behavior. Reviewed-by: Richard Henderson Signed-off-by: James Hilliard Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-19-philmd@linaro.org> --- target/mips/tcg/octeon.decode | 7 +++++++ target/mips/tcg/octeon_translate.c | 32 ++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/target/mips/tcg/octeon.decode b/target/mips/tcg/octeon.decode index 01ed3b50beb..5139543b153 100644 --- a/target/mips/tcg/octeon.decode +++ b/target/mips/tcg/octeon.decode @@ -44,6 +44,13 @@ SNE 011100 ..... ..... ..... 00000 101011 @r3 SEQI 011100 rs:5 rt:5 imm:s10 101110 &cmpi SNEI 011100 rs:5 rt:5 imm:s10 101111 &cmpi =20 +&r2 rs rt +@r2 ...... rs:5 rt:5 ..... ..... ...... &r2 + +MTM0 011100 ..... ..... 00000 00000 001000 @r2 +MTM1 011100 ..... ..... 00000 00000 001100 @r2 +MTM2 011100 ..... ..... 00000 00000 001101 @r2 + &saa base rt @saa ...... base:5 rt:5 ................ &saa SAA 011100 ..... ..... 00000 00000 011000 @saa diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index 5392fed08a8..26b918d649a 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -209,3 +209,35 @@ static bool trans_ZCB(DisasContext *ctx, arg_ZCB *a) =20 return true; } + +static void octeon_zero_partial_product_state(void) +{ + for (int i =3D 0; i < OCTEON_MULTIPLIER_REGS; i++) { + tcg_gen_movi_i64(oct_p[i], 0); + } +} + +static bool trans_mtm(DisasContext *ctx, arg_r2 *a, unsigned int index) +{ + /* + * Octeon3 two-source MTM forms load lane index from rs and lane index= + 3 + * from rt. Legacy one-source forms encode rt as $zero. + */ + gen_load_gpr(oct_mpl[index], a->rs); + gen_load_gpr(oct_mpl[index + 3], a->rt); + + /* + * Octeon3 clears MPL1 with a write to MPL0 so that VMULU sequences re= main + * backward compatible with Octeon2. + */ + if (index =3D=3D 0) { + tcg_gen_movi_i64(oct_mpl[1], 0); + } + + octeon_zero_partial_product_state(); + return true; +} + +TRANS(MTM0, trans_mtm, 0); +TRANS(MTM1, trans_mtm, 1); +TRANS(MTM2, trans_mtm, 2); --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305318; cv=none; d=zohomail.com; s=zohoarc; b=XgQz0pP8j7coAIKtkYqoUFIl6SFV94kvxNQelnIQhELAl/2iVMbmueHHy5eUdrmK/6ciY0WcWYPINZQOuDm0DRosPtbsv6w8oUDn+XjFqX/bcgemMuGMEcahtDimDp+FXWDazHOmWg8VxyJv+fNu5zG9I6kn29keLz1HNF6ivgw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305318; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=9zyGeupsFi5w4Kk0zhf/ZzdmhgHd6jR1EYAUkg4DGbU=; b=AYJOhvezY88Ee7KyiEjr/CABF1M3TeQ1m7S9obYwp3zuKdR5MXajVs8JkDjUOWfyiO+mMA0Hm6/iXeOEil8AJ4KNLyodF3EHPsG5tVJz7HaQTApq4RuNoERaJdNpK2Fy06sg6OeAqkfVVT+g64vHruuhXLvt4XgfJkqw/eReinw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305318373625.7079954334923; Wed, 20 May 2026 12:28:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmZR-0005ci-4u; Wed, 20 May 2026 15:27:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmZI-0005G7-EV for qemu-devel@nongnu.org; Wed, 20 May 2026 15:27:00 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmZG-0002kP-J3 for qemu-devel@nongnu.org; Wed, 20 May 2026 15:27:00 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4891b0786beso36807135e9.1 for ; Wed, 20 May 2026 12:26:58 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49033d8e24bsm11914915e9.10.2026.05.20.12.26.56 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:26:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305217; x=1779910017; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9zyGeupsFi5w4Kk0zhf/ZzdmhgHd6jR1EYAUkg4DGbU=; b=yDKu8AMhMDJjSTWfuQba4weDm7cC1tI+axwPzSpByInKnjoFGq0g3QOw5aKogdj0jS WR0JX0as2jZYnIx5uOzbUZsJF56XyKYKrKRtdtMOFSPIUk2FIqZ+MKqUin/75RHzS1hx zlQNYF0bs/pfUX7bV2l6KCHE8/WUMwQaizL7cXL88yGKZ3MB8mE8ZHS4rhmMk4+90W5s nsMLUBGbTxkGIVZqFTArL9+VtpSsOMah56zGaPPDfhaDES1qabWrVsmquaqCwZuPOplt MydwFJvOhPhq0JS/3vAkc4fPfRUfoLigM6Np4YXaRYgQIiPSULn7XDgZvNejuMqXnz6V 0VNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305217; x=1779910017; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=9zyGeupsFi5w4Kk0zhf/ZzdmhgHd6jR1EYAUkg4DGbU=; b=RES2eGJYhXAIVGq3rxqXTdOiPqqpn7BxStObKLw+8P5VLhENJU1iWJP82yTbRCV/te RX/PpSBhGFKhPFy1CYoFjb0LTEC3DG6cT03ojQTt5mQpthoc56LsY59gOrqbOQUAQt2k xgvPwu8HPszHF7hl0/oFmzsDNM6lTnPUo1S8MKFc+MDXK49yiAdP6VHOfeuMowCyqUW8 ouiwrW9zh4LOztXM/bXJ8mJOmQvwoTiW+GhNLUG/TBvGT4hyLu++zbW8oDfxvNhy7BY3 E3W3gp6OJMpJ5W2cCjyFyLLRLp/baIFpfMUQU0NMckwaey0uqvwMmCnpAvl/M73RY3YU DTwA== X-Gm-Message-State: AOJu0YzalIZHC3Au9E5yEtQMtkfz6gVq9bh2whisCHj2yLiPBVQDpauP 8PwqbjHFIWzPe/IbELVbEoweiiDksCfUo68c1IALymQUHnYlXomyLdhDYl/3+ldA/mBBD2gc1PX 1zpOwnuA= X-Gm-Gg: Acq92OGYaG9CznRzbuHPklsHe1bLQ5pe/YRtO1tl0NtfbtRpBc0mQtNffmTUHhmxP2t n2DtpmP73wquu3w70w9IXwC+a1LnTVhASZWxJFlQcCt/vHFPuGgwDLiw/IDkoCWt3HSFFW8igIE K2u9XE7PaOF/Lg9zVfxf2/z/+tUSKkq4xvaASwcT+4ai2cz9ve4+IBX5CPzLwThhaVuSVR6ZT07 pK4ZAUW4gz/BihWeBp865oOdnr+e6PpogZmKd7z70ItEEiqobZCigfeUtp3J6DJ7Q7v9WTphWyw QGOPDqSmM2fe1X+/fKPstV+HmFky/LB5Iar+UrxEgZbhTzAeenjtmfrFdc0Mwx7T06HZCbwJx9A NYfWIZM+9OGMTAYqchy8m2H2rZF8knV96pjQe+eKSdg1RJoB5iqx8majDGbmLRh1E3hHvCEAiJ2 EC6NHrsk3bJ0uo9DNSywSKDBIT5f+CWKUIhMywhGYwLs64v28TSO5yWmyiBewUEMFWOVM7bi+6M gqnNe/pat8= X-Received: by 2002:a05:600c:3b26:b0:490:261d:7dfe with SMTP id 5b1f17b1804b1-490261d7e2bmr93093665e9.6.1779305217026; Wed, 20 May 2026 12:26:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 28/33] target/mips: add Octeon MTP instructions Date: Wed, 20 May 2026 21:23:33 +0200 Message-ID: <20260520192338.40036-29-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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: qemu development 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: 1779305320278158500 From: James Hilliard Add the MTP0, MTP1, and MTP2 forms. MTP0 loads the low Octeon3 partial-product pair from rs/rt into P[0]/P[3], MTP1 loads the middle pair into P[1]/P[4], and MTP2 loads the high pair into P[2]/P[5]. For MTP0, also set P[1] to zero for backward compatibility with Octeon2 VMULU. Legacy single-source encodings have rt encoded as $zero, so the same translator path also preserves the older Octeon behavior. Reviewed-by: Richard Henderson Signed-off-by: James Hilliard Signed-off-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-20-philmd@linaro.org> --- target/mips/tcg/octeon.decode | 4 ++++ target/mips/tcg/octeon_translate.c | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/target/mips/tcg/octeon.decode b/target/mips/tcg/octeon.decode index 5139543b153..bb0a9f1d99a 100644 --- a/target/mips/tcg/octeon.decode +++ b/target/mips/tcg/octeon.decode @@ -51,6 +51,10 @@ MTM0 011100 ..... ..... 00000 00000 001000 @r2 MTM1 011100 ..... ..... 00000 00000 001100 @r2 MTM2 011100 ..... ..... 00000 00000 001101 @r2 =20 +MTP0 011100 ..... ..... 00000 00000 001001 @r2 +MTP1 011100 ..... ..... 00000 00000 001010 @r2 +MTP2 011100 ..... ..... 00000 00000 001011 @r2 + &saa base rt @saa ...... base:5 rt:5 ................ &saa SAA 011100 ..... ..... 00000 00000 011000 @saa diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index 26b918d649a..10c7d18ad4f 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -241,3 +241,26 @@ static bool trans_mtm(DisasContext *ctx, arg_r2 *a, un= signed int index) TRANS(MTM0, trans_mtm, 0); TRANS(MTM1, trans_mtm, 1); TRANS(MTM2, trans_mtm, 2); + +static bool trans_mtp(DisasContext *ctx, arg_r2 *a, unsigned int index) +{ + /* + * Octeon3 two-source MTP forms load lane index from rs and lane index= + 3 + * from rt. Legacy one-source forms encode rt as $zero. + */ + gen_load_gpr(oct_p[index], a->rs); + gen_load_gpr(oct_p[index + 3], a->rt); + + /* + * Octeon3 clears P1 with a write to P0 so that VMULU sequences remain + * backward compatible with Octeon2. + */ + if (index =3D=3D 0) { + tcg_gen_movi_i64(oct_p[1], 0); + } + return true; +} + +TRANS(MTP0, trans_mtp, 0); +TRANS(MTP1, trans_mtp, 1); +TRANS(MTP2, trans_mtp, 2); --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305264; cv=none; d=zohomail.com; s=zohoarc; b=M1/VkPKhYDKLxDtpZIl5j0xQ7aSoVuhH9zfojLZJSdWmAgk5wV/AJKxKEyTMzZt2mMmZsYICpzVE82m4CPvIxQ2mhbaNUXWrPLTl2oWOKzTR+pK4YYBxZnnPmUxTrqbSOu0WLBod6vlBIg3B0JazlSN5hZ69Vffg8jjyRPZtui0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305264; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=QpeR6VNLYWCMRnGcfiT4PidRz3KwpHi6ihVaa90Wad8=; b=lqx1k/GVTU1+ZtTZeS/9yEGbhSiFmWP8q6/+nmaWxDi/LdjhMQPCtkMp2O9VsFd9eCgTBhZtPmbnK082rzamB5tWbA0YnifiFTQphgyBzW08O8i4uB9yjKP+WMnO3VnoNDIXQusQh3mUQaGehpmLRNfGrfzEha/xb7V0Y/NwArs= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305264738142.58676749460983; Wed, 20 May 2026 12:27:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmZT-0005sf-JZ; Wed, 20 May 2026 15:27:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmZQ-0005cK-Px for qemu-devel@nongnu.org; Wed, 20 May 2026 15:27:08 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmZO-0002mG-Ha for qemu-devel@nongnu.org; Wed, 20 May 2026 15:27:08 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-48896199cbaso41568135e9.1 for ; Wed, 20 May 2026 12:27:05 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45d9ec3b18fsm51610522f8f.11.2026.05.20.12.27.03 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:27:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305224; x=1779910024; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QpeR6VNLYWCMRnGcfiT4PidRz3KwpHi6ihVaa90Wad8=; b=jsHRkglYQS59mo69PDKcN7udvh7WQFO/Hkr6yEaEmdw2TsSbUfWVjgvBko/lZdVuS+ p/hPN1VHOUTNF3wCRE8D/0+b5JqB5MUbjVnUFpqb3f2VQCVpLxISElE2hzrU8L4PYwYQ 5hbiTtR0hup43N7wDvvcmlNKewl4J93cg9hkQ4p4NxYwh/z+78XUTjkw5S8PDPRf/iJY HeJztEZX2csTP7SixIx+5XGpIgRoJC76FuOJ/CxdzHTxOwFIuZAMOa9CVn4cQYj1Ysmi sXl+FxtKQh0ZE0K2/38b4QgTNAtgXUjOENyfurcVFlX6TYl9a1HI1XuBwmWdRcLwGZ6s tgig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305224; x=1779910024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=QpeR6VNLYWCMRnGcfiT4PidRz3KwpHi6ihVaa90Wad8=; b=eYshMwwjk+75URZolHSr6ih8qGv8LVS00YJZb6Kbvg/S5NXnCe+3I/QZIKCGAlDzFp YQxkMKQ3ydYZ1dG83F6KevaKQcgPxIdIp25Jtp6wl48dQM9sZb/ShXZ0jZSZb5cb0voR W8vTYq5AW1NI1T8QO/WKiLHEuhz8lJfZjw/sVp9szb5RaxmOdyFeQaqzWbuWXARXjmEp ltUA4bIttII62l6QJl1JvOVHf7KvWrXibkl/dCj9Vq8tYuiYlGBTsGfSmVD48m77lVI1 bzXnmgO5b4+vRMZhOTdX+cVX3KBP6y2GE5Zi3MqSOVMSlJMkwKNXSWTZwDwArhmCrkH7 7sIQ== X-Gm-Message-State: AOJu0YzPPaXdkjW/HEbuZMOa0pONXW9FosfCtvzae20uORIs48lrpbkQ 5Ux5qp/ymMb7BpYOKw+t77lRNnEEpyN4beURVj9+4DO5/pnmPrq2WMp0sbau8NQQHtvh7+LPokw DEqmbNUw= X-Gm-Gg: Acq92OGIcZlRvUm43IqqP8LWMk+6mjvTktT7GdsFsoFB5Pi7Kq2YmFaJRNGfIF2dOXq LyRmjXWTTf0OvX38kMRVekF4BLM2R8QGR4bftxTRgAxjvGSx6+los47ng1snWNtSLnDPwQIv7/q gUZKTbphrkb+CIokrePTyx6MExxOIScobPBB8Nc/ejo7eGaj3Fgn3kdAp8wMT2OhwBmpU29vH6z 85gi1Vcz/z4iKpNmkj0a3VS7B2W6vLV15z3s0odoyt0TMEGKB7y9AIjx0maYWw/qh4jZumRjRxt 19wzysWdKLeBVF6YlY0pUeE3w4UN4yiGBU8GIZ5SeY26zUVC8EhQVzfZrQb7Rj1cJvQNGR5jnNA jTRR0NJB2EroAbdR6KQGSHrLSUVIWJLSTtV7/eJj+HKNB0NrkIgmFLKC2TIfvR5Zoh4z003i24I szpwSwg0/cx4Xv4MSFIU7+mPQJwS7znMWHoHP1c67x+ArWw4580nAlI8gkhecSlclnv8bkh6eH0 KvYJmkDxu8= X-Received: by 2002:a05:600c:6098:b0:48f:d1b8:9ab1 with SMTP id 5b1f17b1804b1-48fe60ecc51mr438657035e9.9.1779305223902; Wed, 20 May 2026 12:27:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 29/33] target/mips: add Octeon VMULU instruction Date: Wed, 20 May 2026 21:23:34 +0200 Message-ID: <20260520192338.40036-30-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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: qemu development 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: 1779305265704158500 From: James Hilliard VMULU multiplies the active Octeon multiplier state by rs, adds rt and queued partial products, returns the low result, and advances P[0]/P[1] with carry limbs. Expand the two-limb accumulator operation inline with TCG so the result and partial-product state stay visible to the optimizer. Add a mips64/mips64el linux-user TCG smoke test for representative Octeon multiplier instruction paths. Include hardware-backed regression coverage for MTP0 P1 zeroing. Signed-off-by: James Hilliard Signed-off-by: Richard Henderson Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-21-philmd@linaro.org> --- target/mips/tcg/octeon.decode | 2 + target/mips/tcg/octeon_translate.c | 35 +++++++++++++ tests/tcg/mips/user/isa/octeon/octeon-insns.c | 49 +++++++++++++++++++ 3 files changed, 86 insertions(+) diff --git a/target/mips/tcg/octeon.decode b/target/mips/tcg/octeon.decode index bb0a9f1d99a..36ced0bb333 100644 --- a/target/mips/tcg/octeon.decode +++ b/target/mips/tcg/octeon.decode @@ -55,6 +55,8 @@ MTP0 011100 ..... ..... 00000 00000 001001 @r2 MTP1 011100 ..... ..... 00000 00000 001010 @r2 MTP2 011100 ..... ..... 00000 00000 001011 @r2 =20 +VMULU 011100 ..... ..... ..... 00000 001111 @r3 + &saa base rt @saa ...... base:5 rt:5 ................ &saa SAA 011100 ..... ..... 00000 00000 011000 @saa diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index 10c7d18ad4f..a21f96b5c2a 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -264,3 +264,38 @@ static bool trans_mtp(DisasContext *ctx, arg_r2 *a, un= signed int index) TRANS(MTP0, trans_mtp, 0); TRANS(MTP1, trans_mtp, 1); TRANS(MTP2, trans_mtp, 2); + +static bool trans_VMULU(DisasContext *ctx, arg_VMULU *a) +{ + TCGv_i64 x[3], y[3], z[3]; + TCGv_i64 tmp =3D tcg_temp_new_i64(); + TCGv_i64 zero =3D tcg_constant_i64(0); + + z[0] =3D y[0] =3D tcg_temp_new_i64(); + z[1] =3D y[1] =3D tcg_temp_new_i64(); + z[2] =3D y[2] =3D tcg_temp_new_i64(); + x[0] =3D tcg_temp_new_i64(); + x[1] =3D tcg_temp_new_i64(); + x[2] =3D zero; + + /* Z =3D rs * (mpl1 : mpl0) + rt */ + gen_load_gpr(tmp, a->rs); + gen_load_gpr(y[0], a->rt); + tcg_gen_mulu2_i64(x[0], x[1], tmp, oct_mpl[0]); + tcg_gen_mulu2_i64(y[1], y[2], tmp, oct_mpl[1]); + tcg_gen_addN_i64(3, z, y, x); + + /* X =3D=3D (0 : p1 : p0) */ + x[0] =3D oct_p[0]; + x[1] =3D oct_p[1]; + + /* Y =3D=3D (p1 : p0 : tmp) */ + y[0] =3D tmp; + y[1] =3D oct_p[0]; + y[2] =3D oct_p[1]; + + /* (p1 : p0 : rd) =3D Z + (0 : p1 : p0) */ + tcg_gen_addN_i64(3, y, z, x); + gen_store_gpr(tmp, a->rd); + return true; +} diff --git a/tests/tcg/mips/user/isa/octeon/octeon-insns.c b/tests/tcg/mips= /user/isa/octeon/octeon-insns.c index 3c3802ebfee..4647e47f371 100644 --- a/tests/tcg/mips/user/isa/octeon/octeon-insns.c +++ b/tests/tcg/mips/user/isa/octeon/octeon-insns.c @@ -86,6 +86,53 @@ static uint64_t octeon_sne(uint64_t rs, uint64_t rt) return rd; } =20 +static uint64_t octeon_vmulu(uint64_t mpl0, uint64_t rs, uint64_t rt) +{ + uint64_t rd; + + asm volatile( + "move $8, %[mpl0]\n\t" + "move $9, $0\n\t" + ".word 0x71090008\n\t" /* mtm0 $8, $9 */ + "move $8, %[rs]\n\t" + "move $9, %[rt]\n\t" + ".word 0x7109500f\n\t" /* vmulu $10, $8, $9 */ + "move %[rd], $10\n\t" + : [rd] "=3Dr" (rd) + : [mpl0] "r" (mpl0), [rs] "r" (rs), [rt] "r" (rt) + : "$8", "$9", "$10"); + + return rd; +} + +static uint64_t octeon_mtp0_zeroes_p1(void) +{ + uint64_t rd; + + asm volatile( + "move $8, %[mpl0]\n\t" + "move $9, $0\n\t" + ".word 0x71090008\n\t" /* mtm0 $8, $9 */ + "move $8, %[p1]\n\t" + "move $9, $0\n\t" + ".word 0x7109000a\n\t" /* mtp1 $8, $9 */ + "move $8, $0\n\t" + "move $9, $0\n\t" + ".word 0x71090009\n\t" /* mtp0 $8, $9 */ + "move $8, $0\n\t" + "move $9, $0\n\t" + ".word 0x7109500f\n\t" /* vmulu $10, $8, $9 */ + "move $8, $0\n\t" + "move $9, $0\n\t" + ".word 0x7109500f\n\t" /* vmulu $10, $8, $9 */ + "move %[rd], $10\n\t" + : [rd] "=3Dr" (rd) + : [mpl0] "r" (0ULL), [p1] "r" (1ULL) + : "$8", "$9", "$10"); + + return rd; +} + int main(void) { assert(octeon_baddu(0x123, 0x0f0) =3D=3D 0x13); @@ -95,6 +142,8 @@ int main(void) assert(octeon_seq(0xabc, 0xdef) =3D=3D 0); assert(octeon_sne(0xabc, 0xabc) =3D=3D 0); assert(octeon_sne(0xabc, 0xdef) =3D=3D 1); + assert(octeon_vmulu(5, 7, 11) =3D=3D 46); + assert(octeon_mtp0_zeroes_p1() =3D=3D 0); =20 return 0; } --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305264; cv=none; d=zohomail.com; s=zohoarc; b=SmaVInQ85DZRwJhVD8Iliiy53/Ve1XCPqZX5DOlZ9vLHNUaeObNZpfwauMjmVoHSJMwDmENRtgl58tMHMqNC5wglI9uZiO+wWnQo8hk3/JNZxrKdajXOwnfO2Cj8yVrIrzaL1oCq9BASiFLh1P9ZMQoGwsouy6Wq8QaWqLAn/+0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305264; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=KqgGR6pc8UMFMnbMlZ+iVengJ0bhoyZNsG4J/Qy/r6A=; b=C4rCfhjgwG+eK6q1XwclsiLlQjFbr+NkcxryGLoNP9ntsm0A3APTgv6/ugEwADFXcFKWTkR2UiJh9kVoLKo5Yg+dckHUyQvPr8fGeZ+412HW9miKGmFk/0kltChBD7y+TXBO5h2m49NLkAhPp6D377t2mMGkq/yt3LWqA6xsaGA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305264299123.24053022691282; Wed, 20 May 2026 12:27:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmZc-0006WZ-5P; Wed, 20 May 2026 15:27:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmZY-0006N7-2y for qemu-devel@nongnu.org; Wed, 20 May 2026 15:27:16 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmZV-0002nO-PH for qemu-devel@nongnu.org; Wed, 20 May 2026 15:27:15 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-48fde648a71so38825245e9.0 for ; Wed, 20 May 2026 12:27:13 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49033d3514esm13580565e9.3.2026.05.20.12.27.09 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:27:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305231; x=1779910031; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=KqgGR6pc8UMFMnbMlZ+iVengJ0bhoyZNsG4J/Qy/r6A=; b=r/UbkQDVMA9i0NpotXmpQcd/pcl6FDxeHxyoL5Nw7Y0ksCaDhFpfkSUzIEJubJYIsW 7hiYJlJemJG9SBCIjXF0mD1ojAWNGNEZwnJ5PRUyDAL+hAPjWlyT/UZyZbVrJJnaEqOv gbUivrmucQFS77MCEU60ZvJa/SHKwrbw3CDr0HThaQsVLxKNdEZQfI7Ble76BdNyObUN 6772dq57cm6gyRxRBq0Ksg5JMr3zWCkTwRVEoLH4dXDJrO8PQZ4ZTY/bNefW6757r0JR 9F5ZQJ+vgO/wgLW9AJi1oRmOaSXKf88CcSY4N+KtTFEbgsWBTVIwRR1W6Fo5zpEEWUTW GU5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305231; x=1779910031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=KqgGR6pc8UMFMnbMlZ+iVengJ0bhoyZNsG4J/Qy/r6A=; b=iEDenw7v99m2jvSWmFcwowNkModNYFuY3wxBzSmeOwYntqtFnyQrRI9X+/UUpxwl6s TUv1LwW/lIYW5ourri98ikjHJMwtPUsOpW5YZruFDZJ6zd/0wjKZij/655sJ5Sj9gAYe 7niw6V7ut88MytBa4qHdb259y8/P5tKP67f0/ZULoJyVZj+jmHTgTBQ7Iq27a43PY8b0 ZsDMEtwlRfqcHmdMl02UFc/mQLTG7RDl4u8Iwf1XwHReTTvnV/8Bs1sQgbqmmiVU192X c79I9Uowt2xakzY/E+PpqxIVsb+N3uV+b/rO1slm4jDpoUzYtc0bi9JvYfk+5viPIhrU RTvg== X-Gm-Message-State: AOJu0Yx6CfLnjanUBTeDP2YKp7S/sARE8p/EM4lwmf3GZvedU5/hatsN AAdWPHBIJ3zw04Z3Y/j7hvtTM+/JQT5bO7KVRAKwTww1jKfBgxwLkk3AVY+qRtrH4aDSGk5WV87 DM64SdSI= X-Gm-Gg: Acq92OFq5Gg2jRxjilGoIaJkME6BWS8B/LJrx4Ojam8eQCBEHO/bGVYGImk+hqhIoKd DT7TALzWdxQNnJoLnUhP8WN2L/jsEk76IsXJy0POFyJY+Y7k4nDRoVWSJh5+t+oTCr+S6Ot7ZQA cUEnqY3U9UMjwTlkFgkvUIcEGkqC5ipFDMHxQT74Xft0LDwE97Of2w0ZQpbfkIgFlrnw7tGdljJ duy+7wu8PBNS1XYVTwFu2r2hcvhQsT4xgyzIw+Uou7dyRgDFHlsR7Xfh5XYqtaxPvGzqgxUs0cv VVWfa8DjyP4zxWb8VHK/pABFMkk/uSF7hf9iRlp/B7nG4OEco40h9ifUf1fgz9YjwSHj7OHdf1s m0LH6Z02EJNM/vlcGoH66I0hhToWPjX2pNk1qU2VghPwikhOtg0hBxVyfufY8+g3Swc3Uj9633a 8v2dW6eaiixUV94T6+mzmDLpEN2Tvm1IcEOls/G0b+5kHDvRl6dgvUvLkbCGaOV4rAyShLLLB1f CxEXDx/f8Y= X-Received: by 2002:a05:600c:4752:b0:48f:e230:29f4 with SMTP id 5b1f17b1804b1-49033d8fee1mr9649095e9.15.1779305231597; Wed, 20 May 2026 12:27:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 30/33] target/mips: add Octeon VMM0 instruction Date: Wed, 20 May 2026 21:23:35 +0200 Message-ID: <20260520192338.40036-31-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: qemu development 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: 1779305266346154100 From: James Hilliard VMM0 multiplies MPL[0] by rs, adds rt and the queued P[0] partial product, returns the low result, and feeds that result back into MPL[0]. It sets MPL[1] to zero and clears partial products. Include hardware-backed regression coverage for VMM0 MPL1 zeroing. Reviewed-by: Richard Henderson Signed-off-by: James Hilliard Signed-off-by: Richard Henderson Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-22-philmd@linaro.org> --- target/mips/tcg/octeon.decode | 1 + target/mips/tcg/octeon_translate.c | 16 ++++++ tests/tcg/mips/user/isa/octeon/octeon-insns.c | 55 +++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/target/mips/tcg/octeon.decode b/target/mips/tcg/octeon.decode index 36ced0bb333..f9c32e1dee1 100644 --- a/target/mips/tcg/octeon.decode +++ b/target/mips/tcg/octeon.decode @@ -56,6 +56,7 @@ MTP1 011100 ..... ..... 00000 00000 001010 @r2 MTP2 011100 ..... ..... 00000 00000 001011 @r2 =20 VMULU 011100 ..... ..... ..... 00000 001111 @r3 +VMM0 011100 ..... ..... ..... 00000 010000 @r3 =20 &saa base rt @saa ...... base:5 rt:5 ................ &saa diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index a21f96b5c2a..94f3cf9edd8 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -299,3 +299,19 @@ static bool trans_VMULU(DisasContext *ctx, arg_VMULU *= a) gen_store_gpr(tmp, a->rd); return true; } + +static bool trans_VMM0(DisasContext *ctx, arg_VMM0 *a) +{ + TCGv_i64 tmp =3D tcg_temp_new_i64(); + + gen_load_gpr(tmp, a->rs); + tcg_gen_mul_i64(oct_mpl[0], oct_mpl[0], tmp); + gen_load_gpr(tmp, a->rt); + tcg_gen_add_i64(oct_mpl[0], oct_mpl[0], tmp); + tcg_gen_add_i64(oct_mpl[0], oct_mpl[0], oct_p[0]); + gen_store_gpr(oct_mpl[0], a->rd); + + tcg_gen_movi_i64(oct_mpl[1], 0); + octeon_zero_partial_product_state(); + return true; +} diff --git a/tests/tcg/mips/user/isa/octeon/octeon-insns.c b/tests/tcg/mips= /user/isa/octeon/octeon-insns.c index 4647e47f371..9153e37e9e0 100644 --- a/tests/tcg/mips/user/isa/octeon/octeon-insns.c +++ b/tests/tcg/mips/user/isa/octeon/octeon-insns.c @@ -105,6 +105,59 @@ static uint64_t octeon_vmulu(uint64_t mpl0, uint64_t r= s, uint64_t rt) return rd; } =20 +static uint64_t octeon_vmm0(uint64_t mpl0, uint64_t p0, + uint64_t rs, uint64_t rt) +{ + uint64_t rd; + + asm volatile( + "move $8, %[mpl0]\n\t" + "move $9, $0\n\t" + ".word 0x71090008\n\t" /* mtm0 $8, $9 */ + "move $8, %[p0]\n\t" + "move $9, $0\n\t" + ".word 0x71090009\n\t" /* mtp0 $8, $9 */ + "move $8, %[rs]\n\t" + "move $9, %[rt]\n\t" + ".word 0x71095010\n\t" /* vmm0 $10, $8, $9 */ + "move %[rd], $10\n\t" + : [rd] "=3Dr" (rd) + : [mpl0] "r" (mpl0), [p0] "r" (p0), + [rs] "r" (rs), [rt] "r" (rt) + : "$8", "$9", "$10"); + + return rd; +} + +static uint64_t octeon_vmm0_zeroes_mpl1(void) +{ + uint64_t rd; + + asm volatile( + "move $8, %[mpl0]\n\t" + "move $9, $0\n\t" + ".word 0x71090008\n\t" /* mtm0 $8, $9 */ + "move $8, %[mpl1]\n\t" + "move $9, $0\n\t" + ".word 0x7109000c\n\t" /* mtm1 $8, $9 */ + "move $8, %[vmm0_rs]\n\t" + "move $9, $0\n\t" + ".word 0x71095010\n\t" /* vmm0 $10, $8, $9 */ + "move $8, %[vmulu_rs]\n\t" + "move $9, $0\n\t" + ".word 0x7109500f\n\t" /* vmulu $10, $8, $9 */ + "move $8, $0\n\t" + "move $9, $0\n\t" + ".word 0x7109500f\n\t" /* vmulu $10, $8, $9 */ + "move %[rd], $10\n\t" + : [rd] "=3Dr" (rd) + : [mpl0] "r" (1ULL), [mpl1] "r" (1ULL), + [vmm0_rs] "r" (2ULL), [vmulu_rs] "r" (1ULL) + : "$8", "$9", "$10"); + + return rd; +} + static uint64_t octeon_mtp0_zeroes_p1(void) { uint64_t rd; @@ -143,6 +196,8 @@ int main(void) assert(octeon_sne(0xabc, 0xabc) =3D=3D 0); assert(octeon_sne(0xabc, 0xdef) =3D=3D 1); assert(octeon_vmulu(5, 7, 11) =3D=3D 46); + assert(octeon_vmm0(5, 13, 7, 11) =3D=3D 59); + assert(octeon_vmm0_zeroes_mpl1() =3D=3D 0); assert(octeon_mtp0_zeroes_p1() =3D=3D 0); =20 return 0; --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305296; cv=none; d=zohomail.com; s=zohoarc; b=n4wRhKsVdKl6YykAiQq40z/WVWzUT1awlppCGrq8ZCFQSP0Be8j9CdyVzaAME1eBeAd3lDDiSIx06pMtEDKPjtPsNg17q+CuHVuFZwMNtfpi8EbA/xTHr3f0keroF/1aexf8CHmjPaTYtbOG39WuxYa9kWco97xuwacZGVFcphk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305296; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=ulqIFdbjsPKjZC89ctv2e5sJux9Wn7qpOsmZ8ay+gJU=; b=YjLXUeN3HDFQReKafxCGQXvwGyQiz2SGYllD73slwgy5/RP30QZ9ZmRco3L0ASxMcsHx6P72NL61C4Gx++k+Hsmcxi79CYd03/1+FBk6e+jeuHDjKp88iHiMXrEIgPafZyofyowfPfWMPwLVDwoFdqr32AC1cmFYq6vrkf0Yd3M= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305296537657.0884884765861; Wed, 20 May 2026 12:28:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmZg-0006ql-Lx; Wed, 20 May 2026 15:27:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmZe-0006g6-5v for qemu-devel@nongnu.org; Wed, 20 May 2026 15:27:22 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmZc-0002o0-0r for qemu-devel@nongnu.org; Wed, 20 May 2026 15:27:21 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4891e86fabeso70082845e9.1 for ; Wed, 20 May 2026 12:27:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45d9adc2209sm53074286f8f.0.2026.05.20.12.27.17 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:27:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305238; x=1779910038; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ulqIFdbjsPKjZC89ctv2e5sJux9Wn7qpOsmZ8ay+gJU=; b=CYV6DgC8RuISNwyOg0erQBknP6aUhj4STIesmKze4FqHM3FQ1w7nTbNl8bh+Hp3hxn EcTpF417tNCOal/AQeah7QNMPtCroHEn2e7VWU7N7b5wYHdNpXHc+t2MZkweN9JWeuL3 mANfMX5PkQ6Q02EeDgomV0d4fE2hBM4zHg3L47IVCHXtj/BYY7H+j3/SSRbsyJWUFqDr Gfh6b90UlGukPW3ExvjwtEp5Gb+ZFNqGaznvBQv0RNwFHRdv/xur1aAF5mv24w6wf+8E 8fD3mOWeizqLTVkvufOTNJniOXR6A5q/A0x1wXmrq/EJfBeVSNHIR3tlelbQpuKElu4g CkzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305238; x=1779910038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ulqIFdbjsPKjZC89ctv2e5sJux9Wn7qpOsmZ8ay+gJU=; b=JB8N3EiJf/LCr8XQw4wV9dQ0SETWTPzlhxamDoC7fv4gfnLuL8J0dTXjXrpdXfXvNc TenwgLtepdB8XC8aTGVISIeEdaBRO/IzOz2Xgxc29dl441yZH6QTc9APuz2293yuGdcN /KyzliFLp5BKXjEArmCyZtjqY1Hb4m4UraV0R2tXhQE22o/EopUSKzSsg6Qid3Jk9hpH sNTWVSiQIlC2K7JkBJhSZp9uHzz0anniEf70PC39AEa7eVy4/ycOpDXGwCHS9BSYWSoy jqqNbdnUTx7A7l1hBKXooEDpHE3TxzNWlkszAQawfOE1bqPz9faW3nR1AC7QKndQl2XX WCoA== X-Gm-Message-State: AOJu0YyDHr9aNTsKR441YusDsLcAUsd2NjNxPqy4IDPSJS0GI7JoZ+31 kMe0iJtAXZgp0mJJeXN1ED0N+9gD7BKkA4ZDP7LRKY+1mBX8YZT7keHkodvRnMm+LY3FFIodMew DfegI5oM= X-Gm-Gg: Acq92OGMqgZSrcM9jvqflUFJ9p2jzjIYrJuq9gw050U6NtHZSQJu36mIN2vWr4Ow7sW 8+wQbRlC9/wkY3nwhy5DPtY+M+z4f2pYgJCn00tUMaAC6X9uWBH/0RHbkJDiXcXqfANo/l3Y7Tu ztzGv6CEZGBi3cq5RDMcSqKIU3v4plU8qDWwARVSduoAHA4lVyOCyMHd/1/iFMRnqX/VpWV3ghu wu8Axjp22WUL/sf91D+f8Aj+H0mRAVglGV4q9hgpS0FSmeivMNjxGjKLZQrSntbUEzI0f+wTV1E mFYI2Hl59Y/kHwj8/RFt+DgT5sWaj+JBxErW77mP6LEEHDydsk0MiU6rJabOcfzsozUEHjSZZ72 UTzH8BzThmDolEd/p0TOwxlG29Vrn/tlRpO8sifeKZxy1MekLcy/Dy6F06hzV1cdRfsdOj/clWO h294L0vOb3RplJWhhDlmnf8aKLNcrLY9iuP0EwCwAfZjt1Rsr0Cw15bjgkS/x0O9tLuE8ccB2w X-Received: by 2002:a05:600d:c:b0:48a:56de:d62a with SMTP id 5b1f17b1804b1-48fe60eca75mr349028125e9.11.1779305238322; Wed, 20 May 2026 12:27:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 31/33] target/mips: add Octeon V3MULU instruction Date: Wed, 20 May 2026 21:23:36 +0200 Message-ID: <20260520192338.40036-32-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: qemu development 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: 1779305297988158500 From: James Hilliard V3MULU extends VMULU across the full Octeon3 multiplier state, adding rt and queued partial products. Return the low result while shifting the remaining accumulated limbs back into P[0] through P[5]. Reviewed-by: Richard Henderson Signed-off-by: James Hilliard Signed-off-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-23-philmd@linaro.org> --- target/mips/tcg/octeon.decode | 1 + target/mips/tcg/octeon_translate.c | 40 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/target/mips/tcg/octeon.decode b/target/mips/tcg/octeon.decode index f9c32e1dee1..4d0ad058347 100644 --- a/target/mips/tcg/octeon.decode +++ b/target/mips/tcg/octeon.decode @@ -57,6 +57,7 @@ MTP2 011100 ..... ..... 00000 00000 001011 @r2 =20 VMULU 011100 ..... ..... ..... 00000 001111 @r3 VMM0 011100 ..... ..... ..... 00000 010000 @r3 +V3MULU 011100 ..... ..... ..... 00000 010001 @r3 =20 &saa base rt @saa ...... base:5 rt:5 ................ &saa diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index 94f3cf9edd8..7ec942fa347 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -315,3 +315,43 @@ static bool trans_VMM0(DisasContext *ctx, arg_VMM0 *a) octeon_zero_partial_product_state(); return true; } + +static bool trans_V3MULU(DisasContext *ctx, arg_V3MULU *a) +{ + TCGv_i64 x[7], y[7], z[7]; + TCGv_i64 tmp =3D tcg_temp_new_i64(); + + for (int i =3D 0; i < 7; ++i) { + z[i] =3D tcg_temp_new_i64(); + y[i] =3D tcg_temp_new_i64(); + } + memcpy(&x[0], z, 6 * sizeof(TCGv_i64)); + x[6] =3D tcg_constant_i64(0); + + /* + * Z =3D rs * mpl -- 64x384->448 bit multiply + * Compute even partial products into X and odd partial products into = Y. + * Include RT into the odd partial products, which are 0 in bits [63:0= ]. + */ + gen_load_gpr(tmp, a->rs); + gen_load_gpr(y[0], a->rt); + for (int i =3D 0; i < 6; i +=3D 2) { + tcg_gen_mulu2_i64(x[i + 0], x[i + 1], tmp, oct_mpl[i]); + tcg_gen_mulu2_i64(y[i + 1], y[i + 2], tmp, oct_mpl[i + 1]); + } + + /* Sum even and odd to produce final product, plus rt. */ + tcg_gen_addN_i64(7, z, x, y); + + /* X =3D=3D (0 : p5 : p4 : p3 : p2 : p1 : p0) -- x[6] is still 0 */ + memcpy(&x[0], oct_p, 6 * sizeof(TCGv_i64)); + + /* Y =3D=3D (p5 : p4 : p3 : p2 : p1 : p0 : tmp) */ + memcpy(&y[1], oct_p, 6 * sizeof(TCGv_i64)); + y[0] =3D tmp; + + /* (p* : rd) =3D (0 : p*) + (rs * mpl + rt) */ + tcg_gen_addN_i64(7, y, x, z); + gen_store_gpr(tmp, a->rd); + return true; +} --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305330; cv=none; d=zohomail.com; s=zohoarc; b=Np3kEE/iCRpJ1WTHaJIV3SXL5tXZQGS8ODXdSJL/13DXhQeBT8yrPSdz+E6F8RS+4yCPjN/AG81r+k0fGwlNFf7XGh7D8EdhhKqbNgiKmDg024btdl6Mxc9MfNXzWxxFoS/PzFWpgV0ftbsmzyIJRjhmEzaMOeenXryPAeqE/Cw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305330; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=9R3PcGs2tio7rexPxzO2gvjQ7k62qZs4S+2+VV+xBjs=; b=d/acMF2IfPQclKD6LIwwFVHIj83b74fBHaeNg6dbiEF0+jn2D9o/M6Ob/bH3LUgoHnHQwHVBHqFD509hzHVSLASAgBTeeTnuhxJAEB4uB99d8+DbOZZ/pDt7GASVhTP5NxUwGjRZdUnY1/Hk0xfBShBszdzJ3Eio1fk6reoNPWU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305330700305.1808442838545; Wed, 20 May 2026 12:28:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPmZn-0007GC-B4; Wed, 20 May 2026 15:27:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmZl-00076e-B1 for qemu-devel@nongnu.org; Wed, 20 May 2026 15:27:29 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmZj-0002oz-Fk for qemu-devel@nongnu.org; Wed, 20 May 2026 15:27:29 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-488b8bc6bc9so31363085e9.3 for ; Wed, 20 May 2026 12:27:26 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48febe60fc0sm162264355e9.21.2026.05.20.12.27.24 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:27:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305245; x=1779910045; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9R3PcGs2tio7rexPxzO2gvjQ7k62qZs4S+2+VV+xBjs=; b=ua1vM2OQh8hkB++vg0ID42CPYTaSDJdzP4NswnMLAIKQErwmqfILF17PSaGqEzbhkp Ui2Ts7StaAe24bUwrM7L2nKAxi67ql2gcphFCjq1LLNXR6dYbR1xCdgq+qK28/XW8VYm gb144i/bVGwSGDSuTEVBx1j46kLdb1IkrLzGrAB5xRXW7Kr55h8+QfnMufguq0kSzn90 RhmGr9kIXVCTRhZQ7T4imJ6MpjY4wp8qA4deph4VBwC3N72oJR2fqgU1I2H/PVyPowpA 39dGlszSZOVbcp+PzU++w2EGK6u965wcV5hfo6iX9kd6cXWId7FDqaod7W0J8ZhApX3e DAOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305245; x=1779910045; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=9R3PcGs2tio7rexPxzO2gvjQ7k62qZs4S+2+VV+xBjs=; b=Jt3ti2/rwSZgKkRBYcgacY7oGWIkod/FKY8OjPYtn3ncOpv17o+Kkm3VhtcoLEwhbL DeaJVm7ct4ZaBbDhvqtKdmbsEnE32XUZdsp29B9TyFkaEiDbDVA8VcFvRUefhN2QbWuj n5wZXgGRjHLiOcneNNzDUZCYwxku4O24/TsMjqUD2/r5Opel0ewLbgARUrfLtS0rx/7t JTYxod2jmXR/gnnPiWg+zm/U1Ja92YziGduQ0sX7LhUDiVxMxcqX+KJknDMAb4f9HboK 1Dwg7cacRt7N76OTPiQMKeSORmvcMEA1PXo1eo15HgIMNgVAk90QUfVPXEUC0U1kxzpj ajUg== X-Gm-Message-State: AOJu0YzNmlUbz/nGX4qhaQA59Axl5rDmZl9FFSPAwlO9whRYhfbcH6So BTUvquTfvRawW/YQ/JztopZOCa2Jb/v3HcKTHmPjoqzDOLd62pGPGvKu0rQbk6nUAVhvTSMGhuQ niMo5T1w= X-Gm-Gg: Acq92OF9+Du45E/E9ytDXV/JmckxgqI8cHeFZ4qHVddAcMnvHP1q6P+/i3HF2LkFrdq dAvdV1za34m3jiIpi6tw1rgBNHNBeBq5uqVMqYxL+NW63O9YUNHihPAFG5BdCH2mLzJ+EcvkvJP SXj5Ga7whfM4QEFZdfHwkCIYxnWA1j8po/1fTogUGONKwAHVd0l0epi3oCIlDBpbHBlRVp8dKjF Z4xqD4h1apk7MPGTivDH9rojl6aQhFnZ7iFj0of0ljSyChAypPy9Pq1eieOTLEl40m63JUKZ2Jv /ZBykgi1YT4JL3jgnvQHwtaBh3QW/F4P03ZrSxVBDTtUNOwkp2xlxmUHOD2ezCtZZEhlBAJzaXZ JFW9zSlpmmCvSgZu2cx+LmADz+9WElMUkYur996BFrv30wHR0hdTloXt6KClOTJ8rDMC9EQGP06 /hG9CoqXY9V2I9kZBHZWNmK3dYZ/yomaZH+i6BD+xTmpzDz4c8lVX71AIVZjcwDyM5YhPiCJ6V X-Received: by 2002:a05:600c:1f8f:b0:490:2153:2c3d with SMTP id 5b1f17b1804b1-49021532e9cmr108687525e9.20.1779305245231; Wed, 20 May 2026 12:27:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 32/33] target/mips: add Octeon QMAC instructions Date: Wed, 20 May 2026 21:23:37 +0200 Message-ID: <20260520192338.40036-33-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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: qemu development 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: 1779305332517158500 From: James Hilliard QMAC.0x and QMACS.0x multiply the selected signed Q15 halfword lane from rs by rt<15:0> and accumulate the Q31 product into the Octeon HI/LO accumulator state. QMAC updates the full 64-bit HI/LO accumulator. QMACS saturates the 32-bit Q31 result in LO and keeps HI<0> as the sticky saturation flag. Reviewed-by: Richard Henderson Signed-off-by: James Hilliard Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 [PMD: Add min32/max32 in trans_QMACS()] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260520172313.23777-24-philmd@linaro.org> --- target/mips/tcg/octeon.decode | 4 ++ target/mips/tcg/octeon_translate.c | 62 ++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/target/mips/tcg/octeon.decode b/target/mips/tcg/octeon.decode index 4d0ad058347..2d02b4e0bc3 100644 --- a/target/mips/tcg/octeon.decode +++ b/target/mips/tcg/octeon.decode @@ -28,6 +28,8 @@ BBIT 11 set:1 . 10 rs:5 ..... offset:s16 p=3D%bbi= t_p # SEQI rt, rs, immediate # SNE rd, rs, rt # SNEI rt, rs, immediate +# QMAC.0x rs, rt +# QMACS.0x rs, rt =20 @r3 ...... rs:5 rt:5 rd:5 ..... ...... &cmpi rs rt imm @@ -43,6 +45,8 @@ SEQ 011100 ..... ..... ..... 00000 101010 @r3 SNE 011100 ..... ..... ..... 00000 101011 @r3 SEQI 011100 rs:5 rt:5 imm:s10 101110 &cmpi SNEI 011100 rs:5 rt:5 imm:s10 101111 &cmpi +QMACS 011100 rs:5 rt:5 00000 000 lane:2 010010 +QMAC 011100 rs:5 rt:5 00000 100 lane:2 010010 =20 &r2 rs rt @r2 ...... rs:5 rt:5 ..... ..... ...... &r2 diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index 7ec942fa347..90bd68cbf25 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -355,3 +355,65 @@ static bool trans_V3MULU(DisasContext *ctx, arg_V3MULU= *a) gen_store_gpr(tmp, a->rd); return true; } + +static bool trans_QMAC(DisasContext *ctx, arg_QMAC *a) +{ + TCGv_i64 t0 =3D tcg_temp_new_i64(); + TCGv_i64 t1 =3D tcg_temp_new_i64(); + + gen_load_gpr(t0, a->rt); + gen_load_gpr(t1, a->rs); + + /* t0 =3D rt<0> * rs * 2 */ + tcg_gen_ext16s_i64(t0, t0); + tcg_gen_sextract_i64(t1, t1, a->lane * 16, 16); + tcg_gen_mul_i64(t0, t0, t1); + tcg_gen_add_i64(t0, t0, t0); + + /* Saturate -0x8000 * -0x8000 * 2 =3D 0x80000000 -> 0x7fffffff */ + tcg_gen_smin_i64(t0, t0, tcg_constant_i64(INT32_MAX)); + + /* HI:LO +=3D t0 */ + tcg_gen_concat32_i64(t1, cpu_LO[0], cpu_HI[0]); + tcg_gen_add_i64(t0, t0, t1); + tcg_gen_sextract_i64(cpu_LO[0], t0, 0, 32); + tcg_gen_sextract_i64(cpu_HI[0], t0, 32, 32); + return true; +} + +static bool trans_QMACS(DisasContext *ctx, arg_QMACS *a) +{ + TCGv_i64 min32 =3D tcg_constant_i64(INT32_MIN); + TCGv_i64 max32 =3D tcg_constant_i64(INT32_MAX); + TCGv_i64 t0 =3D tcg_temp_new_i64(); + TCGv_i64 t1 =3D tcg_temp_new_i64(); + + gen_load_gpr(t0, a->rt); + gen_load_gpr(t1, a->rs); + + /* t0 =3D rt<0> * rs * 2 */ + tcg_gen_ext16s_i64(t0, t0); + tcg_gen_sextract_i64(t1, t1, a->lane * 16, 16); + tcg_gen_mul_i64(t0, t0, t1); + tcg_gen_add_i64(t0, t0, t0); + + /* + * Saturate -0x8000 * -0x8000 * 2 =3D 0x80000000 -> 0x7fffffff. + * Accumulate overflow in HI[0]. + */ + tcg_gen_smin_i64(t1, t0, max32); + tcg_gen_setcond_i64(TCG_COND_NE, t0, t0, t1); + tcg_gen_or_i64(cpu_HI[0], cpu_HI[0], t0); + + /* + * LO =3D sat32(LO + t0) + * Accumulate overflow in HI[0]. + */ + tcg_gen_ext32s_i64(t0, cpu_LO[0]); + tcg_gen_add_i64(t0, t0, t1); + tcg_gen_smin_i64(cpu_LO[0], t0, max32); + tcg_gen_smax_i64(cpu_LO[0], cpu_LO[0], min32); + tcg_gen_setcond_i64(TCG_COND_NE, t0, t0, cpu_LO[0]); + tcg_gen_or_i64(cpu_HI[0], cpu_HI[0], t0); + return true; +} --=20 2.53.0 From nobody Sat May 30 17:44:36 2026 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=1779305297; cv=none; d=zohomail.com; s=zohoarc; b=bQUintmvHS/UdhbF7ZilARz4NKi4tR1dZtDy89luaCS+IJvRyFZ9clO1N7U7FJU7iOVT3eTuuGWSclzVls7EcaeNCDEZWa3Lmrj/Jne8CMBZco0mk983Q5VOUvSooYOfeg1y0qINXH0cwfVqxydF5+paIIbuOXd6Cl4K36q1HV8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779305297; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=PVX5LHyC01XbeGNw4EVVzle9YQztiV8mFBcRyRC3n2Y=; b=ZYoV3KdcOhRm4PU7FQS1+cHxyXNOE9zwtl2lMFKaFV9R0Hu7AXC0AVE9XpfoQuyZQTdh8MNI2539JMrpWOY+kgCCOWqWpnaPuFpOpeI033XwLzHsKVAwyiTeh72KFly3LnOER0Ximav5uYSb+D8mI4lauHAAUbpZUfL/WrVFOow= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779305297296605.7481384482807; Wed, 20 May 2026 12:28:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPma7-0007oD-EE; Wed, 20 May 2026 15:27:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPmZs-0007VM-C7 for qemu-devel@nongnu.org; Wed, 20 May 2026 15:27:37 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPmZq-0002pm-Bs for qemu-devel@nongnu.org; Wed, 20 May 2026 15:27:36 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-452169ae568so3383100f8f.3 for ; Wed, 20 May 2026 12:27:33 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45d9e768acesm60248042f8f.7.2026.05.20.12.27.31 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 20 May 2026 12:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779305252; x=1779910052; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PVX5LHyC01XbeGNw4EVVzle9YQztiV8mFBcRyRC3n2Y=; b=b895lq0pW4EJ3e0bTfrDfD8Q6lylBytC6JtSpS9e8DFoT2QPRM4NbHjtMvllOP3Q6R diM0dEaQc6sTZ4moB8GnZ/PbJD+ZreJidDieo2MT+KiSL7oZCrLqtI+A+zbjrS3bLPyk LodrWKG2/d20kSyKig4v9/mYT8EYk3oL4ozV8t+oJBisjuu/xxvGRI8oPPwDCzL+iuu4 WT9CRj6rzFBiY36SvKauv19FKQntEy4zXxksv/So3mRZoelqMrIW2CS+ftl6TeNq1n1S WizGeGy1+W8Bl4i4Baa5z9Uoof/fxw+YZ2Ne3zjSHdEXMtt2Niwo4qpTgcxIXyIHctV1 idJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779305252; x=1779910052; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=PVX5LHyC01XbeGNw4EVVzle9YQztiV8mFBcRyRC3n2Y=; b=BcHWvvWyRBd8c7PDf04GwXmXhFaf+6wq0aqZV6xUuz/ICqWZMUEi3hV5o3lL5w8HmS lWKIupF6YjphN2bzSxsw3datKpTpus4TGaiGNTm9i0QSVMFaMZqPe3sjFQbhH23WBVnJ VFJPSb+O2m06/2Qy+RY+JJ306V07AkGcSOkFchL6K1wHgr7N6hNUROOnqbQATbRR7OCV LKc6VfomIetHpGUolCt/XwPcgU65U+cSNs4OhFNX9RGVsPM6gH/rc/pkoQqGl13m49Wv 4LUb2zgfTIlRqLNBD+M9kbRS//O8vRRPo2NNFBaBM3Gmo9ZpS5/x4qyssJzbMr30v+lH /iIg== X-Gm-Message-State: AOJu0YzoiqhFJqtMrRYYz8sJs1nS7zJCApXAuWmzjkC9eui7yzsQ02MN v4o57J9YDmP/Zycex4rfT/DxbM3/TbKOdMj39vKY/jEFEHnLVM2UklhRZOogFG0L+65yjoCs1uQ 5to/rPek= X-Gm-Gg: Acq92OFh4nq/IbnJPcC9uxu1HW/X2uwfWkRUhLEyxNjMfif01DaL7eH5SHc6ht+1W3N R37yVWUzz8ad6uQllUIwVmYAcimTfObfBZmslJCRfAKEb+biduVr/Na0hkAmeW980J78YR+2eFm z38fwKDOHAC2YZYHodwpHkPqJJEYnndK/GWDQeK8kL+CNvila63PiKUDF69ONaIsSucgtTNTrOl PP3nxtNExcwJpW3MNhxvw/iDYpsAcW9wkEG5pgF97pGm6NBwYbtRBV+5STbTnH0uEuA2Ls+6X+D JDercW28/dcjaF1yVRU40HjrlOTkSIEbOXDC7wgYosGiX83yeTL5MFIZV557dexC4yUkOEnrBsG egq2ORXvJ3PAo4xqHU3vy+miM2lAgxNwuHqpjy+1dp6f83Xvtv+8m+XOduDJmOQCec55bA1RGjX cLl63AibFrN7iQ/nKpP9tqgGn+70UHqLnAETYA8/c1hJ7AqkHIL49p8nrVW7yNBvFnnr3XmToS X-Received: by 2002:a5d:584f:0:b0:45d:484b:ec10 with SMTP id ffacd0b85a97d-45e5c5bbe5cmr41448740f8f.2.1779305251964; Wed, 20 May 2026 12:27:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 33/33] target/mips: add Octeon LA* atomic instructions Date: Wed, 20 May 2026 21:23:38 +0200 Message-ID: <20260520192338.40036-34-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520192338.40036-1-philmd@linaro.org> References: <20260520192338.40036-1-philmd@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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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: qemu development 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: 1779305299052154100 From: James Hilliard Implement the Octeon LA* read-modify-write atomic instruction family: LAI/LAID, LAD/LADD, LAA/LAAD, LAS/LASD, LAC/LACD, and LAW/LAWD. These operations are architecturally distinct from SAA/SAAD and are used by existing Octeon user-mode code for atomic counters, bit operations, and exchange-style updates. Reviewed-by: Richard Henderson Signed-off-by: James Hilliard Co-developed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: --- target/mips/tcg/octeon.decode | 17 +++++++++++ target/mips/tcg/octeon_translate.c | 45 ++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/target/mips/tcg/octeon.decode b/target/mips/tcg/octeon.decode index 2d02b4e0bc3..1e44c588dd6 100644 --- a/target/mips/tcg/octeon.decode +++ b/target/mips/tcg/octeon.decode @@ -68,6 +68,23 @@ V3MULU 011100 ..... ..... ..... 00000 010001 @r3 SAA 011100 ..... ..... 00000 00000 011000 @saa SAAD 011100 ..... ..... 00000 00000 011001 @saa =20 +&la base rd +&laa base add rd +@la ...... base:5 ..... rd:5 ........... &la +@laa ...... base:5 add:5 rd:5 ........... &laa +LAI 011100 ..... 00000 ..... 00010 011111 @la +LAID 011100 ..... 00000 ..... 00011 011111 @la +LAD 011100 ..... 00000 ..... 00110 011111 @la +LADD 011100 ..... 00000 ..... 00111 011111 @la +LAA 011100 ..... ..... ..... 10010 011111 @laa +LAAD 011100 ..... ..... ..... 10011 011111 @laa +LAS 011100 ..... 00000 ..... 01010 011111 @la +LASD 011100 ..... 00000 ..... 01011 011111 @la +LAC 011100 ..... 00000 ..... 01110 011111 @la +LACD 011100 ..... 00000 ..... 01111 011111 @la +LAW 011100 ..... ..... ..... 10110 011111 @laa +LAWD 011100 ..... ..... ..... 10111 011111 @laa + &zcb base ZCB 011100 base:5 00000 00000 1110- 011111 &zcb =20 diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index 90bd68cbf25..b0af2f48382 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -185,6 +185,51 @@ static bool trans_saa(DisasContext *ctx, arg_saa *a, M= emOp mop) TRANS(SAA, trans_saa, MO_32); TRANS(SAAD, trans_saa, MO_64); =20 +typedef void AtomicThreeOpFn(TCGv_i64, TCGv_va, TCGv_i64, TCGArg, MemOp); + +static bool do_atomic_la(DisasContext *ctx, arg_la *a, + AtomicThreeOpFn *atomic_fn, int64_t imm, MemOp mo= p) +{ + TCGv_i64 addr =3D tcg_temp_new_i64(); + TCGv_i64 old =3D tcg_temp_new_i64(); + MemOp amo =3D mo_endian(ctx) | mop | MO_ALIGN; + + gen_base_offset_addr(ctx, addr, a->base, 0); + + atomic_fn(old, addr, tcg_constant_i64(imm), ctx->mem_idx, amo); + gen_store_gpr(old, a->rd); + return true; +} + +static bool do_atomic_laa(DisasContext *ctx, arg_laa *a, + AtomicThreeOpFn *atomic_fn, MemOp mop) +{ + TCGv_i64 addr =3D tcg_temp_new_i64(); + TCGv_i64 old =3D tcg_temp_new_i64(); + TCGv_i64 value =3D tcg_temp_new_i64(); + MemOp amo =3D mo_endian(ctx) | mop | MO_ALIGN; + + gen_base_offset_addr(ctx, addr, a->base, 0); + gen_load_gpr(value, a->add); + + atomic_fn(old, addr, value, ctx->mem_idx, amo); + gen_store_gpr(old, a->rd); + return true; +} + +TRANS(LAI, do_atomic_la, tcg_gen_atomic_fetch_add_i64, 1, MO_SL); +TRANS(LAID, do_atomic_la, tcg_gen_atomic_fetch_add_i64, 1, MO_UQ); +TRANS(LAD, do_atomic_la, tcg_gen_atomic_fetch_add_i64, -1, MO_SL); +TRANS(LADD, do_atomic_la, tcg_gen_atomic_fetch_add_i64, -1, MO_UQ); +TRANS(LAA, do_atomic_laa, tcg_gen_atomic_fetch_add_i64, MO_SL); +TRANS(LAAD, do_atomic_laa, tcg_gen_atomic_fetch_add_i64, MO_UQ); +TRANS(LAS, do_atomic_la, tcg_gen_atomic_xchg_i64, -1, MO_SL); +TRANS(LASD, do_atomic_la, tcg_gen_atomic_xchg_i64, -1, MO_UQ); +TRANS(LAC, do_atomic_la, tcg_gen_atomic_xchg_i64, 0, MO_SL); +TRANS(LACD, do_atomic_la, tcg_gen_atomic_xchg_i64, 0, MO_UQ); +TRANS(LAW, do_atomic_laa, tcg_gen_atomic_xchg_i64, MO_SL); +TRANS(LAWD, do_atomic_laa, tcg_gen_atomic_xchg_i64, MO_UQ); + static bool trans_ZCB(DisasContext *ctx, arg_ZCB *a) { TCGv_i64 addr =3D tcg_temp_new_i64(); --=20 2.53.0