From nobody Sun Sep 28 16:30:47 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1756402303; cv=none; d=zohomail.com; s=zohoarc; b=Sq60PqwXtPKyvB83i3VGrCvhwRwghEuYCjEZpNJv7Kz/mSpr4YDKjxh2lDF071YY7RZkl1VVQ4qrLXzUuYkG5n5kaCnhacf7atzNWSJlXjBa7H8VsCDYhtygGdF00CqkXGHiYkpy1Sntgy9n50bNJ3umfuoRi2+ed3B68r+srJc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756402303; h=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=69mE6QIBq3ZmENHyPTgP1dYbpvYchVwJFEPdQRbtihM=; b=TKScENnw8PfPYI5+Mp0ZEVHX2cCNJaGFNsgfnBP06Ik4ZsQ+8xQxB8VkUldCjTRP5PrThoQ+Z7hqEwzOHkaLwkGd44SPaq9Ukw6ipDFmoih+bQ17h933+T9H2RdTZ2tCL6WX9Tf4BB7EPKbH5L29ntHkrRn6QsgyyyoqscEL70A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1756402303072145.38158989348096; Thu, 28 Aug 2025 10:31:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1urgI8-0006Ez-Oe; Thu, 28 Aug 2025 13:20:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1urbW8-000840-6O for qemu-devel@nongnu.org; Thu, 28 Aug 2025 08:14:18 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1urbW0-0008HK-UP for qemu-devel@nongnu.org; Thu, 28 Aug 2025 08:14:06 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-24646202152so10795755ad.0 for ; Thu, 28 Aug 2025 05:14:04 -0700 (PDT) Received: from stoup.. ([144.6.121.55]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-248e3e0b75esm15129025ad.8.2025.08.28.05.14.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Aug 2025 05:14:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756383243; x=1756988043; 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=69mE6QIBq3ZmENHyPTgP1dYbpvYchVwJFEPdQRbtihM=; b=xv/r1xh5msSHloBRpsGse+M5mU16oMurK1O7hjxjsCnd2fSphUMte8V0g6nClE/xE+ B0qZGzRT7dEGs8QzTSSvUiFgfkRHWIKJd6YoBTjZ24O2s8jOVQuOUlf12Ajc0gnDAGUw e+WZiTMUgBGVyfia1uoin1Omt5dZqHo9vxROg3/ozGhcXtwkOZK/Ey7aaaS36CwaEIyn 38XXXDF6WLs518h4K9mNW5pzsNmI8Suz3f7tHYmUGnS4/EVBaJ1IfbARLjuTxtCrrjDG M13kzWhl93Rjonxg/XYgpexNtvXFR2LRTdPyiw0jDDY3AjJ/dVMVDCRyMQGn73+twD41 tUjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756383243; x=1756988043; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=69mE6QIBq3ZmENHyPTgP1dYbpvYchVwJFEPdQRbtihM=; b=lgOCXne5MrlXVfO5mmp9iqRg1xGFy3rb75+Riwc/oQre6B67dAi/QRvNv+x6RSibfM V28SVmhlbZ1ETU6RXhB8wGlcgEtBXGQWU23t/ki4haZsg8XbwClPu40Ud2NxYeGVDJA8 IOmqSz4BJVmEbD6YBCYSz//+O1p0SYqcPF2GGxnGJNblTRxoApyKxF1bIaOAdxdiL7oJ 0oGhbBw4EXcDsxoug7W8I8u1ilPU0z/90lROm5l3OZXj48hY0fbSAqpXiCtpWuHCVwTa PeaZFFeEaR6w6rruqx0/ds0aUidneXGZN90UpzKOr5W8daY23k05J6etUGeID32HIGAz /GbA== X-Gm-Message-State: AOJu0Ywyh9h85l3q7Idx/kVRddpwnnsvqM1jDsVyAQ/02WWAiZh5DxbJ lPekFvrnjFOqC4lkmvCxrzaoG/Dt8jHOgbh3gzBxvT7IDU0v7yLSzbeKBcS/hYEgwW98KipB/D/ ErMqC9BY= X-Gm-Gg: ASbGncuZlQTPJTJ4PxDUwlrfEw4OiiTEPK42caDEnf1hQeDc7TQnsUncxNvfP7fFiQa BlUZUE1PytAiZkKJdDRoCPG/gfH+UrSv0kemsPE5Cl5Qm6Fq0BwzQqcxPmyg5TIpFu3kIdyWdKy mUcsGEOluN6tJHmq2Cqyt53YxnHPZG57iN1MnYW+y+prkqvmJyvKdDEfrbuUDV4yMW2wjrO8wIU a8QGiXiYgEowJ/Oyap8k0bWVG1NAU04lpAtFNpt5pUUA6yuic8bX7YW7NpHzoDEcokJYdfnMLRH QZzC4+vbmRm+m7sMZGjZcu9DUtWfqhwApNFccT/AfpeY9PCdkH85ckYIs64Q/3UmaBsQDH4rtMz KwvUYPy0Hg5lgoFUTS4kukFBMTfExghK8h7Ax X-Google-Smtp-Source: AGHT+IFdLJIpRp1Ou8yY2NuTtNiJhO61lIo284ui+XVaPL5gpQWrdFYaxwomgF3gbI/uyGmZaauDOg== X-Received: by 2002:a17:903:1a45:b0:246:ddd6:f8b9 with SMTP id d9443c01a7336-246ddd6fd04mr196377315ad.43.1756383242807; Thu, 28 Aug 2025 05:14:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Subject: [PATCH v3 52/87] linux-user/s390x: Expand target_elf_gregset_t Date: Thu, 28 Aug 2025 22:08:01 +1000 Message-ID: <20250828120836.195358-53-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250828120836.195358-1-richard.henderson@linaro.org> References: <20250828120836.195358-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1756402305621124100 Content-Type: text/plain; charset="utf-8" Make use of the fact that target_elf_gregset_t is a proper structure. This lets us drop the ugly cast to uint32_t* in the middle. Drop ELF_NREG, target_elf_greg_t, and tswapreg. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- linux-user/s390x/target_elf.h | 12 +++++++----- linux-user/s390x/elfload.c | 28 +++++++--------------------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/linux-user/s390x/target_elf.h b/linux-user/s390x/target_elf.h index b7d863ee66..670c7b3eed 100644 --- a/linux-user/s390x/target_elf.h +++ b/linux-user/s390x/target_elf.h @@ -8,15 +8,17 @@ #ifndef S390X_TARGET_ELF_H #define S390X_TARGET_ELF_H =20 +#include "target_ptrace.h" + #define HAVE_ELF_HWCAP 1 #define HAVE_ELF_CORE_DUMP 1 =20 -typedef abi_ulong target_elf_greg_t; - -/* See linux kernel: arch/s390/include/uapi/asm/ptrace.h (s390_regs). */ -#define ELF_NREG 27 +/* + * See linux kernel: arch/s390/include/asm/elf.h, where + * elf_gregset_t is typedef'd to struct s390_regs. + */ typedef struct target_elf_gregset_t { - target_elf_greg_t regs[ELF_NREG]; + struct target_s390_regs pt; } target_elf_gregset_t; =20 #endif diff --git a/linux-user/s390x/elfload.c b/linux-user/s390x/elfload.c index 4113273b72..27109279e2 100644 --- a/linux-user/s390x/elfload.c +++ b/linux-user/s390x/elfload.c @@ -68,29 +68,15 @@ const char *elf_hwcap_str(uint32_t bit) return bit < ARRAY_SIZE(hwcap_str) ? hwcap_str[bit] : NULL; } =20 -#define tswapreg(ptr) tswapal(ptr) - -enum { - TARGET_REG_PSWM =3D 0, - TARGET_REG_PSWA =3D 1, - TARGET_REG_GPRS =3D 2, - TARGET_REG_ARS =3D 18, - TARGET_REG_ORIG_R2 =3D 26, -}; - void elf_core_copy_regs(target_elf_gregset_t *r, const CPUS390XState *env) { - int i; - uint32_t *aregs; - - r->regs[TARGET_REG_PSWM] =3D tswapreg(env->psw.mask); - r->regs[TARGET_REG_PSWA] =3D tswapreg(env->psw.addr); - for (i =3D 0; i < 16; i++) { - r->regs[TARGET_REG_GPRS + i] =3D tswapreg(env->regs[i]); + r->pt.psw.mask =3D tswapal(env->psw.mask); + r->pt.psw.addr =3D tswapal(env->psw.addr); + for (int i =3D 0; i < 16; i++) { + r->pt.gprs[i] =3D tswapal(env->regs[i]); } - aregs =3D (uint32_t *)&(r->regs[TARGET_REG_ARS]); - for (i =3D 0; i < 16; i++) { - aregs[i] =3D tswap32(env->aregs[i]); + for (int i =3D 0; i < 16; i++) { + r->pt.acrs[i] =3D tswap32(env->aregs[i]); } - r->regs[TARGET_REG_ORIG_R2] =3D 0; + r->pt.orig_gpr2 =3D 0; } --=20 2.43.0