From: Sergey Bugaev <bugaevc@gmail.com>
To: libc-alpha@sourceware.org, bug-hurd@gnu.org
Subject: [PATCH 02/10] mach: Define MACHINE_THREAD_STATE_SETUP_CALL
Date: Wed, 17 May 2023 22:14:28 +0300 [thread overview]
Message-ID: <20230517191436.73636-3-bugaevc@gmail.com> (raw)
In-Reply-To: <20230517191436.73636-1-bugaevc@gmail.com>
The existing two macros, MACHINE_THREAD_STATE_SET_PC and
MACHINE_THREAD_STATE_SET_SP, can be used to set program counter and the
stack pointer registers in a machine-specific thread state structure.
Useful as it is, this may not be enough to set up the thread to make a
function call, because the machine-specific ABI may impose additional
requirements. In particular, x86_64 ABI requires that upon function
entry, the stack pointer is 8 less than 16-byte aligned (sp & 15 == 8).
To deal with this, introduce a new macro,
MACHINE_THREAD_STATE_SETUP_CALL (), which sets both stack and
instruction pointers, and also applies any machine-specific requirements
to make a valid function call. The default implementation simply
forwards to MACHINE_THREAD_STATE_SET_PC and MACHINE_THREAD_STATE_SET_SP,
but on x86_64 we additionally align the stack pointer.
Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
---
Any ideas for a better name than PTR_ALIGN_DOWN_8_16?
sysdeps/mach/thread_state.h | 9 +++++++++
sysdeps/mach/x86/thread_state.h | 13 +++++++++++++
2 files changed, 22 insertions(+)
diff --git a/sysdeps/mach/thread_state.h b/sysdeps/mach/thread_state.h
index 9fa3d4e1..431aaf82 100644
--- a/sysdeps/mach/thread_state.h
+++ b/sysdeps/mach/thread_state.h
@@ -38,6 +38,15 @@
#endif
#endif
+/* Set up the thread state to call the given function on the given state.
+ Dependning on architecture, this may imply more than just setting PC
+ and SP. */
+#ifndef MACHINE_THREAD_STATE_SETUP_CALL
+#define MACHINE_THREAD_STATE_SETUP_CALL(ts, stack, size, func) \
+ (MACHINE_THREAD_STATE_SET_PC (ts, func), \
+ MACHINE_THREAD_STATE_SET_SP (ts, stack, size))
+#endif
+
/* This copies architecture-specific bits from the current thread to the new
thread state. */
#ifndef MACHINE_THREAD_STATE_FIX_NEW
diff --git a/sysdeps/mach/x86/thread_state.h b/sysdeps/mach/x86/thread_state.h
index 5be0bec1..8c419515 100644
--- a/sysdeps/mach/x86/thread_state.h
+++ b/sysdeps/mach/x86/thread_state.h
@@ -20,6 +20,7 @@
#define _MACH_X86_THREAD_STATE_H 1
#include <mach/machine/thread_status.h>
+#include <libc-pointer-arith.h>
/* This lets the kernel define segments for a new thread. */
#define MACHINE_NEW_THREAD_STATE_FLAVOR i386_THREAD_STATE
@@ -54,6 +55,18 @@ struct machine_thread_all_state
struct i386_float_state fpu;
};
+#ifdef __x86_64__
+/* We're setting up the stack to perform a function call. On function entry,
+ the stack pointer must be 8 bytes less than 16-aligned. */
+#define PTR_ALIGN_DOWN_8_16(ptr) \
+ ({ uintptr_t __ptr = PTR_ALIGN_DOWN (ptr, 8); \
+ PTR_IS_ALIGNED (__ptr, 16) ? (__ptr - 8) : __ptr; })
+
+#define MACHINE_THREAD_STATE_SETUP_CALL(ts, stack, size, func) \
+ ((ts)->SP = PTR_ALIGN_DOWN_8_16 ((uintptr_t) (stack) + (size)), \
+ (ts)->PC = (uintptr_t) func)
+#endif
+
#include <sysdeps/mach/thread_state.h>
#endif /* mach/x86/thread_state.h */
--
2.40.1
next prev parent reply other threads:[~2023-05-17 19:14 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-17 19:14 [PATCH 00/10] Stack setup & misc fixes for x86_64-gnu Sergey Bugaev
2023-05-17 19:14 ` [PATCH 01/10] Remove sysdeps/generic/thread_state.h Sergey Bugaev
2023-05-17 20:50 ` Samuel Thibault
2023-05-17 19:14 ` Sergey Bugaev [this message]
2023-05-17 20:52 ` [PATCH 02/10] mach: Define MACHINE_THREAD_STATE_SETUP_CALL Samuel Thibault
2023-05-17 19:14 ` [PATCH 03/10] hurd: Use MACHINE_THREAD_STATE_SETUP_CALL Sergey Bugaev
2023-05-17 20:52 ` [PATCH 03/10] hurd: Use MACHINE_THREAD_STATE_SETUP_CALLo Samuel Thibault
2023-05-17 19:14 ` [PATCH 04/10] mach: Add __mach_setup_thread_call () Sergey Bugaev
2023-05-17 20:56 ` Samuel Thibault
2023-05-17 19:14 ` [PATCH 05/10] hurd: Use " Sergey Bugaev
2023-05-17 20:57 ` Samuel Thibault
2023-05-17 19:14 ` [RFC PATCH 06/10] hurd: Make sure to not use tcb->self Sergey Bugaev
2023-05-17 20:59 ` Samuel Thibault
2023-05-18 18:55 ` Joseph Myers
2023-05-18 19:33 ` Sergey Bugaev
2023-05-18 20:16 ` Joseph Myers
2023-05-18 23:47 ` Samuel Thibault
2023-05-19 8:22 ` Sergey Bugaev
2023-05-19 9:39 ` Florian Weimer
2023-05-19 16:50 ` Joseph Myers
2023-05-19 14:47 ` [PATCH] hurd: Fix using interposable hurd_thread_self Sergey Bugaev
2023-05-19 18:57 ` Samuel Thibault
2023-05-17 19:14 ` [PATCH 07/10] hurd: Fix x86_64 _hurd_tls_fork Sergey Bugaev
2023-05-17 21:01 ` Samuel Thibault
2023-05-17 19:14 ` [PATCH 08/10] hurd: Fix setting up pthreads Sergey Bugaev
2023-05-17 21:02 ` Samuel Thibault
2023-05-17 19:14 ` [PATCH 09/10] hurd: Also make it possible to call strlen very early Sergey Bugaev
2023-05-17 21:04 ` Samuel Thibault
2023-05-17 19:14 ` [RFC PATCH 10/10] hurd: Regenerate errno.h Sergey Bugaev
2023-05-17 19:39 ` Joseph Myers
2023-05-17 21:04 ` 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=20230517191436.73636-3-bugaevc@gmail.com \
--to=bugaevc@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).