From nobody Sat Sep 6 16:55:37 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=1756974327; cv=none; d=zohomail.com; s=zohoarc; b=eqj5dTObHYMWvspAVeae8m6jhGFB0SjxkxoHRPf3qix8clxC7fw+LrHlZRfks6Hr91AZb+M0WU5l3MHjbilM5Wt7VXL8W0BdrKxVj+xDavpwWuq1n223XsJimxhz57icG5YiHtOe6QY4lEv1qzchmPItgvSuwGeCknGJi9/OFfU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756974327; 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=6EbVn5eJ4TWHIldxY30gfc+9eY3s2xC+za4HvKYilBo=; b=GxHK9+tWwnk60F4ygsAp1fkTjmkcK7usTvun/cucxsA98hpitOSbimIp1SC4gyH2Q2COMxQesMEMknFcjeKHb0/WdVyGtvwPkW0t1B3q3w9wH0xYcTAYT1ncfujkBP67hMO08+uXlGLtnP1pEfNaeGeC0GTpFox8v3eEvSAMGPo= 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 1756974327772612.9191141759595; Thu, 4 Sep 2025 01:25:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uu5Af-0000GQ-OH; Thu, 04 Sep 2025 04:18:17 -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 1uu55e-000728-AY for qemu-devel@nongnu.org; Thu, 04 Sep 2025 04:13:06 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450: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 1uu54y-0004Kj-35 for qemu-devel@nongnu.org; Thu, 04 Sep 2025 04:13:04 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-b042cc3954fso129341366b.0 for ; Thu, 04 Sep 2025 01:12:14 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b04190700a4sm1095117366b.63.2025.09.04.01.12.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Sep 2025 01:12:10 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id F184860AED; Thu, 04 Sep 2025 09:11:38 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756973533; x=1757578333; 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=6EbVn5eJ4TWHIldxY30gfc+9eY3s2xC+za4HvKYilBo=; b=gl0mOPL07G2HE3NCvmWd+aGklYmuARNHb3+uHuQXZ7QjHrq0oPBgo8q9I0eR2QXRVA /9r3Md7QbkOsOXL2/ApZ3jhivD9E8Su0LpZbyPpEfxzdfqCegRsWkO6hukZQsUya07jI 2Yja6NrB4XVM2ISHD8OyIKbnOgj8efr4UJFEWCI+6dHGYDWw/j5Pf880yHTvsZH/Xirl OUP3wm9gcUtTfp59cgX64xOaRkay/DU58W7Bf9L/ZMOmhMg5e1N8tLcQuq6h05EwkiRP f4fZvelbMWnlaqS41SCkH2nS4zW6w691LAwgkQxAStBwf7ubvaAK+Lin1UvPCCQvRMeR IS8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756973533; x=1757578333; 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=6EbVn5eJ4TWHIldxY30gfc+9eY3s2xC+za4HvKYilBo=; b=bsJTcewQtjSiF5AvOBMhPozOM/uJvfDqVee9x/VtH1dg7WorzWNXkSQUhv365d7+8X WthCeECuhlmT2U3UCfLMZ0xW933lKeO9ukFYyY4qakBecdCul6hImp+HPmU/N+HT80nL ZfQ0yvpQcMzPxKdnn0Oht5H7TDDnmIcPq9raN4Yc7TXtMlW07pZtNa2YbV4Ku17ibxar /lgSPm8xhsYhni18kJbfeyZzlG/mitnaz5W4yroJidVqLJfAUM9MAKDVp2n4v+MMjZ7/ Vo3epIQdahGMAwTwJ95ezJIZQqpTHc75y/ZLxW6uCjffgXp87jmZLwPWPr8VKmt65wdH PlcA== X-Gm-Message-State: AOJu0YyhXyae5bbOdPJ5srlf9bWCEKXeJOfUtFOOLJ5JP2q0/KUaLbHv axMyPqWKmUvtR2x9TXgUanQxpZCOJsVeQPJ5lsm9yZA0+TMMNkaNZjTlQ5EyrpzZv4t2zJoHRz8 rVoe2KdvvXw== X-Gm-Gg: ASbGncv94IuhW1qRUI1urk8lyqax0V2JiYlgjadQFhJ9b5/BZiv4XIajz/nd1Po/vGN r4mFUFO2USCdUjqFbqIM2ywJii/ibNQrfQVRyPeQa/u0SWYSPZafyOnn4R/vaJnHpF8dBcPEzJ0 slTRMALXuM9GJCNIh3IbmHsKr83FmAgYhTsvT8ZlLmXi24LaCqAddDHQuGZMKoRYX2YXN+0RBkd J8TxOenLjCSiSIOM5XafN+Pkv4ljTEzau770Kl8rD6SGhDCojT7o7QyYAS1bQaVNm+A95LY6ha1 fucxfRdXcYZqiwvTNgs9yOmqgM0se4CBxFLkTct+viSGpqlgwu9D4vC3TBkVbw8cjdPi/Opeuxa 35g4LNdY/mQ2I/xyMQRA4Mcg= X-Google-Smtp-Source: AGHT+IGE72xujCzrpuvniQ2ueJZ4x/ss9sVMxOq4r/64b7nh3Vp6WuzYsL8MWp7c3HyS0dLplsfeZA== X-Received: by 2002:a17:907:7253:b0:af9:8438:de48 with SMTP id a640c23a62f3a-b01d978f785mr1865512266b.48.1756973533095; Thu, 04 Sep 2025 01:12:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Reinoud Zandijk , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Huacai Chen , Zhao Liu , Paolo Bonzini , Alistair Francis , qemu-arm@nongnu.org, Fam Zheng , Helge Deller , Matthew Rosato , Fabiano Rosas , qemu-rust@nongnu.org, Bibo Mao , qemu-riscv@nongnu.org, Thanos Makatos , Liu Zhiwei , Riku Voipio , Cameron Esfahani , Alexander Graf , Laurent Vivier , Harsh Prateek Bora , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-ppc@nongnu.org, Stafford Horne , Sunil Muthuswamy , Jagannathan Raman , Igor Mammedov , Brian Cain , Phil Dennis-Jordan , devel@lists.libvirt.org, Mads Ynddal , Elena Ufimtseva , Peter Xu , Jason Herne , Michael Rolnik , Weiwei Li , Laurent Vivier , Ilya Leoshkevich , qemu-block@nongnu.org, Peter Maydell , Kostiantyn Kostiuk , Kyle Evans , David Hildenbrand , "Edgar E. Iglesias" , Warner Losh , Daniel Henrique Barboza , John Snow , Yoshinori Sato , Aleksandar Rikalo , Alistair Francis , Marcelo Tosatti , Yonggang Luo , Radoslaw Biernacki , Artyom Tarasenko , Yanan Wang , Eduardo Habkost , Aurelien Jarno , Richard Henderson , qemu-s390x@nongnu.org, Alex Williamson , "Michael S. Tsirkin" , Ani Sinha , Roman Bolshakov , Manos Pitsidianakis , Chinmay Rath , Thomas Huth , Cleber Rosa , kvm@vger.kernel.org, Song Gao , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Eric Farman , Palmer Dabbelt , Leif Lindholm , Christian Borntraeger , Michael Roth , Mauro Carvalho Chehab , Jiaxun Yang , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Mark Cave-Ayland , Marcel Apfelbaum , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Nicholas Piggin , John Levon Subject: [PATCH v2 084/281] linux-user/m68k: Create init_main_thread Date: Thu, 4 Sep 2025 09:07:58 +0100 Message-ID: <20250904081128.1942269-85-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250904081128.1942269-1-alex.bennee@linaro.org> References: <20250904081128.1942269-1-alex.bennee@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=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-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=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: 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: 1756974329549116600 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Merge init_thread and target_cpu_copy_regs. There's no point going through a target_pt_regs intermediate. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/elfload.c | 11 +---------- linux-user/m68k/cpu_loop.c | 25 ++++++------------------- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 8604308a310..46150586aff 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -746,16 +746,7 @@ static inline void elf_core_copy_regs(target_elf_gregs= et_t *regs, #define ELF_CLASS ELFCLASS32 #define ELF_ARCH EM_68K =20 -/* ??? Does this need to do anything? - #define ELF_PLAT_INIT(_r) */ - -static inline void init_thread(struct target_pt_regs *regs, - struct image_info *infop) -{ - regs->usp =3D infop->start_stack; - regs->sr =3D 0; - regs->pc =3D infop->entry; -} +#define HAVE_INIT_MAIN_THREAD =20 /* See linux kernel: arch/m68k/include/asm/elf.h. */ #define ELF_NREG 20 diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c index 23693f33582..aca0bf23dc6 100644 --- a/linux-user/m68k/cpu_loop.c +++ b/linux-user/m68k/cpu_loop.c @@ -92,24 +92,11 @@ void cpu_loop(CPUM68KState *env) } } =20 -void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) +void init_main_thread(CPUState *cs, struct image_info *info) { - env->pc =3D regs->pc; - env->dregs[0] =3D regs->d0; - env->dregs[1] =3D regs->d1; - env->dregs[2] =3D regs->d2; - env->dregs[3] =3D regs->d3; - env->dregs[4] =3D regs->d4; - env->dregs[5] =3D regs->d5; - env->dregs[6] =3D regs->d6; - env->dregs[7] =3D regs->d7; - env->aregs[0] =3D regs->a0; - env->aregs[1] =3D regs->a1; - env->aregs[2] =3D regs->a2; - env->aregs[3] =3D regs->a3; - env->aregs[4] =3D regs->a4; - env->aregs[5] =3D regs->a5; - env->aregs[6] =3D regs->a6; - env->aregs[7] =3D regs->usp; - env->sr =3D regs->sr; + CPUArchState *env =3D cpu_env(cs); + + env->pc =3D info->entry; + env->aregs[7] =3D info->start_stack; + env->sr =3D 0; } --=20 2.47.2