From nobody Sat Nov 15 09:08:43 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=1754177092; cv=none; d=zohomail.com; s=zohoarc; b=J/ptRDX8i0RDaYWzfgSyF7K6urF+qnIytAp2WbCxSaWg79PM8yXXMPid3Mp4hRxp8PJ9rNm86B9hML9oPWEISo1B/P+kuboKdyqPnAADwcQZGe1MxHe97utsWjzbR+cbBYyPNtwzgLyHtbqM6foQh3+zDXlZXAefTKFzeKxDwF8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754177092; h=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=uE6kEEA2yLsGbbdqUp9jlCxO7X+3Igj3rF1vo83t+uQ=; b=ScXVlRrIcW6x6S/IRBgO2lmaIDfWm6CtTRQfJWs0MqTsGqjllDUgMgX1tVFZxVW2CmZobJaI6mp/cqSg+mRoVkf5UvABSa+BE6lhtos79m0JSUB31AJv8sg21Su1dZ8ObVh2fETRkkivgwpsOsf2sGXaLP0pDfFb0QMCWG2foI4= 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 175417709259428.61851995236259; Sat, 2 Aug 2025 16:24:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uiLOv-0004NB-D1; Sat, 02 Aug 2025 19:12:29 -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 1uiLOF-0003bJ-9b for qemu-devel@nongnu.org; Sat, 02 Aug 2025 19:11:51 -0400 Received: from mail-oi1-x231.google.com ([2607:f8b0:4864:20::231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uiLOD-0001mf-Kp for qemu-devel@nongnu.org; Sat, 02 Aug 2025 19:11:47 -0400 Received: by mail-oi1-x231.google.com with SMTP id 5614622812f47-4338d05970bso2037645b6e.1 for ; Sat, 02 Aug 2025 16:11:45 -0700 (PDT) Received: from stoup.. ([172.58.111.133]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-61970693ed9sm1084454eaf.20.2025.08.02.16.11.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Aug 2025 16:11:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754176304; x=1754781104; 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=uE6kEEA2yLsGbbdqUp9jlCxO7X+3Igj3rF1vo83t+uQ=; b=vmUgJiXGBvrTr8+vvfU7SNE6eIe4gpxh7coCnMsePB7KTDPk7FLBPr77T7aFGX3brv UwI3sWDPdX7UP1X+CLHIqdFbqNZebeR5W5arq39UKIqJsQszfErthpTIPKaEY6mcknv+ jo7zCPjnLXx2eEjVOpgv5mv9JVxIcysyVQDuRPZSBlbSmiQGJEFTRLQXgmbRZBpE8VBU G3Yy7wbBD0kysYJ8LTKSZsrmQt8j2Y0Vuv7+g/2TG0DdSJGgacKG3BBPpJJjlCgo7Ati XFGpnxWuEEWjdQMgmX+h8pqOP62vn5TxD4viKUErrgT6TiqgBY7knpfEEA6YPtyLZIhC hXKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754176304; x=1754781104; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uE6kEEA2yLsGbbdqUp9jlCxO7X+3Igj3rF1vo83t+uQ=; b=IS0CUggOC4sCmFjUxBO/6LGY+nHHryQLyT/92PVJJ+4UK+g/HZanKYGluGPoeKEF4Y uJAtNs3oAwkb7vRw6V0V5podRDr56KbeglErAGKchS7vGLxIktkwVBQSp26xT91JCTbm 6mkEklB+vJ5t6s+/ChH/X69YHTuP2aHO+Ciey4zCojIIDu9U2Y2VJLWEPF5RYDLOW/DU NN50oSbQhD7Voxm4/tQQxihgvSUDhV2eMFK58F+0lgO5I/2eaCVLSyhvZHx/CLry6K26 VWYUeDAPBqm7pyjhYQzc4mG2x8ZyEi89lKJJW/ygwHOaThlTiuyyhIRSY7VsUpCg5Umm eSzw== X-Gm-Message-State: AOJu0YwhZeJ7xqAlz0ha4QEFclIvGOFj6lR9QlUTcFxUa1+tFcZoBCZC HzF0o4bAJ7x9celIkpp2OwDAuifesxbcJ7va7tX2HTrmI4KNDsjkyKPNlXzcMcj4YnHRUeEVnqV 7VOVpHcA= X-Gm-Gg: ASbGncvFtNJucf+cXHwA5hFZU424bqKHvZRj/TBZPE4FVkzGviOt9gLI8cUyYuWG/j6 sHwnx6p4szHHpVWvkCVfuuaM7nQX7+rM5OZpA6BtZrnHz9FjRUpLvwZyzklqUwIFXLQ6ojgwaMn 7zHkrxQ6ebJjyq5DJT0DYBKCy1tCV2e4kcQKjIZHp9eMVkvVgMiFTVmQr8UU3bMyMlfUOpC+f/1 l8CjHrHpbZPvQRwYx40kXB1plIwE+tRwRRjk7JUIYMQNlRyKYJ0FNlMnmvYmS8mMf4nvxkWvOfj Lhe45KW4uyVHim/mO/MzmVbwHgHXq/DRXI/QH6Cnaj9Z/ILVGS9Gs3V7csirwAHVtCDsXLflNP+ GXlrZw4f4HC6oqzRrrW/UOg3GPZsHb/km2SVYyIYxL+Er9X9MlxP1 X-Google-Smtp-Source: AGHT+IGc5oMo9FTSpBZmuGUpCt2Yl+ep6BeXgqBvJCsEIO6zOrpNKP7d4V3Wzx/NGwRor+Nrn51ytA== X-Received: by 2002:a05:6808:3509:b0:406:7af5:30f2 with SMTP id 5614622812f47-433f0363587mr3557172b6e.34.1754176304480; Sat, 02 Aug 2025 16:11:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 60/95] linux-user: Move elf_core_copy_regs to s390x/elfload.c Date: Sun, 3 Aug 2025 09:04:24 +1000 Message-ID: <20250802230459.412251-61-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250802230459.412251-1-richard.henderson@linaro.org> References: <20250802230459.412251-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::231; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x231.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: 1754177094804124100 Content-Type: text/plain; charset="utf-8" Move elf_core_copy_regs to elfload.c. Move ELF_NREG to target_elf.h. Signed-off-by: Richard Henderson --- linux-user/s390x/target_elf.h | 3 +++ linux-user/elfload.c | 28 ---------------------------- linux-user/s390x/elfload.c | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/linux-user/s390x/target_elf.h b/linux-user/s390x/target_elf.h index cebace949a..f83fdbbddf 100644 --- a/linux-user/s390x/target_elf.h +++ b/linux-user/s390x/target_elf.h @@ -10,4 +10,7 @@ =20 #define HAVE_ELF_HWCAP 1 =20 +/* See linux kernel: arch/s390/include/uapi/asm/ptrace.h (s390_regs). */ +#define ELF_NREG 27 + #endif diff --git a/linux-user/elfload.c b/linux-user/elfload.c index bc1a06a651..80f5c967da 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -453,34 +453,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t e= lf_flags) #define ELF_DATA ELFDATA2MSB #define ELF_ARCH EM_S390 =20 -/* See linux kernel: arch/s390/include/uapi/asm/ptrace.h (s390_regs). */ -#define ELF_NREG 27 - -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_ulong *regs, const CPUS390XState *env) -{ - int i; - uint32_t *aregs; - - regs[TARGET_REG_PSWM] =3D tswapl(env->psw.mask); - regs[TARGET_REG_PSWA] =3D tswapl(env->psw.addr); - for (i =3D 0; i < 16; i++) { - regs[TARGET_REG_GPRS + i] =3D tswapl(env->regs[i]); - } - aregs =3D (uint32_t *)®s[TARGET_REG_ARS]; - for (i =3D 0; i < 16; i++) { - aregs[i] =3D tswap32(env->aregs[i]); - } - regs[TARGET_REG_ORIG_R2] =3D 0; -} - #define ELF_EXEC_PAGESIZE 4096 =20 #define VDSO_HEADER "vdso.c.inc" diff --git a/linux-user/s390x/elfload.c b/linux-user/s390x/elfload.c index 79ceaba51d..38d72a36f9 100644 --- a/linux-user/s390x/elfload.c +++ b/linux-user/s390x/elfload.c @@ -66,3 +66,28 @@ const char *elf_hwcap_str(uint32_t bit) =20 return bit < ARRAY_SIZE(hwcap_str) ? hwcap_str[bit] : NULL; } + +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_ulong *regs, const CPUS390XState *env) +{ + int i; + uint32_t *aregs; + + regs[TARGET_REG_PSWM] =3D tswapl(env->psw.mask); + regs[TARGET_REG_PSWA] =3D tswapl(env->psw.addr); + for (i =3D 0; i < 16; i++) { + regs[TARGET_REG_GPRS + i] =3D tswapl(env->regs[i]); + } + aregs =3D (uint32_t *)®s[TARGET_REG_ARS]; + for (i =3D 0; i < 16; i++) { + aregs[i] =3D tswap32(env->aregs[i]); + } + regs[TARGET_REG_ORIG_R2] =3D 0; +} --=20 2.43.0