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 8E432CA1012 for ; Thu, 4 Sep 2025 08:21:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uu5Cw-0004Ww-AO; Thu, 04 Sep 2025 04:20:38 -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 1uu5BZ-0001le-45 for qemu-riscv@nongnu.org; Thu, 04 Sep 2025 04:19:22 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uu5B9-0008HF-Aw for qemu-riscv@nongnu.org; Thu, 04 Sep 2025 04:19:12 -0400 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-afcb7ace3baso138921466b.3 for ; Thu, 04 Sep 2025 01:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756973923; x=1757578723; 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=+88w9AQZ9cLJwlirAZW/BDB9U/6ab+UNG3qEc9GZaw4=; b=BzEB9PPmghWInhBr1X8AzbUEd390VutkJj+I2M5SSSJkQWvGRWAsxGzo/IYGd3NNAO ObUIJW3mzJ1RXOyGyP6N/9Yinbk4zdwHUuBTZDuwQNynLfOpdpE7L8Wsb42jTRFj7I6L ndB6TttCDrW/+Z3rKyMDqrUP4nKHvacZiXU0bNdMXZy2SexXcJsP/H8wwBXkQYvwXXLd ayf94I4M3XA0T/Y35kRaDxFbNw13YEt4mgWyEKqtg3oOsatZ57GknOqXPqUknLp5KIxM sROq43d9yYPx0+kWJX51WtDQ8RI6dF6+PtGWgWWnvoA8XbzZ2vzPTnO9ExG80wCAOD4J p3aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756973923; x=1757578723; 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=+88w9AQZ9cLJwlirAZW/BDB9U/6ab+UNG3qEc9GZaw4=; b=A9q1w33V93UzsxF2CqkuK/2iMEfINYqi90ztY8VsNLXCRfgZfqrTQmdl6gQJFwuCkJ 3cfZ6n4Uw+6ENQmFZK7eWj/pM8AOUR0Vgr+e4jihWBfgu0obYDmB6elfTxoTX6jjCAuB qJX+oxMQ/fb8ne0BE8DvFun0mX/21HPR68JSGLgeEZ+fZaHMcD92JogEG6ijPOvsJEFT r81RvhAVTQ1d6S4E7XQxzqWJzqbXWKpm4yLivy9dCSq8FZ1KiLL0Ka4K+v8vcUzRvsFU 6cisAm4QZleoreAaQ1Qpy7kGIhDDhGLyyZ7ZwcDa62h1k9MjDsC4yfzL0gb3uK9MUJeX Jhvg== X-Forwarded-Encrypted: i=1; AJvYcCXatjc4vB2ek9N7EguWo8q9/D2OR06DwS8xHMDuRZPq9ENT8wuFi25PXeMVnSNO0+1dCb98CvGZOvGp@nongnu.org X-Gm-Message-State: AOJu0Yz/p7+KMPhB1BJismGh68WebHqVkzOvKm1VE7Z/Evln609kVNLg btEfefmB1BXe2xWb4UXRNcrZ/M7c7v2BJDw0i+kRviM1QG/wc54sUIrNPQKPjWsdz24= X-Gm-Gg: ASbGncty4ZMADs12s918PjdyPNUVUhI6DrJN3Z3vWoS5JECGzKN6RB3f1PCEW9Wcmro lFEOK5Gqy2qRyoYFT+2Nld4YXKYNKwRnlVeSg2hXCMN6sQ3yfxDNZC3h79uyoen9OiQXY0jGQUP pkFgzYcTuhutmGCHYq49NPyYs+r8v9PGF1BW30VAKVkVhSS5txnMFDnM88PcfMAR2NUOpEqy8bD QCfwfi5YA8PvbQBbpoc9Fm6BHhkmeF6HfE+QOhag3CFaQD/6CPpLgk9WnrDvi/xKXcWe5hr16ED ZkmIwLeAnDwOFLvX8JDb6DH3RxDPkqu4LKNEyxTydHz6JNZxxhSTyUG0CCO8oD+Cl85+1rIMDxI cetqbPy2aGMFMFnuoYEjcsqs= X-Google-Smtp-Source: AGHT+IGxjVBN0FQryOFHW7NPMAzsYYrdCtTTvqWBsGarhpRXGfdwEbKrpxErVnpLvup6bLCipLULiA== X-Received: by 2002:a17:906:4fca:b0:b04:6546:347e with SMTP id a640c23a62f3a-b0465463a5bmr592167766b.51.1756973919569; Thu, 04 Sep 2025 01:18:39 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b0425ce98f1sm977746666b.67.2025.09.04.01.18.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Sep 2025 01:18:37 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 5504A60AF7; Thu, 04 Sep 2025 09:11:39 +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 087/281] linux-user/riscv: Create init_main_thread Date: Thu, 4 Sep 2025 09:08:01 +0100 Message-ID: <20250904081128.1942269-88-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::633; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x633.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-riscv@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-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Sender: qemu-riscv-bounces+qemu-riscv=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/elfload.c | 7 +------ linux-user/riscv/cpu_loop.c | 10 ++++------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 16aa09214e8..556f11d720d 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -849,12 +849,7 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs, #define VDSO_HEADER "vdso-64.c.inc" #endif -static inline void init_thread(struct target_pt_regs *regs, - struct image_info *infop) -{ - regs->sepc = infop->entry; - regs->sp = infop->start_stack; -} +#define HAVE_INIT_MAIN_THREAD #define ELF_EXEC_PAGESIZE 4096 diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c index 2dd30c7b288..b3162815320 100644 --- a/linux-user/riscv/cpu_loop.c +++ b/linux-user/riscv/cpu_loop.c @@ -94,14 +94,12 @@ void cpu_loop(CPURISCVState *env) } } -void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) +void init_main_thread(CPUState *cs, struct image_info *info) { - CPUState *cpu = env_cpu(env); - TaskState *ts = get_task_state(cpu); - struct image_info *info = ts->info; + CPUArchState *env = cpu_env(cs); - env->pc = regs->sepc; - env->gpr[xSP] = regs->sp; + env->pc = info->entry; + env->gpr[xSP] = info->start_stack; env->elf_flags = info->elf_flags; if ((env->misa_ext & RVE) && !(env->elf_flags & EF_RISCV_RVE)) { -- 2.47.2