From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6E1B9CA1013 for ; Thu, 4 Sep 2025 08:18:42 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uu5AP-0007cN-Tg; Thu, 04 Sep 2025 04:18:02 -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 1uu55P-0006nA-92 for qemu-rust@nongnu.org; Thu, 04 Sep 2025 04:12:57 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uu54o-0004Hz-KQ for qemu-rust@nongnu.org; Thu, 04 Sep 2025 04:12:48 -0400 Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-b0418f6fc27so103959566b.3 for ; Thu, 04 Sep 2025 01:12:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756973528; x=1757578328; 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=nJY1IlIgq7GGkBP3hhYu6s36xjwpVbPeSOjHkNAYnEM=; b=ujbQemcQ1csrq8TigLZhY/HJfO3aNWnKZb3SzO110U2hOcasSApv+x0jq3YFpBKqgF cExNpJXEC9WaZDkXhtdIeAgFd9smMtiuE9HRqIERWU37IH54Z0uPAQRdBEjQBapYx4+s 5yc6dJYLCsC+lLjpAdPad77y0wXwLd9/bdJr+1QoedH03WK1YFeTEK2Uo46sHXQqzt50 Uip+cPAaY0+kOAwzmLFnC47BB8WNzH8236AGDFj4a4NBKPjg84t2l1SGWPKmlkXc1tKe Ex0ut9d/VbgZQ5x/cQZauKzj1Rhyje/BMatncT791/+4xLeRd62yTZYoXO+uh9Q1leHi ZORg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756973528; x=1757578328; 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=nJY1IlIgq7GGkBP3hhYu6s36xjwpVbPeSOjHkNAYnEM=; b=McQo0ItE9hs468JAQ19WSKgPnvgSExxsp2roxMPxJJJWcfFF+DSzy818JUL449JK+D rbn8NuNDMsAjO1z19RFjZkJX6ziBO8S2VBBd8pkeudEz6cKtZfFqO/bcAxgThs0xwLSo G2OZIuOIA8E8pL/PN4nx4YrYxot3pAD0va3iGtJYvU5kvAAv/4cyRbCS4gBEcTzp9dAV BwaQVOXiYnxrpiavCClWT/1LlopZpXm9+Xhf/GSX1oERRFVLXtk697ekpP7p1kquPGDR j/1Se3d5G/2Vp2s8D2VJOXBz48mk/VsbpydIYYcw+nDDL2Ph+Qv5Feg8AZD0ezHWn90n cMjw== X-Forwarded-Encrypted: i=1; AJvYcCX9sNUJorgmYpv85HoSHCiOhYXTbk6YzbDSDpv4x50TVrRU0Hxh95PpFgCz8c+bxBOFZGZeeGdLDEA=@nongnu.org X-Gm-Message-State: AOJu0Yxa4vPK23Fb6AL7EJF7wTicZqpHz1pSXLQouXD6nBnbldbyq0nV 5EnoHDANVfo3p7KIADHPCBDhfZV2sAZORsS1w8kcZk6PqgilB7Bqm92/EYiTDlh7i8o= X-Gm-Gg: ASbGncsiM4Rt6nYfHRVo4QYbOvJrNmfLBXeVixA6Jdu2gtLMM6TOE2R++bL2bJNkUPe C1yXjIsUgEmqk/J48UUWQ4bgXGTpG5pzqKfrQktx2E0TNJKGMgySjz5h9wQv9jxfCFnKhUSL+mB lD2jGY/3wz2gHwKTqntbqgulIv+pwB1I/K20jXJIxTJVLAAMjphklThMTmb3TmTi+uhO6eAtwYl PS6DVGjR5N5Uy+V/9VkoZ9FgLbAdkIBg/i0bMBhg6dhAtS/s9LjwiwIYrReeD6Uf2LhTL8HfPSi V0qy+P7BJx/fOBw6JBuSNZkttXSH/nZRIL9TigRiZs3xaz0D6+siSoZh1mDMkjrZApROBrnrJaV liYaCNIselV/59jU2FY7ZS5I= X-Google-Smtp-Source: AGHT+IEi9pe0oeBOE15/8xuZT4mmtCw/EODsHqznTJDr3Z4WP9YjhwiV366LnSMgu6QLvZ6qkctWyg== X-Received: by 2002:a17:907:86a6:b0:afe:bdcb:9e62 with SMTP id a640c23a62f3a-b01d973074dmr1930653766b.33.1756973527252; Thu, 04 Sep 2025 01:12:07 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b0424cc1698sm987487966b.21.2025.09.04.01.12.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Sep 2025 01:12:04 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 093DB60ABF; Thu, 04 Sep 2025 09:11:38 +0100 (BST) 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 076/281] linux-user/aarch64: Create init_main_thread Date: Thu, 4 Sep 2025 09:07:50 +0100 Message-ID: <20250904081128.1942269-77-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: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x634.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-rust@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: QEMU Rust-related patches and discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-rust-bounces+qemu-rust=archiver.kernel.org@nongnu.org Sender: qemu-rust-bounces+qemu-rust=archiver.kernel.org@nongnu.org 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/aarch64/cpu_loop.c | 14 ++++++-------- linux-user/elfload.c | 10 +--------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c index 030a630c936..4c4921152e8 100644 --- a/linux-user/aarch64/cpu_loop.c +++ b/linux-user/aarch64/cpu_loop.c @@ -137,10 +137,10 @@ void cpu_loop(CPUARMState *env) } } -void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) +void init_main_thread(CPUState *cs, struct image_info *info) { + CPUARMState *env = cpu_env(cs); ARMCPU *cpu = env_archcpu(env); - int i; if (!(arm_feature(env, ARM_FEATURE_AARCH64))) { fprintf(stderr, @@ -148,14 +148,12 @@ void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) exit(EXIT_FAILURE); } - for (i = 0; i < 31; i++) { - env->xregs[i] = regs->regs[i]; - } - env->pc = regs->pc; - env->xregs[31] = regs->sp; + env->pc = info->entry & ~0x3ULL; + env->xregs[31] = info->start_stack; + #if TARGET_BIG_ENDIAN env->cp15.sctlr_el[1] |= SCTLR_E0E; - for (i = 1; i < 4; ++i) { + for (int i = 1; i < 4; ++i) { env->cp15.sctlr_el[i] |= SCTLR_EE; } arm_rebuild_hflags(env); diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 95868739546..f93afbdcea3 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -395,15 +395,7 @@ static const VdsoImageInfo *vdso_image_info(uint32_t elf_flags) #define ELF_ARCH EM_AARCH64 #define ELF_CLASS ELFCLASS64 -static inline void init_thread(struct target_pt_regs *regs, - struct image_info *infop) -{ - abi_long stack = infop->start_stack; - memset(regs, 0, sizeof(*regs)); - - regs->pc = infop->entry & ~0x3ULL; - regs->sp = stack; -} +#define HAVE_INIT_MAIN_THREAD #define ELF_NREG 34 typedef target_elf_greg_t target_elf_gregset_t[ELF_NREG]; -- 2.47.2