From nobody Sat May 30 20:11:37 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=1776952347; cv=none; d=zohomail.com; s=zohoarc; b=ZhFv1+CbRRm1onde76e3ZafrunFE8Bw7MBZ/W2EsHy5IlA3B94ktJQFNRFcMdAratK4dYnQkbDQfF1S99zd4Nkr37wyepERLhF1FKu8bnfv0mB/A2sDLeDWp/6bH4cChNo30dM4qbIWGwFe2mOaMwzym+vHE9NE2ZIe9K/sbt8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776952347; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DqJL0rl96nxU0ves898eJ2z4C/7AT9ewOI72ZiQAO7M=; b=KE14cgNwZNetLbV0o5MtgHK44lBoswDgduzt1oAkO7t7s6nogSrk9Tjg8nYh5wgOOQqq6puus26fNQFLglN8jXiArehokJjDB1x+NdEcN5AJ9Cy41dor1CXvnw0dE3pjDtxPG7NEV8UoEemAspSS5xkm4QSXpiScW8OMENmvTfc= 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 1776952347935632.1849037320195; Thu, 23 Apr 2026 06:52:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wFuSb-0000gw-DD; Thu, 23 Apr 2026 09:51: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 1wFuSN-0000dw-Cu for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:04 -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 1wFuSJ-0005WO-Ev for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:02 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4891b0786beso40981405e9.1 for ; Thu, 23 Apr 2026 06:50: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 5b1f17b1804b1-488fb794e26sm222847365e9.6.2026.04.23.06.50.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 23 Apr 2026 06:50:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776952249; x=1777557049; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DqJL0rl96nxU0ves898eJ2z4C/7AT9ewOI72ZiQAO7M=; b=NC0f7ClTl1M8sl5rQPAkA7AQ/oAvA2PiaWyFQVlm0Sod7mqP1V0Lac7XVrRjmvGt0Y xZWjgLDQmpTTBXzJbkcAzShhyzyf2GXUo+dn+0k6JSHEmtGu1uAR7YvIoTaJN50y9a00 gFQz1hKPHmYv1M7VE+IEZYThD0OzyvIDnOBSYhk3iLoRYRn7lG1D4KDefspVKEjJ17is 3qWBlSgidj8r7SUCbOFZH/mjIv/6eYlIxkYjRxFCFc5UVwfm3TytPMG0SYLjrLs38wY6 3snEj7wVIKY9MVGNYVt6/enP0Q36mg3rI9PqRM0Ikyp8QrYebgpGzGaFuUfeZijQ60k7 tQnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776952249; x=1777557049; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=DqJL0rl96nxU0ves898eJ2z4C/7AT9ewOI72ZiQAO7M=; b=d84LCRPXuuln9KWPG6C45+ETGrVhHV4OMO+8B1CO8L1QCHGmw1rGPya8Hk1OZ5AzSd nsYQs3aWx0/1svvn15T2GUu+2w+k2iIXXfse6sH5SIAwD4QI00CMj1Nl56zaS0jP/INe +NOh5M3ONBzoS47tX86eRkly+OEapCW6ko/mjPZyfrg+XmuwNZ0bhF1/1aC/KTibJE4o cIDY/5ooFMxM9sR4xnFtbQx6JUMMbZJlfCUuxZi6bwtd0XhFTVgqdqCjL0zTHYNEog3e 2qrKpmqYKHWBJ3qlOG6LbI3hX3gVbDNxN8QFeaN11LEuMLzjanC44AZ5NonTZPqeHusG BReQ== X-Gm-Message-State: AOJu0YwUeBmVbf8Iud4r11QZm8akLMMdfVY6RPcPQToB1eK/0L4YoZS/ VbOGsmijdmHr7fMxiZD7oV5dtfYPGDDHsR0yz+uzRuWnd7AUEm7VdIT/bukeSMpvSZaWSz62OYM Y5FMjDqc= X-Gm-Gg: AeBDiev/obSDuUdxZfmOyD1HUffEa4FVjR9OnSsNfOeOEYqwlAH7ElBov0m8C1xgr3H 6KrnUJv3P42WKs0clM7W4+BqQNgiftruvWBLzdHMJcOP2Vhs/8b6qvfvOZPlfxaCeWjmBik4U+U 9LSs+gjNrbrz/JCz0bWuW7seIQIClgGIGXZKnBMdI2Mws3rHIBO4EpsPBoocyw5HCPAvizohtm2 0hcblSlb81Sj++Xki75UY8TXVWomqXzpbCAqbX56HIpr+z0aP41aGGO4VEl+/jsNAEIYm3iue81 h4e8oc2pXJkzciZB2ZZXljxC+Bdj1GxkbM9xCVYNT4UbXG8naGAXa4LZVcvLEFgCt9SHvEYoDwW zqlwHG1RoHxo4i/4EV0aNG00cRxtYt0PWaO7EuNJY+dMNGWGxgAU8TAthfAHZ/9ioYhizRCe/TZ xqSBiEp+dWoUxPxHl0JyZUvzjLVRl5t4HYIH75o1tvCftLVaN0DvNDZnnHVDqTo2ah2BpPSrnRc ELXQd+Kfp8= X-Received: by 2002:a05:600c:4fc7:b0:488:dbcb:ca08 with SMTP id 5b1f17b1804b1-488fb787a62mr377145845e9.30.1776952249493; Thu, 23 Apr 2026 06:50:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Ilya Leoshkevich , qemu-s390x@nongnu.org, Matthew Rosato , David Hildenbrand , Richard Henderson , Halil Pasic , Cornelia Huck , Eric Farman , Christian Borntraeger , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-stable@nongnu.org, Paolo Bonzini Subject: [PATCH 1/9] tcg: Include missing 'tcg/tcg-op-common.h' header in 'tcg-op-mem.h' Date: Thu, 23 Apr 2026 15:50:27 +0200 Message-ID: <20260423135035.50126-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260423135035.50126-1-philmd@linaro.org> References: <20260423135035.50126-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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1776952350560154100 "tcg-op-mem.h" uses methods declared in "tcg/tcg-op-common.h". Include the latter to avoid when including the former: include/tcg/tcg-op-mem.h:34:5: error: call to undeclared function 'tcg_ge= n_qemu_ld_i32_chk' 34 | tcg_gen_qemu_ld_i32_chk(v, tcgv_va_temp(a), i, m, TCG_TYPE_VA); | ^ $ git grep -w tcg_gen_qemu_ld_i32_chk include/tcg/tcg-op-common.h:328:void tcg_gen_qemu_ld_i32_chk(TCGv_i32, TC= GTemp *, TCGArg, MemOp, TCGType); include/tcg/tcg-op-mem.h:35: tcg_gen_qemu_ld_i32_chk(v, tcgv_va_temp(a= ), i, m, TCG_TYPE_VA); tcg/tcg-op-ldst.c:286:void tcg_gen_qemu_ld_i32_chk(TCGv_i32 val, TCGTemp = *addr, TCGArg idx, Cc: qemu-stable@nongnu.org Fixes: a8af0fb24da ("include/tcg/tcg-op: extract memory operations to tcg-o= p-mem.h") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich --- include/tcg/tcg-op-mem.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/tcg/tcg-op-mem.h b/include/tcg/tcg-op-mem.h index 36931d1dd57..ea35a02fb40 100644 --- a/include/tcg/tcg-op-mem.h +++ b/include/tcg/tcg-op-mem.h @@ -12,6 +12,8 @@ #error TCG_ADDRESS_BITS must be defined #endif =20 +#include "tcg/tcg-op-common.h" + #if TCG_ADDRESS_BITS =3D=3D 32 typedef TCGv_i32 TCGv_va; #define TCG_TYPE_VA TCG_TYPE_I32 --=20 2.53.0 From nobody Sat May 30 20:11:37 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=1776952318; cv=none; d=zohomail.com; s=zohoarc; b=CTMR459eY/tunGFxry4s/hBRXuEW36px/nXZmCDbHpUN6TnMgM1HSw3uFdbAKb+IJALgV+wuDLG6xmc59a+s9s0xBDvWedBgXZ3s9vzizX1SV1JpekO2vaRGeVSYQ937LmihB+ZnU1uLz4rQm4TObHtPzI376p30PFnpINCx7MU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776952318; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2wxBEBB/EqofxzUMFpni53mEDOf2aR/ncAD/U+J6XFw=; b=nkNONFnarxp3P2yjVLTCp0YRF8O18jxg+Bb7QMl3RpDOQpCEvvMfkXFXXDnZzEw5lZLOxbwSE3GJPvQpmdiB/jRIa1kO1uKMLtlcEuwGXgwYytfA2MNP1k+k4onKehjJXRKa/h6Cq1cf2eFF+fuyCVYLUjMQEKQ0EtaB1qQ4I9c= 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 1776952318473491.20206793870943; Thu, 23 Apr 2026 06:51:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wFuSU-0000gQ-Ur; Thu, 23 Apr 2026 09:51:10 -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 1wFuSN-0000dy-CG for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:04 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wFuSK-0005Xq-0G for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:02 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-43eada6d900so6540680f8f.0 for ; Thu, 23 Apr 2026 06:50: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 ffacd0b85a97d-4412150a092sm19035292f8f.23.2026.04.23.06.50.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 23 Apr 2026 06:50:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776952257; x=1777557057; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2wxBEBB/EqofxzUMFpni53mEDOf2aR/ncAD/U+J6XFw=; b=ORgOHcbst7zoaD9WrYxQ1dvDUsBBU+3qNaurDepoGKrG/BTZFq3AncDOodcOHQCpdn iyTwCjUz5wUQ1w4Xc3BmB7tI4z7k/jrvpulHcbMyVick1qUJ/f3zqXNmLnPkXeQ1aUZZ X6Cr6OeDsDdvS/nN4BDD9xqOU77i4nRcoS+KoXMfgYKOi9BXI/9iZwTSSkxmkhY5KTzl e7tlIDh2JM/9Q7WNmHR8R18IDjTU45IFORLUpj3QRrg0NlKk8ND2HwbvpO38dnDqdl1e i3SCf2LkzBF4uthmr/5RX9TheRPDsmeBVV3EcAiMEZRxw5Q1TxCTSDKj9VPxOuREBEHg ZgzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776952257; x=1777557057; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2wxBEBB/EqofxzUMFpni53mEDOf2aR/ncAD/U+J6XFw=; b=JXu5uUhCYzcADsWC+YZP2SfyMjvQLwz5/CcHUNKjBofsDPmKNpD2hwC4kOPqwB16Po /2Tty4t7QQespK1RdecwhCENxdM5On3GEEmggkZYfr2GrsNIHR98eZG+OXqJn4Xb06AH +W5uzeJmODfHFz77dYhHBB+sFVjAU5K6YQkBqfOqaS2SY11lfV6B/RLK0wrKwnKkkXzI u/ZlrMf5Co3MZ/h9ZbA8gpdv6lI+6b79PNERy/I9E6gTwrWPSVk7Zqnd7JgPqMOIOxG1 Aweg5pwyIiHgNCZFMCNgHT/eqJIrlcdRTTWM6hu5GSH+VUucvxKES0Pl1x9rgHNrTcrH mVeQ== X-Gm-Message-State: AOJu0Yz17UFMz+1SBr+AEEkhbhe0HJR2mKnCpcCsZATQlCUiRomsicUP Db7PLLwr5t6kRQqaxpxjiHfLvco0pi0rsOgv7/DjgMk6pMaUUB9ucYmfnv67EbQlU1zV9RB8pWB 08mPtct0= X-Gm-Gg: AeBDietPMcQ5D85KJUwrYideajaklPOQhdHUwZgJVjvQdB+LMX/GXxM6lyKlCL2rnBU k0a0PKiD8yciY1VYqWe76VdLrUDNxQV+LNb+O1yd19Dc6FIwWJ1LoeB7RUZw62f0wiVTSBB2kww AJ76BIrfyH8mKOqkuoHSkFZyVfWilCNCSsLaY4zzzqadUKDhglPlCuMExF5Gew2ZxyyN0YMJIEg l8I2p86ith4ELuj+LmSqZL6SjhB8WVzrO1NskpGGfS81BT6A4MJfanw96gs5yc8bBKxucBDUbxK QHp/rVXs8vAXLNtCMzDhWSQjL54MDN9LSlEuweFrXvLLtujzpP3EcgVqRXCY/TdvTzgwM5rU3+L ZQ9wahU6Rr0cgIWAuR834jjZ2Q+ouQgf59Dmc90MfHVpwkod9Lvj68RRI7oIalWD6gq8BSoMq9o AyzbDbYxWPe6smhL2Ju6AiPURSWxCrTfX5/JEXKQtAtiLW0msuEzl09ldCQHebvbOsUmovtOY0p De7pNzebcs= X-Received: by 2002:a05:6000:610:b0:43d:4df5:3de with SMTP id ffacd0b85a97d-43fe3e0b5fbmr42130174f8f.31.1776952256845; Thu, 23 Apr 2026 06:50:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Ilya Leoshkevich , qemu-s390x@nongnu.org, Matthew Rosato , David Hildenbrand , Richard Henderson , Halil Pasic , Cornelia Huck , Eric Farman , Christian Borntraeger , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/9] target/s390x: Do not compile KVM stubs for linux-user binary Date: Thu, 23 Apr 2026 15:50:28 +0200 Message-ID: <20260423135035.50126-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260423135035.50126-1-philmd@linaro.org> References: <20260423135035.50126-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::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1776952320446158500 None of these KVM symbols should be used in the qemu-s390x linux-user binary. Do not build the stub there, prefer a real linker failure. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich --- target/s390x/kvm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/kvm/meson.build b/target/s390x/kvm/meson.build index 588a9aa737e..437e12f221f 100644 --- a/target/s390x/kvm/meson.build +++ b/target/s390x/kvm/meson.build @@ -1,5 +1,5 @@ =20 -s390x_ss.add(when: 'CONFIG_KVM', if_true: files( +s390x_system_ss.add(when: 'CONFIG_KVM', if_true: files( 'pv.c', 'kvm.c', 'stsi-topology.c' --=20 2.53.0 From nobody Sat May 30 20:11:37 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=1776952349; cv=none; d=zohomail.com; s=zohoarc; b=DkFJWNpwKSMQSdWaQ/pFGiSLsBG2H8cXbUrs2bHe99T+NCdA6Q38IwxjFlPDdajo9yrqBd3aje+sdlr+bNQkUN/dx7X/2q2qc/sutZ3PiekMI+WYdc8eouy8x2X8n0wVcbisP4EvbRn6LQy2utArtNzymDMgn58BchbYHf4TlgI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776952349; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Xo9+PVRtt+5NON2Kj6mTrN4MMNYuwyQS7G6lhP4uHOk=; b=OOlvyqcmRDWVniA0Cuavhd1BQEroVDuyDnUuC5nFfa96xMwANZMuX79hdhxD9j6AiuZdT7NKGWiFrMFyQLn5ZsefWuafLOGvhd/DF3G9D6e5r5HXvlmAzBvEkgne3sXC7bhq5Ms/my6/oQpO7fO4/t3O7YDh+J2rTp6IWD2jPao= 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 1776952349616344.90862281273655; Thu, 23 Apr 2026 06:52:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wFuSf-0000ik-3W; Thu, 23 Apr 2026 09:51:21 -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 1wFuSU-0000g9-N0 for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:10 -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 1wFuSQ-0005oc-7w for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:07 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4891cd41959so48160905e9.3 for ; Thu, 23 Apr 2026 06:51: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-4891c08faffsm565231035e9.1.2026.04.23.06.51.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 23 Apr 2026 06:51:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776952264; x=1777557064; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Xo9+PVRtt+5NON2Kj6mTrN4MMNYuwyQS7G6lhP4uHOk=; b=S5nHT4aK/mv7tkCRm8bLgtjzNk/LNyPdQMM0AWgP0x68Q2/m1yx7Cvgx4UlCyOguD6 KYvaeIhWo0tmmOVV7qqEfzMkAS3XpRxDvBfL/TECcEBUYfX2JR6Kpo2jhqBQcvXwTuHl 0r96MMGvFWtyvpscbQjF4oLVMQ9OFSVafjy8uQRrlb3Jz8R7k4pqBWFSD9dwnj6giawd V36zH9ZkOoF5Y/TTPkzJojuwMXJhe7j7pGBQzEqo+XiAHhvaxyvqc4ztSBJ3Oz2X7Hh3 URBfbUXRHS16FrK0iHwDg3YbhfaXx0RYku8avv3Mzqn/x9Dyu7k+aV5VqjN6LNXL/A56 Fcjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776952264; x=1777557064; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Xo9+PVRtt+5NON2Kj6mTrN4MMNYuwyQS7G6lhP4uHOk=; b=XlAwvFybfmsE+i8Z/j4X45Y3PGIHWp5YfImAz+K0uS9UDLKg6j0N46jy3yWjOBd8VS rRX4oQf2lAForr32npQ36jJXnQdCg5rfU0Aij4mStQJO2qZWjonaZ6SA1u+YXSLoKC33 oGKsyoX/1r7SgwrWwoni5IK7TR5W7eN7l07+R4iG8mOwdCsv+dmTtt58rdfXlgpyBR7R JjgYvz51luVkhtAxjedkb6F7ofMRCCD7gGrlUDtp1x5E8I2P2xg6YTUOdB9RVXCkMw3+ IllTSiAho+Ptqi+I3s5TlRykKTWF8pzJKeZHhqQtVQt1iBsKquCuiVmnbF+MrqYDKgpF bJjw== X-Gm-Message-State: AOJu0YxOxlZj2uW2h32GfXAmljkG/QB/L7FdwrCI3bUo6RDOqYyQztMY HfT9aIFIlrheMpinLGOWyJ0COtwUvccTsqE8axwmTZY0uAHzV2FqERik0M7bTL3Jvb3Vw6bV8um /ZekoX3Y= X-Gm-Gg: AeBDieuWWUOZS8Yh/gTs+59+dsUge02MtJElIDydbFDNrj2yGjDPDJCH6JwHoIQnN/p A7lc2yY5oZmbDuPRkmmd0ynOCP4qy5GqSB+algo2XkKmnr9V2xZmAFvvvCDzbK2BZn47Me6PErT C28663O7f+RxRNHmMTfej668MhlpTzL1nMWE5jI8cqGyujHfEoUzyp28VrwtpfrTMCGz94ZOlM0 O//UJHu7N1oXvE9nuxkmfkCM186/mfPeHfGQnc7KJgNMlra+DbhzOsWLkdaIyld75OQ9crHxQZi GKq0eyxNUsR0rVRxDXP9UEgzlX/lckULNAv/7fKp9x6GXJ/fJjue89fh8zqDvT6ZyR5POAgCuR4 yiwZBqt+kMOakb1vXaQiKyoMFPJmuT8vyelH9PjLFFcMrKtzSUqCj5CDaiyG2m3aRCu5iReEFq/ aOyo+XFUy7rffhhZn8X1CKFb8Q27LZUjyrmDy48FxeNhBi67Iuz5SrPC5C5DjIErxSHGQRI6VGF 6Fo1kptfM+X4vZw0+IurQ== X-Received: by 2002:a05:600c:1e09:b0:48a:592c:e655 with SMTP id 5b1f17b1804b1-48a592ce7c2mr129588645e9.17.1776952264460; Thu, 23 Apr 2026 06:51:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Ilya Leoshkevich , qemu-s390x@nongnu.org, Matthew Rosato , David Hildenbrand , Richard Henderson , Halil Pasic , Cornelia Huck , Eric Farman , Christian Borntraeger , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/9] target/s390x: Introduce common system/user meson source set Date: Thu, 23 Apr 2026 15:50:29 +0200 Message-ID: <20260423135035.50126-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260423135035.50126-1-philmd@linaro.org> References: <20260423135035.50126-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: 1776952352239154100 Introduce a source set common to system / user. Start it with the files built in both sets: 'cpu_models_user.c' and 'gdbstub.c' No logical change intended. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich --- target/s390x/meson.build | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/target/s390x/meson.build b/target/s390x/meson.build index 6f98ce34d73..44f58ac2919 100644 --- a/target/s390x/meson.build +++ b/target/s390x/meson.build @@ -1,4 +1,9 @@ s390x_ss =3D ss.source_set() +s390x_common_ss =3D ss.source_set() +s390x_common_system_ss =3D ss.source_set() +s390x_system_ss =3D ss.source_set() +s390x_user_ss =3D ss.source_set() + s390x_ss.add(files( 'cpu.c', 'cpu_features.c', @@ -15,15 +20,16 @@ gen_features_h =3D custom_target('gen-features.h', capture: true, command: gen_features) =20 -s390x_ss.add(gen_features_h) +s390x_common_ss.add(gen_features_h) +s390x_common_ss.add(files( + 'cpu_models_user.c', + 'gdbstub.c', +)) =20 -s390x_system_ss =3D ss.source_set() s390x_system_ss.add(files( 'ioinst.c', )) =20 -s390x_common_system_ss =3D ss.source_set() -s390x_common_system_ss.add(gen_features_h) s390x_common_system_ss.add(files( 'helper.c', 'arch_dump.c', @@ -32,19 +38,14 @@ s390x_common_system_ss.add(files( 'mmu_helper.c', 'sigp.c', 'cpu-system.c', - 'cpu_models_system.c', - 'gdbstub.c', -)) - -s390x_user_ss =3D ss.source_set() -s390x_user_ss.add(files( - 'cpu_models_user.c', - 'gdbstub.c', )) =20 subdir('tcg') subdir('kvm') =20 +s390x_common_system_ss.add_all(s390x_common_ss) +s390x_user_ss.add_all(s390x_common_ss) + target_arch +=3D {'s390x': s390x_ss} target_system_arch +=3D {'s390x': s390x_system_ss} target_common_system_arch +=3D {'s390x': s390x_common_system_ss} --=20 2.53.0 From nobody Sat May 30 20:11:37 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=1776952360; cv=none; d=zohomail.com; s=zohoarc; b=jrf6lG9LCrRJoXDP0r9U8lc33kGnRlWjmE6S0tsnrXGE6dxgQmy3cyDOYJQWVfsN+lubzpdC2pfxukn5KJipDx3dBxegX2EtxtGii7hVDcb5vHgnAG/dkBfZaeqi7571uoNoK1RYlCMp9ORqBDLqjaN3qY+k8uJhryO/lzbCgv4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776952360; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/UDtj7gfZ3kgIfva6r6vm5X3cv8jqakF8suWMRcPwdw=; b=kHthDX5cBE2xCi84bcj7yK4hJhIvrsKxNPtHmbteE4Ka/cEaYtJUBDQaYZoH9IO1duMUvCnk0zID52fHtZU2mwXSB1CylEtiftuualla6gDU8Trd27CgX0QkrvRTGALcbeuwgGGsBhpoiqgagWOihYh+7LjM20CINqIfb9v4ymk= 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 1776952360559483.1293613567634; Thu, 23 Apr 2026 06:52:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wFuSh-0000jL-6T; Thu, 23 Apr 2026 09:51:23 -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 1wFuSZ-0000hZ-O3 for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:17 -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 1wFuSX-0005z4-VM for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:15 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-488a9033b2cso73804025e9.2 for ; Thu, 23 Apr 2026 06:51: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-4891bb3d121sm502234495e9.14.2026.04.23.06.51.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 23 Apr 2026 06:51:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776952272; x=1777557072; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/UDtj7gfZ3kgIfva6r6vm5X3cv8jqakF8suWMRcPwdw=; b=hv75uZ3TShfSnVb2Bq0oiToMp8ZbKpLvtA2xQuUQZTK/ca2V2Nr7ZCuCwqsD1daHuY B4Kxf9rHw+X9LtFcz9cR5lUHvel74GAgBg2oT6cDNJvCa2/jag0coO5hWFW9Gk7HqQo4 GM8LztSP+wSVITH7j7v0u9ckD31BCkgbZij8EPnKbT2WlG1XBy+gYR6ojsecwoWGZeXo CVML2vYmPBRTzLFO+KTVtgnylGoPkEO8xwB6Df/A2veIWePJzokQf4uxVuqbNjTEqZbS 602pHCCkk7VYTuhRxViYMxEPaeHyOjkNbXpuRLlpwKlOjwwFCFhXsWNXWN7Uobvf7vsu 5fIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776952272; x=1777557072; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=/UDtj7gfZ3kgIfva6r6vm5X3cv8jqakF8suWMRcPwdw=; b=nYCzSyGOtjY9tmQv9wmDHZjXhvIFHPJXMNUQ3xZby/ysF+NDIhWOtpGyduKC4x4eda m1EBv49BwH5q6RP5nefhCDT5WhUB28gdF7nsoG+/aqQjwWgX/UJ/qfGrsUEj0m3wNmyM YfcuIN7OReRLmVTZzev2nQ46wD38YEg1I1Mmy19x3ZR/C6z3ekEHl6e50HaP+cmPsEIk 2GqDvWPsFVrVsFLZPy7Of1TI6yx8ugOfbVd7XMczwBjTrYFPfgD6/zu1S00Djfpcdgke EoL6iIUMBch/euLz+m5ZQnBj+y/huqX/+n6yR2l2IisbALr9KMLDJqbOqMVoME3ENXHm XgHg== X-Gm-Message-State: AOJu0Ywvxmi/DhLem8HgwET0y4GgC+DxDXdF+yWqr+QvEE88fCzqbraI rq8Sux0f+5iH7xBdp2urbA8DQs6Kg2JxlLhDYyXiagHLiNQEoz6eGuEahoYxjjD8JKhxBtAfk5N wDqkWQfE= X-Gm-Gg: AeBDieuRsTX8vO/0XZE9GG1/eGRNnq/KX2SdePUxrwkHxaFOVMBqvfTsVask6X071+r FM/k5Df4Ujd8qLN+JCZbBQfmHGhfmoVEBAYuZactFRAReCC2JiWv9BLK9jpaYcqqJ9ZnLaczAUs 1g7sxUk18Gm+wHXSa3Xh25BnLt49/tIhCGzchKPne4BaEbs2v2NC9yANDSZ/kcswl+YrmUG8GNY dKGk5KR4Haom4VoEpk9F5LB0x+UH5YBl7kaC96235B6HFM0HMG1GP+5HTEa4U6rKFLOxlPXGasX NiJLu8Ccs4Gc8cAubNYZRANlvWl29FjAmgQOQn43CjwqeUGBMG1gkjRQveZlrnn+yTNp3AJn9KW o39hDfnTvufBz9jn6noHi64BDT7UYhEz4crUp3uVp5iem6aPkqscfZm6qhfhYiZZE9ecPm4GDJb GLx6xGb+sSrbbeLIQzte9XKIeZE9i57BnKsUx7FWO3WPsVH3HqBopB/tilFDkTVnvohMbE6yBrb uLsvZ4IKdM= X-Received: by 2002:a05:600c:888b:b0:485:4bd1:4c64 with SMTP id 5b1f17b1804b1-488fb796f95mr316910515e9.31.1776952272008; Thu, 23 Apr 2026 06:51:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Ilya Leoshkevich , qemu-s390x@nongnu.org, Matthew Rosato , David Hildenbrand , Richard Henderson , Halil Pasic , Cornelia Huck , Eric Farman , Christian Borntraeger , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 4/9] target/s390x: Compile few files as common unit Date: Thu, 23 Apr 2026 15:50:30 +0200 Message-ID: <20260423135035.50126-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260423135035.50126-1-philmd@linaro.org> References: <20260423135035.50126-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: 1776952362351158500 Nothing in these files prevents it to be built as common unit: - cc_helper.c - excp_helper.c - fpu_helper.c - vec_fpu_helper.c - vec_int_helper.c - vec_string_helper.c Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich --- target/s390x/tcg/meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/target/s390x/tcg/meson.build b/target/s390x/tcg/meson.build index 17c9374d09e..67f31bfddd4 100644 --- a/target/s390x/tcg/meson.build +++ b/target/s390x/tcg/meson.build @@ -1,14 +1,16 @@ s390x_ss.add(when: 'CONFIG_TCG', if_true: files( - 'cc_helper.c', 'crypto_helper.c', - 'excp_helper.c', - 'fpu_helper.c', 'int_helper.c', 'mem_helper.c', 'misc_helper.c', 'translate.c', - 'vec_fpu_helper.c', 'vec_helper.c', +)) +s390x_common_ss.add(when: 'CONFIG_TCG', if_true: files( + 'cc_helper.c', + 'excp_helper.c', + 'fpu_helper.c', + 'vec_fpu_helper.c', 'vec_int_helper.c', 'vec_string_helper.c', )) --=20 2.53.0 From nobody Sat May 30 20:11:37 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=1776952376; cv=none; d=zohomail.com; s=zohoarc; b=Umyr176R2TqKJ9EFFdD3KucYjfehLh3LS9UCYsCqZ2ma2kBSc/rL9DMJJOeQpDSvoZKWrp/RyuY6ALCaBRZ6XYbPTJgPxGvYnJBzn48bL21KzXtVK9hlDUcxsYtds+acbohYhN1OPbdUkax4BabmA1AVhlH5kPndvwPhbXmfG44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776952376; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=j6MYOyeyJGimQS2AbXbvngVBoZvDXVD0waN0vdNdT0Y=; b=mmQteVx5mwKru0iAC+NaJ7Jh7paEEtudrJXbe2j0UZMZHVJ6R2qwiv8vVAsx5a1gzWVRhdncEYH5scKXem4MDddBS2KMUOY5tp72kb3FH8hzCoAKIy62WzsQ8sAVNfVakbV4xJDtuOJuLL5/55auTf4DsquDEHeW5bM0dnygesI= 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 1776952376624583.2911761608249; Thu, 23 Apr 2026 06:52:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wFuSj-0000kD-Cm; Thu, 23 Apr 2026 09:51:25 -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 1wFuSi-0000k2-L7 for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:24 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wFuSg-000616-44 for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:24 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-488a88aeec9so86223205e9.2 for ; Thu, 23 Apr 2026 06:51:21 -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-43fe4cb135asm57854091f8f.6.2026.04.23.06.51.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 23 Apr 2026 06:51:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776952280; x=1777557080; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j6MYOyeyJGimQS2AbXbvngVBoZvDXVD0waN0vdNdT0Y=; b=tJFXNOHb2pCWVrudj5ewpOEb4Y6vE2UArLOriXSsTOnY7lMzn9A4Qp466fFQbKejoC rYhv7s+QwYygPRJAdWzXfDhL3cFXbL40DjKkdNymYUVKYFvwj1xekaz53dnji54VPcgs Nid+L0WXfpF95jdvtDIM3PbUszjrGMeJZ+ClNBNY51wIyFhpzVVn5R8SearwD22oOo69 PilfnKCzs5Du1w7hdyypYG4Xy/teRxRN0n80OHzyWlA0YU0JBPrul+OnV6za5GMeYjIn lBwCvAvp44LIqAbLnY7LoDEFy6Sd3ZPk9zAR97dVMInaISEEeTBesg34C5swMIu4Mmb+ mHgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776952280; x=1777557080; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=j6MYOyeyJGimQS2AbXbvngVBoZvDXVD0waN0vdNdT0Y=; b=sqsVppiQpT33BdIKm6vNsopR84l0rQItcQXpNq2ODYHa6ZNMNJ4egy+Zj0U3IIQL+n biFlcwIJk+ucWfopP2wHDiqImYeURCasBuU3YSaEF8WaVrpRucuubTOhnmY26Nng33d1 hhfBWWHfTMYML8CJbaD4f0lzQoXMxS6/Zf7zkkuUC/ZbN/ZHcOi2no6uuytlnl1RWDOD zVbc+HBQnDg7RFpRqKR0uUk7Qz/EY77E25dwM43hpEPDQwpAqWHLz+eCp22bDSk980ME dEnk/fUgxxcR3f2McBgCCpYdAb194WwIi+LFj205u3w3Jk9pv17pvRBHNPCs36ejqid5 afrA== X-Gm-Message-State: AOJu0YwEBlXv2pgHcy/QbaAN0FT4hcejNenrSaT2F+z6xXYg9QkBj2E5 ii6lYcvrN2b2I9JdB3GhMQ8gSqT6uxDKj8F0+GIrb0cttvmc31coPpbEDf67QM8p1IsETPo3r3K HbGqOWZI= X-Gm-Gg: AeBDievdVsw9JHnM8OtCGjhNCIoJ3SPzxkKIbMeOxQ5pobFlI89GBnHHEABV4KmxYM+ FUFd3SDHi+9h/EVTIHPUWLzZLtdYnNyiAY0EJJbAo7muc+CWEHtVTWdA84VXB5GhpJCy4jKFZvv wlU9Rx/AL2PrYzNpFn420Eb7Grmvnjb4q7k9zwUg7nzqAiQDW6x/1Wyxlkt3X+PoZdIaHCah0X3 9oGgw3Bd2xdEZkhKbM47WVQCWXpQ9mTDsFaHIyvqOBbavh0LAgUFu3S3Jo8Ar7J3JkKINSsySvS DKIWR1Cn076my9wfn8f6on5s33PnX6UBXjBvYbejlAovOylweoXipD15ubppKGAMwWIhGc78NAC fNbD22FTheYEFLTyOfshair2Rf41m86sDJC5cR5Z3bcNz5mhxr4+lNTncwowwLntEtsLFxu+rrX gUfrUjzkwWEsIB/e3GFVzHp8ywmzaR7zqMEaDGKKjeM1n+GIp10hs4Nlx3gHSBJnQkjJ2eO8GrR KVHJPipp8k= X-Received: by 2002:a05:600c:4ec6:b0:489:1f98:71e3 with SMTP id 5b1f17b1804b1-4891f987487mr237830685e9.28.1776952279753; Thu, 23 Apr 2026 06:51:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Ilya Leoshkevich , qemu-s390x@nongnu.org, Matthew Rosato , David Hildenbrand , Richard Henderson , Halil Pasic , Cornelia Huck , Eric Farman , Christian Borntraeger , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 5/9] target/s390x: Compile translate.c as common unit Date: Thu, 23 Apr 2026 15:50:31 +0200 Message-ID: <20260423135035.50126-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260423135035.50126-1-philmd@linaro.org> References: <20260423135035.50126-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::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1776952378417154100 In order do build translate.c as a common unit we need to replace: #include "tcg/tcg-op.h" -> #include "tcg/tcg-op-common.h" -> #include "tcg/tcg-op-mem.h" and: "accel/tcg/tcg-op-gvec.h" -> "accel/tcg/tcg-op-gvec-common.h" taking care to define TCG_ADDRESS_BITS, which is fixed for this 64-bit target. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich --- target/s390x/tcg/translate.c | 6 ++++-- target/s390x/tcg/meson.build | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 0f274621e5a..82165ac1ec0 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -31,8 +31,10 @@ #include "qemu/osdep.h" #include "cpu.h" #include "s390x-internal.h" -#include "tcg/tcg-op.h" -#include "tcg/tcg-op-gvec.h" +#define TCG_ADDRESS_BITS 64 +#include "tcg/tcg-op-common.h" +#include "tcg/tcg-op-mem.h" +#include "tcg/tcg-op-gvec-common.h" #include "qemu/log.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" diff --git a/target/s390x/tcg/meson.build b/target/s390x/tcg/meson.build index 67f31bfddd4..d1c60135411 100644 --- a/target/s390x/tcg/meson.build +++ b/target/s390x/tcg/meson.build @@ -3,13 +3,13 @@ s390x_ss.add(when: 'CONFIG_TCG', if_true: files( 'int_helper.c', 'mem_helper.c', 'misc_helper.c', - 'translate.c', 'vec_helper.c', )) s390x_common_ss.add(when: 'CONFIG_TCG', if_true: files( 'cc_helper.c', 'excp_helper.c', 'fpu_helper.c', + 'translate.c', 'vec_fpu_helper.c', 'vec_int_helper.c', 'vec_string_helper.c', --=20 2.53.0 From nobody Sat May 30 20:11:37 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=1776952384; cv=none; d=zohomail.com; s=zohoarc; b=nNEeI8Te2fyM3bI8Avd10BZdg38ttvWa1Xw1GMSvWNioiHEN3116trkDTxuVGVCZA9eJoecFgXCEpk043Rx+sofgLSdPkwmulkMuPHNqKK7f2VDppfc3+gXxbpbDUzgTpAYHwbozwyKq4YFvL8pHG+XzGbZHb7XakzKYk/ZPKMo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776952384; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TV5SHzMGyuCZLfuGlO0hhVjuqtuLPymTcSzN76BqbEE=; b=RwkIxIfvvXFZgapgrCrS9SCc9BsaTpM/zPXj9nGN9tYYbYNKJft/SWCc+ThutIne3rMO4HwhtT423/9PeW/vI9bnzzj7DcSWDXT+Q2iTCt+KS3W7rzkU3ff8PVCVxBPfm75UyhUWxse2dRpbJKIIySpItPzdynOmWkaHmuBkNik= 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 1776952384957223.16253661393068; Thu, 23 Apr 2026 06:53:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wFuSx-0000ra-3A; Thu, 23 Apr 2026 09:51:39 -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 1wFuSs-0000ou-Hp for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:34 -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 1wFuSn-00062D-L5 for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:34 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-488ff90d6c7so54339065e9.2 for ; Thu, 23 Apr 2026 06:51: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-43fe4dc24cfsm52929644f8f.16.2026.04.23.06.51.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 23 Apr 2026 06:51:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776952288; x=1777557088; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TV5SHzMGyuCZLfuGlO0hhVjuqtuLPymTcSzN76BqbEE=; b=yP5ooZwIdoBIWhA9Ib9jOE4izNvpinPCie2GUVNgMx8JlT+3NsgSMO/V3OZr+o17Fv KYotqr3EhWml3PB8VhVoouY2eUY/NRk5LsQOukthO7GhlOWqMGIhZP5N2CllAg/NmCWF iFk/dEjboXMLlMnVCUgbMZ7xU8KbgjXVXfRTHXTgSOuwLhlxek8FxY+7xmQmcp6YslEj xw0yuEjsvKnnpifJreoR/ALrjRwULXxziZwSNI462bvh3Bm2TPGIleXNCeikQJKzU02u DErszQveW6CrClTr2h4A+hcvNVI62PcN/lXxVwEMJQSeBamn9TQKvF2gJAzH+ftA93I3 zN1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776952288; x=1777557088; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TV5SHzMGyuCZLfuGlO0hhVjuqtuLPymTcSzN76BqbEE=; b=ZyY6MgJKYlW8FKMT0Bl5N9nAz5M/IzJFNhvezd/2JlA1c1vmF1VpOUQRN9jaPr/Etr hSPyZ/PvBcZuz7wCpuoAilFolI2APdE8f7lA5E1wSSd1RDBj/ezKpAQdejUSJx9/x6mX 60L1MEWjQ+x2u2ObiUSyWWIeq/NcAWIJeXdDI+kfpgm+SIWsTko3NIeFp0NAyDFLv/dc i2oE7GT6hNWaHvsZXea7WrpVtW2pAos1mmSd+oMSHyRUnW51r8K7w/tJLrhJVqDmiRmP hGBkTwv97UG3vI1gV4bkHP16dZwWz3Fs8oLB0HLc+sfaRCnaO33ZcMuiegSKSKfCuqDz qmQA== X-Gm-Message-State: AOJu0YyUGTDB/dozYm1pFL8qggjDN7jn+tzVatMoZHAfjrGCoOOQlVvY z5dO+UaJuM8jsUCT09bRTcvrE27JFiHffacQW9YmdBxnZjlFBrfe1hAKd8duMOKgyvkbjldr6ln 0RUkIvnc= X-Gm-Gg: AeBDieunzXGfJxC+Mrl4nPvNKzglYgzMhrnc6gQUNqXG1DUKULxfLo2LRc+TDbKr6EC Sqse03eXxoPIur51x/MAZMvHonBtyQJ4RmGuwWA7MbAYWMJ3xR3cLEDUz68fIqcQ+XZ0AT8qyHm Sdh25S1/k11vvLmdNvsEEDuGb0VcLDOF03kDTw8TftQ7TRdEzdBnKO5Glvca5YDA9RzhQjGSL71 662v9tHSHbYv1LyooEoOB9P0VlNrlT5Sd6pOiiQ38WIgVxhjIwl27MDVPBXp5yxJDbxHyeviXMz R0aYl5lfowd6C5XAEH9a4tYVZkidVhywl7X0EA/WbTZ/WdCME3XoY1qYTQ0HtuMCaAoTKZhG0Dv blDs3liCnlo1o9XfhGbrBbEIqXo08KPVqkH1OKnWJUXsfHRYR0vmkZzUzIN+6N6kbOw7SyQ2mQW gVjjXthAZ5wq3CpmunpAULVrMiq3FSE6BeGZoCh/n/HBq1I1+p9cvcExbvCdhajq/jXTvTaH1ue JOTlipXjls= X-Received: by 2002:a05:600c:6296:b0:483:64b4:79da with SMTP id 5b1f17b1804b1-488fb7923a9mr359383085e9.26.1776952287743; Thu, 23 Apr 2026 06:51:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Ilya Leoshkevich , qemu-s390x@nongnu.org, Matthew Rosato , David Hildenbrand , Richard Henderson , Halil Pasic , Cornelia Huck , Eric Farman , Christian Borntraeger , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 6/9] target/s390x: Compile vec_helper.c as common unit Date: Thu, 23 Apr 2026 15:50:32 +0200 Message-ID: <20260423135035.50126-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260423135035.50126-1-philmd@linaro.org> References: <20260423135035.50126-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: 1776952386395154100 In order do build vec_helper.c as a common unit we need to replace: "accel/tcg/cpu-ldst.h" -> "accel/tcg/cpu-ldst-common.h" and update the cpu_ld/st_be_data_ra() API by cpu_ld/st_mmu() one. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich --- Unrelated but could VLL / VSTL leverage the Int128 type? --- target/s390x/tcg/vec_helper.c | 34 +++++++++++++++++++++++----------- target/s390x/tcg/meson.build | 2 +- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/target/s390x/tcg/vec_helper.c b/target/s390x/tcg/vec_helper.c index 304745c971b..98eecd9fde6 100644 --- a/target/s390x/tcg/vec_helper.c +++ b/target/s390x/tcg/vec_helper.c @@ -16,7 +16,8 @@ #include "tcg/tcg.h" #include "tcg/tcg-gvec-desc.h" #include "exec/helper-proto.h" -#include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/cpu-ldst-common.h" +#include "accel/tcg/cpu-mmu-index.h" =20 void HELPER(gvec_vbperm)(void *v1, const void *v2, const void *v3, uint32_t desc) @@ -42,20 +43,26 @@ void HELPER(gvec_vbperm)(void *v1, const void *v2, cons= t void *v3, =20 void HELPER(vll)(CPUS390XState *env, void *v1, uint64_t addr, uint64_t byt= es) { + const int mmu_idx =3D cpu_mmu_index(env_cpu(env), false); + const uintptr_t ra =3D GETPC(); + MemOpIdx oi; + if (likely(bytes >=3D 16)) { uint64_t t0, t1; =20 - t0 =3D cpu_ldq_be_data_ra(env, addr, GETPC()); + oi =3D make_memop_idx(MO_BE | MO_64 | MO_UNALN, mmu_idx); + t0 =3D cpu_ldq_mmu(env, addr, oi, ra); addr =3D wrap_address(env, addr + 8); - t1 =3D cpu_ldq_be_data_ra(env, addr, GETPC()); + t1 =3D cpu_ldq_mmu(env, addr, oi, ra); s390_vec_write_element64(v1, 0, t0); s390_vec_write_element64(v1, 1, t1); } else { S390Vector tmp =3D {}; - int i; =20 - for (i =3D 0; i < bytes; i++) { - uint8_t byte =3D cpu_ldub_data_ra(env, addr, GETPC()); + oi =3D make_memop_idx(MO_8, mmu_idx); + for (int i =3D 0; i < bytes; i++) { + uint8_t byte =3D cpu_ldb_mmu(env, addr, oi, ra); + =20 s390_vec_write_element8(&tmp, i, byte); addr =3D wrap_address(env, addr + 1); @@ -191,20 +198,25 @@ void HELPER(gvec_vperm)(void *v1, const void *v2, con= st void *v3, void HELPER(vstl)(CPUS390XState *env, const void *v1, uint64_t addr, uint64_t bytes) { + const int mmu_idx =3D cpu_mmu_index(env_cpu(env), false); + const uintptr_t ra =3D GETPC(); + MemOpIdx oi; + /* Probe write access before actually modifying memory */ probe_write_access(env, addr, MIN(bytes, 16), GETPC()); =20 if (likely(bytes >=3D 16)) { - cpu_stq_be_data_ra(env, addr, s390_vec_read_element64(v1, 0), GETP= C()); + oi =3D make_memop_idx(MO_BE | MO_64 | MO_UNALN, mmu_idx); + cpu_stq_mmu(env, addr, s390_vec_read_element64(v1, 0), oi, ra); addr =3D wrap_address(env, addr + 8); - cpu_stq_be_data_ra(env, addr, s390_vec_read_element64(v1, 1), GETP= C()); + cpu_stq_mmu(env, addr, s390_vec_read_element64(v1, 1), oi, ra); } else { - int i; + oi =3D make_memop_idx(MO_8, mmu_idx); =20 - for (i =3D 0; i < bytes; i++) { + for (int i =3D 0; i < bytes; i++) { uint8_t byte =3D s390_vec_read_element8(v1, i); =20 - cpu_stb_data_ra(env, addr, byte, GETPC()); + cpu_stb_mmu(env, addr, byte, oi, ra); addr =3D wrap_address(env, addr + 1); } } diff --git a/target/s390x/tcg/meson.build b/target/s390x/tcg/meson.build index d1c60135411..ed6441f6f44 100644 --- a/target/s390x/tcg/meson.build +++ b/target/s390x/tcg/meson.build @@ -3,7 +3,6 @@ s390x_ss.add(when: 'CONFIG_TCG', if_true: files( 'int_helper.c', 'mem_helper.c', 'misc_helper.c', - 'vec_helper.c', )) s390x_common_ss.add(when: 'CONFIG_TCG', if_true: files( 'cc_helper.c', @@ -11,6 +10,7 @@ s390x_common_ss.add(when: 'CONFIG_TCG', if_true: files( 'fpu_helper.c', 'translate.c', 'vec_fpu_helper.c', + 'vec_helper.c', 'vec_int_helper.c', 'vec_string_helper.c', )) --=20 2.53.0 From nobody Sat May 30 20:11:37 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=1776952361; cv=none; d=zohomail.com; s=zohoarc; b=P/s7sqzDuM7srh5OUarWhq0/L2yojPzTsw+ExLMhqVbEU5j78oW7NZ1ELGukAEJBA6f4N/iXLv3n9M33ub5R9wgpd/RakMSzIiwde8HjdMN8hgxYKSW+QVlSyLbOWXyrD3xAnCbApIONomPFOGAQxSgLqclZFmqj9H0Xn+mjkVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776952361; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NBipw+AVki3XcTDneyzqokcGNbW5c0iuymLSnDl+Pwo=; b=BmfCdPPM8s52zf5n6L+3UtubVjGaMFymzZN5jLTzLjq1meVUe2zx1eKzR3AgYNSVx0dpi07nB4TjBtfJNTPvZ3vYzwdSs3A6rBLDn6MMSSl3SIChtVOaWQlQOyVnuN7aeSbopx0ZeycbcQCXo9G6d9XoeHshvKmksvWuAegzKys= 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 177695236170762.7407556154368; Thu, 23 Apr 2026 06:52:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wFuT0-0000vm-Sx; Thu, 23 Apr 2026 09:51: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 1wFuSz-0000uI-5m for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:41 -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 1wFuSv-00065u-U8 for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:40 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-488a9033b2cso73808865e9.2 for ; Thu, 23 Apr 2026 06:51:37 -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-489e124f6c7sm85402525e9.29.2026.04.23.06.51.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 23 Apr 2026 06:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776952296; x=1777557096; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NBipw+AVki3XcTDneyzqokcGNbW5c0iuymLSnDl+Pwo=; b=ep9DjWkSLGg1CTmrouP3t7MS7Wlj6uFqTCCWWZOqNR7br+6t5L1X5F+yLhoSdwyma2 nCaX6V41mOhFaH62cFAJF+Ol/gsMz2K0DfjBbuMpe5kmx/8EQLmTp9vG4sw6/rMoJbr7 94NguOR4jacgTRR5LaCglx9vQGmyJtRJpmB5Zp3Olnc34oYaFeyoVX5hwVnO7t91zp7G pPzNHxHtLIaNITT4VASJLuN3DT+UiFFFtmay3DhZ5o/+hC0V1AZJW/0ILfD5Ow77oAtM 8YvK+R+h0qFMepWI7z5v2n+6duVv3Y8Y8//mljLwlsPp6l7002wdAC0e48BOJiFvMBJG mzhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776952296; x=1777557096; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=NBipw+AVki3XcTDneyzqokcGNbW5c0iuymLSnDl+Pwo=; b=Yk1dhTZJYvIaCI5K+L3vKstlOWpdGIRPJ/bq4Z+TPX96KunywVqa3Y9PtBivVHkAIy MmpFvsdmgcEbfMw0deFdVuYL1izuqyiqgbetlZtcNKAM4a7H7BcsnH6NFx2rCWQaudZk xviA9ObXJV+dL8vAgc0Ne2PGVxISJOgfKSPEhiTVt7AzOuEZioGlXSBM44DDOjvnoYQf AF2JbNHoxJ2cQ1QPZQvGN0ToS3DMgDP5gEanNOBJ+rvvdnPTFRslctmC5KKiZG982sfB UPSVatJnWdZ4BtZ+3Iy/8t63HHVYldId0bi+H3UOkgG9jLrn4UqVdDbXTKfKapnKq5Q+ PqBQ== X-Gm-Message-State: AOJu0YwlsbNh2ly4Pe0klu5kgGow5fxeA74YRr6xIipwiu7xvq474Sg6 YC29zX8qC3AW/PHSCJpZ2RDu8c1BIxPKfZeet6xDCWNCbQaIcc1n1SalqScrQ37nbFBnLPcuInt VG8zGGdc= X-Gm-Gg: AeBDieuseTGtbOt5WHfU9de4AiwiDJkek1X1SUw9XLaziC0uxcgjSPFGYLloFSXiIuy 5AYZ5AfoyWVNIFRncQTnCAOfcF9jz/zZ1aKEBx/hx/2hlRk8ZxfLApWyKHuD2p7cd3qYI0wXTlv fyOoKQVYucCRwDs2Jqp9y427NuurkqHZVhK03resyErTSc5OWjLeB8ZeoSTEols/7jbqIpU3a3v vSUotouzEczpgHkjlnREeyr03ijePiQMDl+V9qbkRYSeKVVUtJZXi/JzOQKJVPtqrK3WmSiYQbL ytbu/WuaHIbMcydUiXetV9L0i7lw9d+0kRYWILNwkFi/1pfyFgPTzkoyWF3actKpyi1sSFLa1UV OA/oOjgyjdZt9RczICLst495bwMWCg7opqyghJ19fGh6yzCC1nwRu6KGJ9m+T3YoL/glgnY3QXZ U2KYEceEOmPbFoYCffTiNGS+k6/QwRruIbY0HpzT228x0G62EywzRfjqg+RQBJZxZBj0T9Y1akS kR+dN/IUvY= X-Received: by 2002:a05:600c:c4a6:b0:48a:761:57fe with SMTP id 5b1f17b1804b1-48a07615be4mr248179155e9.0.1776952295554; Thu, 23 Apr 2026 06:51:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Ilya Leoshkevich , qemu-s390x@nongnu.org, Matthew Rosato , David Hildenbrand , Richard Henderson , Halil Pasic , Cornelia Huck , Eric Farman , Christian Borntraeger , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 7/9] target/s390x: Have MSA helper pass a mmu_idx argument Date: Thu, 23 Apr 2026 15:50:33 +0200 Message-ID: <20260423135035.50126-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260423135035.50126-1-philmd@linaro.org> References: <20260423135035.50126-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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1776952364012154100 Next commit will use the cpu_ld/st_mmu() API and thus will also use a @mmu_idx. In order to keep it simple to review, propate @mmu_idx in a preliminary step. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich --- target/s390x/tcg/crypto_helper.c | 41 +++++++++++++++++--------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/target/s390x/tcg/crypto_helper.c b/target/s390x/tcg/crypto_hel= per.c index 4447bb66eee..074d745eb3f 100644 --- a/target/s390x/tcg/crypto_helper.c +++ b/target/s390x/tcg/crypto_helper.c @@ -18,6 +18,7 @@ #include "tcg_s390x.h" #include "exec/helper-proto.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/cpu-mmu-index.h" =20 static uint64_t R(uint64_t x, int c) { @@ -119,8 +120,8 @@ static void sha512_bda_be64(uint64_t a[8], uint64_t w[1= 6]) sha512_bda(a, t); } =20 -static void sha512_read_icv(CPUS390XState *env, uint64_t addr, - uint64_t a[8], uintptr_t ra) +static void sha512_read_icv(CPUS390XState *env, const int mmu_idx, + uint64_t addr, uint64_t a[8], uintptr_t ra) { int i; =20 @@ -130,8 +131,8 @@ static void sha512_read_icv(CPUS390XState *env, uint64_= t addr, } } =20 -static void sha512_write_ocv(CPUS390XState *env, uint64_t addr, - uint64_t a[8], uintptr_t ra) +static void sha512_write_ocv(CPUS390XState *env, const int mmu_idx, + uint64_t addr, uint64_t a[8], uintptr_t ra) { int i; =20 @@ -141,8 +142,8 @@ static void sha512_write_ocv(CPUS390XState *env, uint64= _t addr, } } =20 -static void sha512_read_block(CPUS390XState *env, uint64_t addr, - uint64_t a[16], uintptr_t ra) +static void sha512_read_block(CPUS390XState *env, const int mmu_idx, + uint64_t addr, uint64_t a[16], uintptr_t ra) { int i; =20 @@ -152,8 +153,8 @@ static void sha512_read_block(CPUS390XState *env, uint6= 4_t addr, } } =20 -static void sha512_read_mbl_be64(CPUS390XState *env, uint64_t addr, - uint8_t a[16], uintptr_t ra) +static void sha512_read_mbl_be64(CPUS390XState *env, const int mmu_idx, + uint64_t addr, uint8_t a[16], uintptr_t r= a) { int i; =20 @@ -163,8 +164,9 @@ static void sha512_read_mbl_be64(CPUS390XState *env, ui= nt64_t addr, } } =20 -static int cpacf_sha512(CPUS390XState *env, uintptr_t ra, uint64_t param_a= ddr, - uint64_t *message_reg, uint64_t *len_reg, uint32_t t= ype) +static int cpacf_sha512(CPUS390XState *env, const int mmu_idx, uintptr_t r= a, + uint64_t param_addr, uint64_t *message_reg, + uint64_t *len_reg, uint32_t type) { enum { MAX_BLOCKS_PER_RUN =3D 64 }; /* Arbitrary: keep interactivity. = */ uint64_t len =3D *len_reg, a[8], processed =3D 0; @@ -182,7 +184,7 @@ static int cpacf_sha512(CPUS390XState *env, uintptr_t r= a, uint64_t param_addr, tcg_s390_program_interrupt(env, PGM_SPECIFICATION, ra); } =20 - sha512_read_icv(env, param_addr, a, ra); + sha512_read_icv(env, mmu_idx, param_addr, a, ra); =20 /* Process full blocks first. */ for (; len >=3D 128; len -=3D 128, processed +=3D 128) { @@ -192,7 +194,7 @@ static int cpacf_sha512(CPUS390XState *env, uintptr_t r= a, uint64_t param_addr, break; } =20 - sha512_read_block(env, *message_reg + processed, w, ra); + sha512_read_block(env, mmu_idx, *message_reg + processed, w, ra); sha512_bda(a, w); } =20 @@ -215,13 +217,13 @@ static int cpacf_sha512(CPUS390XState *env, uintptr_t= ra, uint64_t param_addr, * or use an additional one. */ if (len < 112) { - sha512_read_mbl_be64(env, param_addr + 64, x + 112, ra); + sha512_read_mbl_be64(env, mmu_idx, param_addr + 64, x + 112, r= a); } sha512_bda_be64(a, (uint64_t *)x); =20 if (len >=3D 112) { memset(x, 0, 112); - sha512_read_mbl_be64(env, param_addr + 64, x + 112, ra); + sha512_read_mbl_be64(env, mmu_idx, param_addr + 64, x + 112, r= a); sha512_bda_be64(a, (uint64_t *)x); } =20 @@ -236,14 +238,14 @@ static int cpacf_sha512(CPUS390XState *env, uintptr_t= ra, uint64_t param_addr, * TODO: if writing fails halfway through (e.g., when crossing page * boundaries), we're in trouble. We'd need something like access_prep= are(). */ - sha512_write_ocv(env, param_addr, a, ra); + sha512_write_ocv(env, mmu_idx, param_addr, a, ra); *message_reg =3D deposit64(*message_reg, 0, message_reg_len, *message_reg + processed); *len_reg -=3D processed; return !len ? 0 : 3; } =20 -static void fill_buf_random(CPUS390XState *env, uintptr_t ra, +static void fill_buf_random(CPUS390XState *env, const int mmu_idx, uintptr= _t ra, uint64_t *buf_reg, uint64_t *len_reg) { uint8_t tmp[256]; @@ -271,6 +273,7 @@ static void fill_buf_random(CPUS390XState *env, uintptr= _t ra, uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_= t r3, uint32_t type) { + const int mmu_idx =3D cpu_mmu_index(env_cpu(env), false); const uintptr_t ra =3D GETPC(); const uint8_t mod =3D env->regs[0] & 0x80ULL; const uint8_t fc =3D env->regs[0] & 0x7fULL; @@ -303,11 +306,11 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1,= uint32_t r2, uint32_t r3, } break; case 3: /* CPACF_*_SHA_512 */ - return cpacf_sha512(env, ra, env->regs[1], &env->regs[r2], + return cpacf_sha512(env, mmu_idx, ra, env->regs[1], &env->regs[r2], &env->regs[r2 + 1], type); case 114: /* CPACF_PRNO_TRNG */ - fill_buf_random(env, ra, &env->regs[r1], &env->regs[r1 + 1]); - fill_buf_random(env, ra, &env->regs[r2], &env->regs[r2 + 1]); + fill_buf_random(env, mmu_idx, ra, &env->regs[r1], &env->regs[r1 + = 1]); + fill_buf_random(env, mmu_idx, ra, &env->regs[r2], &env->regs[r2 + = 1]); break; default: /* we don't implement any other subfunction yet */ --=20 2.53.0 From nobody Sat May 30 20:11:37 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=1776952349; cv=none; d=zohomail.com; s=zohoarc; b=PRpDfmdOL6qnJOz+O6PH+4Vnmy/RPxwnRdNk8ejqjL26OVEVYgnGeAZhbAeHs7fSYkk7kjf8mfUK66RTi4+0mMMDlBV/oPCRWH3oU0tlTA4zKYMuq+zbLfBMkTlW7M5a6a4ikmGn1PuErQuMBQWWP9vdlXr4exqxiWTLG/0Yqcc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776952349; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=USyA8v7aEKp3s5luzNdxwloj99EpgracOTgDV5g1QHE=; b=kUL2GStascNQFYX+woRS4TnpuPV9p2873NB/2ffz4uqLllxjo3nq0gKu7xU+fCo41zLlaFFG1kA8D7hkMa9rSsSWboYig3+windgHu3V1EEzt8dAZn4zmlEOcynJegRs8LPrI5vHSzym3BwbQGknTFN12WJeQSnSupTZ8eMhq4w= 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 1776952349657314.3568806264135; Thu, 23 Apr 2026 06:52:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wFuT9-0000xj-Jn; Thu, 23 Apr 2026 09:51: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 1wFuT6-0000x8-C9 for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:48 -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 1wFuT4-0006HY-FJ for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:48 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-48374014a77so87460165e9.3 for ; Thu, 23 Apr 2026 06:51:46 -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-488fb7b2634sm164816635e9.28.2026.04.23.06.51.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 23 Apr 2026 06:51:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776952304; x=1777557104; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=USyA8v7aEKp3s5luzNdxwloj99EpgracOTgDV5g1QHE=; b=nQB3k2TlA8LEyq/rndt3HYz0xLkamWGaeKtf+crgNmv5nGg8s6eDP8Gv6aLSLpn2Y5 RN9X4CD+ZQc6GniVaCS98sDt0NndvApHEdV5M2NDJkEP5hcF9yPRdV58T5HcNl0ijAAB DpEuJ/HFGBsZ2E+Z8uOGu5AorSFL67iJj7LFc/gm2WOiBrzHA7Sods+TSCQuEldFDUue Xv2grj4OvSeZ6pdzYc61sN2XHRPChTEOkGA7+R757gXA5jdHhPiMe4r2/yZyb7w8sOBu GHdkPhu8l1k3WwFpXzto5A7DF+uK7CecEt20jeNtwguwm4qmkrG9UvmxCMHinM26h5jv Bp5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776952304; x=1777557104; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=USyA8v7aEKp3s5luzNdxwloj99EpgracOTgDV5g1QHE=; b=QuwubOt5dgE+YOEbDeaOZqHRT9d7ypAuUkDEs8g3yU6P1SFjCTxUrBwBPk3InI8Zdz cRrRj1+2imPPaxS/MeE+fDATPEUH50iPtgkDyhb816F6rrEsHJ7QYZ2yLewZIpFHzecj 3NVx5RyYrPt3QLS47Np2lS7YZ3zZ6cN2QEdIcDHDxjNfGkfUOuxZwHuA/7z1IYFuDkKf LptuPA+qRaMh8hdTRxPkjXMB1kTG07scUrQwWFnkZqnlltDXm2ASB15Mi1c55VlVBP+w 3vbDPlDAwYzFUUcjyh3HLFMcFeRvUEjR9lgKzReSAFQJumj5UBesltkAWZqaR9ijX61f nHAA== X-Gm-Message-State: AOJu0Yyg1FVOW5LaYi+8DaS+WD3JXVAU6yfzRf7lIFXcCw+WpSzDOeZH 0D3tnqPw7jUn8asjUeVMa4XhZyBPxNUhiOmc6b1HtIbbc5dVxasPiEej5497dl/FJ3gYaOpLpoh UjQfgx4g= X-Gm-Gg: AeBDiesixrh4Z06dp4TiVk42GsLumInSW0ety+Saktd4owElDnMJ4ADuag6kMqpLn4A FTCmXv3xmimwyGXj6GCsP0OvJL2lxh3SFWLJgsF1g8T6HGPaFC0PIJtLSQ4fXYvGD1jbwljuU2o 0TUo1fsY0/POtwCSQQ3x1QubfHsJjieUThq1Aspo4tBWY57xvx/OoaMOs9Jc1F8uA+c+/d2Pr/O i3HmoJpaRT18o19+36YXM8/ps6hb2yn+2dmK7JZwph6jslKKtoyP25JbBkKytdb9SPG+Vl5FbBc Uu1+SSYbZZbwMRFJFAz4xLM6MYbjMcmVqgOgGyj0fbSgPkkSMedyTD0MX51njEU8t6w0FW8yXjy s+5XPKdxXGxf7+epyaf7QPC56somX8s5fPWhQAa0rWrGkOX1S83Q7bLBJSFoVsvIV+2xlp7y/T1 J4KpjOhT2jG75M1nNO0ITd9sqOwwWfN3NepvwKuwNN/bu6TNymcPB9yZDceYaCJAWYLzv2FGT+r 86uLXhETj8= X-Received: by 2002:a05:600c:1390:b0:483:709e:f238 with SMTP id 5b1f17b1804b1-488fb78ea6fmr391933805e9.29.1776952304388; Thu, 23 Apr 2026 06:51:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Ilya Leoshkevich , qemu-s390x@nongnu.org, Matthew Rosato , David Hildenbrand , Richard Henderson , Halil Pasic , Cornelia Huck , Eric Farman , Christian Borntraeger , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 8/9] target/s390x: Compile crypto_helper.c as common unit Date: Thu, 23 Apr 2026 15:50:34 +0200 Message-ID: <20260423135035.50126-9-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260423135035.50126-1-philmd@linaro.org> References: <20260423135035.50126-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: 1776952352212154101 In order do build crypto_helper.c as a common unit we need to replace: "accel/tcg/cpu-ldst.h" -> "accel/tcg/cpu-ldst-common.h" and update the cpu_ld/st_be_data_ra() API by cpu_ld/st_mmu() one. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich --- target/s390x/tcg/crypto_helper.c | 39 +++++++++++++++++--------------- target/s390x/tcg/meson.build | 2 +- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/target/s390x/tcg/crypto_helper.c b/target/s390x/tcg/crypto_hel= per.c index 074d745eb3f..ae392bce0e7 100644 --- a/target/s390x/tcg/crypto_helper.c +++ b/target/s390x/tcg/crypto_helper.c @@ -17,7 +17,7 @@ #include "s390x-internal.h" #include "tcg_s390x.h" #include "exec/helper-proto.h" -#include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/cpu-ldst-common.h" #include "accel/tcg/cpu-mmu-index.h" =20 static uint64_t R(uint64_t x, int c) @@ -123,44 +123,44 @@ static void sha512_bda_be64(uint64_t a[8], uint64_t w= [16]) static void sha512_read_icv(CPUS390XState *env, const int mmu_idx, uint64_t addr, uint64_t a[8], uintptr_t ra) { - int i; + const MemOpIdx oi =3D make_memop_idx(MO_BE | MO_64 | MO_UNALN, mmu_idx= ); =20 - for (i =3D 0; i < 8; i++, addr +=3D 8) { + for (int i =3D 0; i < 8; i++, addr +=3D 8) { addr =3D wrap_address(env, addr); - a[i] =3D cpu_ldq_be_data_ra(env, addr, ra); + a[i] =3D cpu_ldq_mmu(env, addr, oi, ra); } } =20 static void sha512_write_ocv(CPUS390XState *env, const int mmu_idx, uint64_t addr, uint64_t a[8], uintptr_t ra) { - int i; + const MemOpIdx oi =3D make_memop_idx(MO_BE | MO_64 | MO_UNALN, mmu_idx= ); =20 - for (i =3D 0; i < 8; i++, addr +=3D 8) { + for (int i =3D 0; i < 8; i++, addr +=3D 8) { addr =3D wrap_address(env, addr); - cpu_stq_be_data_ra(env, addr, a[i], ra); + cpu_stq_mmu(env, addr, a[i], oi, ra); } } =20 static void sha512_read_block(CPUS390XState *env, const int mmu_idx, uint64_t addr, uint64_t a[16], uintptr_t ra) { - int i; + const MemOpIdx oi =3D make_memop_idx(MO_BE | MO_64 | MO_UNALN, mmu_idx= ); =20 - for (i =3D 0; i < 16; i++, addr +=3D 8) { + for (int i =3D 0; i < 16; i++, addr +=3D 8) { addr =3D wrap_address(env, addr); - a[i] =3D cpu_ldq_be_data_ra(env, addr, ra); + a[i] =3D cpu_ldq_mmu(env, addr, oi, ra); } } =20 static void sha512_read_mbl_be64(CPUS390XState *env, const int mmu_idx, uint64_t addr, uint8_t a[16], uintptr_t r= a) { - int i; + const MemOpIdx oi =3D make_memop_idx(MO_8, mmu_idx); =20 - for (i =3D 0; i < 16; i++, addr +=3D 1) { + for (int i =3D 0; i < 16; i++, addr +=3D 1) { addr =3D wrap_address(env, addr); - a[i] =3D cpu_ldub_data_ra(env, addr, ra); + a[i] =3D cpu_ldb_mmu(env, addr, oi, ra); } } =20 @@ -200,13 +200,14 @@ static int cpacf_sha512(CPUS390XState *env, const int= mmu_idx, uintptr_t ra, =20 /* KLMD: Process partial/empty block last. */ if (type =3D=3D S390_FEAT_TYPE_KLMD && len < 128) { + const MemOpIdx oi =3D make_memop_idx(MO_8, mmu_idx); uint8_t x[128]; =20 /* Read the remainder of the message byte-per-byte. */ for (i =3D 0; i < len; i++) { uint64_t addr =3D wrap_address(env, *message_reg + processed += i); =20 - x[i] =3D cpu_ldub_data_ra(env, addr, ra); + x[i] =3D cpu_ldb_mmu(env, addr, oi, ra); } /* Pad the remainder with zero and set the top bit. */ memset(x + len, 0, 128 - len); @@ -248,6 +249,7 @@ static int cpacf_sha512(CPUS390XState *env, const int m= mu_idx, uintptr_t ra, static void fill_buf_random(CPUS390XState *env, const int mmu_idx, uintptr= _t ra, uint64_t *buf_reg, uint64_t *len_reg) { + const MemOpIdx oi =3D make_memop_idx(MO_8, mmu_idx); uint8_t tmp[256]; uint64_t len =3D *len_reg; int buf_reg_len =3D 64; @@ -262,7 +264,7 @@ static void fill_buf_random(CPUS390XState *env, const i= nt mmu_idx, uintptr_t ra, =20 qemu_guest_getrandom_nofail(tmp, block); for (size_t i =3D 0; i < block; ++i) { - cpu_stb_data_ra(env, wrap_address(env, *buf_reg), tmp[i], ra); + cpu_stb_mmu(env, wrap_address(env, *buf_reg), tmp[i], oi, ra); *buf_reg =3D deposit64(*buf_reg, 0, buf_reg_len, *buf_reg + 1); --*len_reg; } @@ -279,7 +281,7 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, u= int32_t r2, uint32_t r3, const uint8_t fc =3D env->regs[0] & 0x7fULL; uint8_t subfunc[16] =3D { 0 }; uint64_t param_addr; - int i; + MemOpIdx oi; =20 switch (type) { case S390_FEAT_TYPE_KMAC: @@ -300,9 +302,10 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, = uint32_t r2, uint32_t r3, =20 switch (fc) { case 0: /* query subfunction */ - for (i =3D 0; i < 16; i++) { + oi =3D make_memop_idx(MO_8, mmu_idx); + for (int i =3D 0; i < 16; i++) { param_addr =3D wrap_address(env, env->regs[1] + i); - cpu_stb_data_ra(env, param_addr, subfunc[i], ra); + cpu_stb_mmu(env, param_addr, subfunc[i], oi, ra); } break; case 3: /* CPACF_*_SHA_512 */ diff --git a/target/s390x/tcg/meson.build b/target/s390x/tcg/meson.build index ed6441f6f44..36cb0e079ed 100644 --- a/target/s390x/tcg/meson.build +++ b/target/s390x/tcg/meson.build @@ -1,11 +1,11 @@ s390x_ss.add(when: 'CONFIG_TCG', if_true: files( - 'crypto_helper.c', 'int_helper.c', 'mem_helper.c', 'misc_helper.c', )) s390x_common_ss.add(when: 'CONFIG_TCG', if_true: files( 'cc_helper.c', + 'crypto_helper.c', 'excp_helper.c', 'fpu_helper.c', 'translate.c', --=20 2.53.0 From nobody Sat May 30 20:11:37 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=1776952353; cv=none; d=zohomail.com; s=zohoarc; b=bsShEz1w0GdCydLB0iunxJEw5udx4C9aLSGLPm/6lowyq7neq2o1Y8JJ3UfYt4RAyBLVlPhPm+OXH7aRlVOrq+4umudrz91eYudh8o4HF77sxdaTsnkLk+I3xfXkjfufYhlh4zw2jfYp+jQ/CJwv8Ok9yEEdUTK1VSD/953aH+0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776952353; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+oLfXPk2seH667v62QgQRAk1m1SjRVL6L/A4xaQoVdA=; b=MxsECPVjzowTDAjcjxISb1gABtUQKKctwigZCMPffrQSX6Z/5TfYBKIw5jXqf654MY7TbDc10tHjyaQaqXw/zPM94K2x5btSmvWNvdaIuOQOPHjOO8Y9gRhsgG/zLdnUV34ROS9XW7Mrr4RXd1sc4S64pkQmmc9jlB0eHQlbnyc= 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 1776952353181882.3774065955006; Thu, 23 Apr 2026 06:52:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wFuTk-0001V8-6I; Thu, 23 Apr 2026 09:52: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 1wFuTK-00011A-4H for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:52:03 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wFuTB-0006WU-Oh for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:52:00 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-43d7badbd7dso3317578f8f.2 for ; Thu, 23 Apr 2026 06:51:52 -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-43fe4e3a166sm52149649f8f.19.2026.04.23.06.51.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 23 Apr 2026 06:51:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776952311; x=1777557111; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+oLfXPk2seH667v62QgQRAk1m1SjRVL6L/A4xaQoVdA=; b=P90UJ0Q/3jj9Re8AAbSHR72N83QG+spun5jH1BIA3Z0/qLTYq7tpeaDDFY9Oixc6qg Ws5lweFAnht+44VAKRfVVRNtMW3h6vSjsnGtBs2txb45P/btd1MLyTIhdfpUq8koZVqX N/N1PUQdwHvRjt2/baogVpQj/fJB0lw3inuyRvMa5aOMliuN3yH1fhsDXHmqTLK5Ir3R hgR1sYhs10fexsC4RbKXaZ0yoGQzKXoe7O15c2kA52YesxW/8/ivQWgqReEXGm/YKESg YhV8MyYLYQ9OZd+oBaJFf99pRCgjtEIS5hkAExZw6sfV3spZ0wAEoeQprzWKSCSUQtVd HHQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776952311; x=1777557111; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+oLfXPk2seH667v62QgQRAk1m1SjRVL6L/A4xaQoVdA=; b=IlxCtJaZH8dKKXgMlCc7Y5ne7tIS8Eq4VTjVhJ8Jb9kk+oO6vsDtHkTgfYb5CTsmdL madMJ5jAc4f38aAJBSQJ0D0G46YYYhWMmpc52c1QCUp47ZVpV0ugUOQrtDDuzM5oHy5u oTT8qzYBnOPSt+NXhJRTX70kbaY6MMR5KDIpWNoz4KVFj3KJRRpGm4OYq8iQ9mDH+YkZ ekJ415UCmPZKRrxmR6MmW8skN1zNOWeYno2lIWDZWqV9ZfozvtIxDDP3BAhax8PBLtqf UjLm8czUUlkq5Q/Cmo5cvn8B60gXBX8XeyBjCb2UUFBZIa5cPIetMZIjoJNjsipG+HlT zoOw== X-Gm-Message-State: AOJu0YxrVhY85BZTsrTgzr3h27kV2TLqUJvGcLCZO3yOYDp3AicvolQr xqPfESAz7K/ShhDos/iz7enocrrRqFT4+VjwcEumXTtOK+YPcisEsRJUdWgSxDIiib2+qFZ9f5o RwcGQo3o= X-Gm-Gg: AeBDiesjbWeTfdfK+daloMwm3uXslqc4xN+q/yRCPmmXWjVU4qbnC/zRD7HLkJQlV5I qqlAcnchTZxvKRr/Brr+JDiRgPLZCAPNooFB/1aybUdalAKQiQxeoFdsABUdwPxQXsidRa/3Hy3 HZ7/JN51AvMeuZ6VNKrnhYpnB4kVuKtMj63rKylX+YrCDnWuf3WLi1vXoKXp1pLz/A8xIOUNf39 FzlCtfiCb05MMyfTQ2aB0Wf0AQ6CjoKcP90riXH0D84gXpdbMgfmnjI+z1C9mtSa0aJ6wJ4Gpr+ Cxd6Waz8fTzKLk3+u/XhrXB7BLrfTfIAvN1Ij19lXqH4yVBA6opHL/2HBz/1OfMkiXXza+SdZXU MF2zgRD5g8/3CtsoPrLcPfNT7nicSZIP3ObUC1WHq5FVr3/DKPIkZ4xR3mmow44fIMSolRJZSXR DCjSxc5q91xSeHRqS+UZdq26nlAsniAFNC6rZ4WL9lp0k62goKThiQG4CGLw4iXSoxNoIMD/t5B a0nuT1+nuI= X-Received: by 2002:a05:6000:2303:b0:43d:75a2:44a1 with SMTP id ffacd0b85a97d-43fe3e1527bmr43642763f8f.47.1776952311439; Thu, 23 Apr 2026 06:51:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Ilya Leoshkevich , qemu-s390x@nongnu.org, Matthew Rosato , David Hildenbrand , Richard Henderson , Halil Pasic , Cornelia Huck , Eric Farman , Christian Borntraeger , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 9/9] target/s390x: Replace cpu_stb_data_ra -> cpu_stb_mmu in STFLE opcode Date: Thu, 23 Apr 2026 15:50:35 +0200 Message-ID: <20260423135035.50126-10-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260423135035.50126-1-philmd@linaro.org> References: <20260423135035.50126-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::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1776952355919154100 In preparation of building misc_helper.c as a common unit, update the cpu_ld/st_be_data_ra() API by cpu_ld/st_mmu() one and replace "accel/tcg/cpu-ldst.h" by "accel/tcg/cpu-ldst-common.h". For now we are blocked by the CONFIG_DEVICES use so keep the file in s390x_ss[]. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich --- target/s390x/tcg/misc_helper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c index 1fd900fbbf0..3d13c8bd8ea 100644 --- a/target/s390x/tcg/misc_helper.c +++ b/target/s390x/tcg/misc_helper.c @@ -27,7 +27,8 @@ #include "exec/helper-proto.h" #include "qemu/timer.h" #include "exec/cputlb.h" -#include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/cpu-ldst-common.h" +#include "accel/tcg/cpu-mmu-index.h" #include "exec/target_page.h" #include "qapi/error.h" #include "tcg_s390x.h" @@ -710,6 +711,8 @@ void HELPER(stfl)(CPUS390XState *env) =20 uint32_t HELPER(stfle)(CPUS390XState *env, uint64_t addr) { + const int mmu_idx =3D cpu_mmu_index(env_cpu(env), false); + const MemOpIdx oi =3D make_memop_idx(MO_8, mmu_idx); const uintptr_t ra =3D GETPC(); const int count_bytes =3D ((env->regs[0] & 0xff) + 1) * 8; int max_bytes; @@ -728,7 +731,7 @@ uint32_t HELPER(stfle)(CPUS390XState *env, uint64_t add= r) * not store the words, and existing software depend on that. */ for (i =3D 0; i < MIN(count_bytes, max_bytes); ++i) { - cpu_stb_data_ra(env, addr + i, stfl_bytes[i], ra); + cpu_stb_mmu(env, addr + i, stfl_bytes[i], oi, ra); } =20 env->regs[0] =3D deposit64(env->regs[0], 0, 8, (max_bytes / 8) - 1); --=20 2.53.0