public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Samuel Thibault <sthibaul@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] Move RETURN_TO to x86/sysdep.h and implement x86_64 version. Date: Sun, 5 Feb 2023 11:36:51 +0000 (GMT) [thread overview] Message-ID: <20230205113651.358463858284@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a1dcc64c9b6e54ce1aabcd10785f43bf2b445ee4 commit a1dcc64c9b6e54ce1aabcd10785f43bf2b445ee4 Author: Flavio Cruz <flaviocruz@gmail.com> Date: Sun Feb 5 03:23:25 2023 -0500 Move RETURN_TO to x86/sysdep.h and implement x86_64 version. Message-Id: <Y99nfeBrTubZL9oi@jupiter.tail36e24.ts.net> Diff: --- sysdeps/mach/i386/sysdep.h | 34 ---------------------------------- sysdeps/mach/x86/sysdep.h | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/sysdeps/mach/i386/sysdep.h b/sysdeps/mach/i386/sysdep.h deleted file mode 100644 index 33bd5ee402..0000000000 --- a/sysdeps/mach/i386/sysdep.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 1991-2023 Free Software Foundation, Inc. - - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - -#ifndef _MACH_I386_SYSDEP_H -#define _MACH_I386_SYSDEP_H 1 - -#include <sysdeps/mach/x86/sysdep.h> - -#define RETURN_TO(sp, pc, retval) \ - asm volatile ("movl %0, %%esp; jmp %*%1 # %2" \ - : : "g" (sp), "r" (pc), "a" (retval)) - -/* This should be rearranged, but at the moment this file provides - the most useful definitions for assembler syntax details. */ -#undef ENTRY -#undef ALIGN -#include <sysdeps/unix/i386/sysdep.h> - -#endif /* mach/i386/sysdep.h */ diff --git a/sysdeps/mach/x86/sysdep.h b/sysdeps/mach/x86/sysdep.h index 90f295b27d..7ad785234f 100644 --- a/sysdeps/mach/x86/sysdep.h +++ b/sysdeps/mach/x86/sysdep.h @@ -44,4 +44,21 @@ /* Get the machine-independent Mach definitions. */ #include <sysdeps/mach/sysdep.h> +#undef ENTRY +#undef ALIGN + +#ifdef __x86_64__ +#define RETURN_TO(sp, pc, retval) \ + asm volatile ("movq %0, %%rsp; jmp %*%1 # %2" \ + : : "g" (sp), "r" (pc), "a" (retval)) +/* This should be rearranged, but at the moment this file provides + the most useful definitions for assembler syntax details. */ +#include <sysdeps/unix/x86_64/sysdep.h> +#else +#define RETURN_TO(sp, pc, retval) \ + asm volatile ("movl %0, %%esp; jmp %*%1 # %2" \ + : : "g" (sp), "r" (pc), "a" (retval)) +#include <sysdeps/unix/i386/sysdep.h> +#endif + #endif /* mach/x86/sysdep.h */
reply other threads:[~2023-02-05 11:36 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230205113651.358463858284@sourceware.org \ --to=sthibaul@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).