From patchwork Wed Jan 3 17:14:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 83247 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8500D385803F for ; Wed, 3 Jan 2024 17:18:55 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by sourceware.org (Postfix) with ESMTPS id 0033B3858014 for ; Wed, 3 Jan 2024 17:15:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0033B3858014 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0033B3858014 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::134 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704302117; cv=none; b=xKEsdzfDBmfOm9uAM4rdNvinif6Za2aAqSE220PeRdMSST0i1kKJG+pUoRd44+UxyijjzhfyYEKdjMSHXA69OYDivj32ggkaCdpBkhh2v3Lo+Vv+FtfF4mL4nlJC+lJIHxUIyz/FzGni5OpbERUyTxBxjmd88nmmQpocUO3xe1Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704302117; c=relaxed/simple; bh=5Oa0M6l2jI3PFgvx/3DUQaWdEiKE6lX0jAwuvXOLMOU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=DeJB7wPr7qlwuGqJg7TTO/LWXrpumnlVrDiRANQbOp6lZE+BPZhiRep8EGbJAEeAkT8g8BMWei4dO2uNcYIIKgaypVIGFE2CLcnFRzy+lcFw7Mew2m4lY7bsPfuyZQOvKR6fmh5ONR+ISIhNWS6viCUVIJctrKqts1Aoo88lJ2M= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-50eaaf2c7deso67879e87.2 for ; Wed, 03 Jan 2024 09:15:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704302112; x=1704906912; darn=sourceware.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=uqxCuPzoS6QtolQn5DulbzjpFmFOoRAWi7yVhpj2JEg=; b=TKSS/XJfeJDXm1qH3izecRvU/TpwWqo2uG/coAeJQS2zfLqV8ym5Nn1y9H7g3vkSGF 7RaW8ekv8GiJDGbTiFU4W1DS3O2X3Vt9vhozk3K55ny6hXO3+tChk+xI5b3+jbdN43gG 9tjSkf/Rc/OGdenE8hugznQMoyJJVqNJz673shDz5Eo7Ly4IMShq/xum0frz8hE3Rq+u qaLUHV6KJDdBJhcUGcAqy+HScm/bv0z+rqNdY1ZnsodtlF/Jj17omKkKfoSCeAm3v+g8 ZkIVNM91RNS27xykejqZv3olc0aZsjS5wUpqxTwuegADUB42Djg/5UwEsbIdqP5eeQUu 9vTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704302112; x=1704906912; 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=uqxCuPzoS6QtolQn5DulbzjpFmFOoRAWi7yVhpj2JEg=; b=HMPvY81NK9Gqukjy+J9NtmoCqtybad12s+UBfCXpwS1aSUe6MmlELQPIhKFuBitUYW V3fOJF/33mrmKL1hiUr/iJ3V2FoNrnBQVKDVpZJZC81pK13ytZlJjQunLAsnh8Sajsg5 5Wv9VM9fhbE8lUXl5skeX7KJOgbgTpLFFw4cA2OImnt6efAJFkogJZm+dC2ZfWfC34XW KPMC77TCnk0jTRRjYmAk8VitNdYQug4rtxfVesFhCWQ7RgolpXCbZyHgXk+j+4tCJ59V T563otUH0xxIvANffhAEXp8LfcDMr/VqMndV+DV7I7NVpsDOcDtGt+zXCL3GEZ8pMovr KjGw== X-Gm-Message-State: AOJu0Yxa0WBvK+bQVJXzv0ZobBquTxweHmfshcYVZnuF31Cy3P7rWfGE ZSR3cHFpQCUexRQMYrcT4KAs7bUxs/4= X-Google-Smtp-Source: AGHT+IFbtPP107Im+hVMc0FvWZjCXo0Lx05U23Wz0ePwKXax5f5ypsgXJWBI8/CVlcHEYv0KIhMwsA== X-Received: by 2002:a05:6512:3b07:b0:50e:7ef1:df8a with SMTP id f7-20020a0565123b0700b0050e7ef1df8amr6113697lfv.58.1704302112164; Wed, 03 Jan 2024 09:15:12 -0800 (PST) Received: from surface-pro-6.. ([2a00:1370:818c:b32f:ebdc:fd0:376b:8006]) by smtp.gmail.com with ESMTPSA id y23-20020a196417000000b0050e6d84d177sm3546068lfb.279.2024.01.03.09.15.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jan 2024 09:15:11 -0800 (PST) From: Sergey Bugaev To: libc-alpha@sourceware.org, bug-hurd@gnu.org Subject: [RFC PATCH 08/23] hurd: Drop x86-specific assembly from init-first.c Date: Wed, 3 Jan 2024 20:14:41 +0300 Message-ID: <20240103171502.1358371-9-bugaevc@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240103171502.1358371-1-bugaevc@gmail.com> References: <20240103171502.1358371-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org We already have the RETURN_TO macro for this exact use case, and it's already used in the non-static code path. Use it here too. Signed-off-by: Sergey Bugaev --- This was the last piece of x86 specifics in init-first.c! (Remember, it started as sysdeps/mach/hurd/i386/init-first.c, with lots of i386-specific assumptions about how arguments are passed and so on.) sysdeps/mach/hurd/x86/init-first.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sysdeps/mach/hurd/x86/init-first.c b/sysdeps/mach/hurd/x86/init-first.c index 6f71d71b..211b2096 100644 --- a/sysdeps/mach/hurd/x86/init-first.c +++ b/sysdeps/mach/hurd/x86/init-first.c @@ -218,15 +218,7 @@ _hurd_stack_setup (void **argptr) void doinit (intptr_t *data) { init ((void **) data); -# ifdef __x86_64__ - asm volatile ("movq %0, %%rsp\n" /* Switch to new outermost stack. */ - "xorq %%rbp, %%rbp\n" /* Clear outermost frame pointer. */ - "jmp *%1" : : "r" (data), "r" (caller)); -# else - asm volatile ("movl %0, %%esp\n" /* Switch to new outermost stack. */ - "xorl %%ebp, %%ebp\n" /* Clear outermost frame pointer. */ - "jmp *%1" : : "r" (data), "r" (caller)); -# endif + RETURN_TO (data, caller, 0); __builtin_unreachable (); }