From: Flavio Cruz <flaviocruz@gmail.com>
To: bug-hurd@gnu.org, libc-alpha@sourceware.org
Subject: [PATCH glibc] Define PC, SP and SYSRETURN for hurd x86_64
Date: Wed, 15 Feb 2023 01:16:38 -0500 [thread overview]
Message-ID: <Y+x4xrsDMkAomncO@jupiter.tail36e24.ts.net> (raw)
Moved thread_state.h to x86 directory since we only need to customize
those 3 definitions.
---
sysdeps/mach/{i386 => x86}/thread_state.h | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
rename sysdeps/mach/{i386 => x86}/thread_state.h (90%)
diff --git a/sysdeps/mach/i386/thread_state.h b/sysdeps/mach/x86/thread_state.h
similarity index 90%
rename from sysdeps/mach/i386/thread_state.h
rename to sysdeps/mach/x86/thread_state.h
index 4e6ce1f7dd..5be0bec150 100644
--- a/sysdeps/mach/i386/thread_state.h
+++ b/sysdeps/mach/x86/thread_state.h
@@ -16,8 +16,8 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#ifndef _MACH_I386_THREAD_STATE_H
-#define _MACH_I386_THREAD_STATE_H 1
+#ifndef _MACH_X86_THREAD_STATE_H
+#define _MACH_X86_THREAD_STATE_H 1
#include <mach/machine/thread_status.h>
@@ -29,9 +29,15 @@
#define machine_thread_state i386_thread_state
+#ifdef __x86_64__
+#define PC rip
+#define SP ursp
+#define SYSRETURN rax
+#else
#define PC eip
#define SP uesp
#define SYSRETURN eax
+#endif
#define MACHINE_THREAD_STATE_FIX_NEW(ts) do { \
asm ("mov %%cs, %w0" : "=q" ((ts)->cs)); \
@@ -50,4 +56,4 @@ struct machine_thread_all_state
#include <sysdeps/mach/thread_state.h>
-#endif /* mach/i386/thread_state.h */
+#endif /* mach/x86/thread_state.h */
--
2.39.1
next reply other threads:[~2023-02-15 6:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-15 6:16 Flavio Cruz [this message]
2023-02-15 6:42 ` Sergey Bugaev
2023-02-20 0:33 ` Samuel Thibault
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=Y+x4xrsDMkAomncO@jupiter.tail36e24.ts.net \
--to=flaviocruz@gmail.com \
--cc=bug-hurd@gnu.org \
--cc=libc-alpha@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: link
Be 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).