public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] hurd: Simplify init-first.c a bit
@ 2023-02-19 23:42 Samuel Thibault
0 siblings, 0 replies; only message in thread
From: Samuel Thibault @ 2023-02-19 23:42 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=90ab316b02d496cfaf09396fcc0c9bc58f15a61c
commit 90ab316b02d496cfaf09396fcc0c9bc58f15a61c
Author: Sergey Bugaev <bugaevc@gmail.com>
Date: Sat Feb 18 23:37:13 2023 +0300
hurd: Simplify init-first.c a bit
And make it a bit more 64-bit ready. This is in preparation to moving this
file into x86/
Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
Message-Id: <20230218203717.373211-6-bugaevc@gmail.com>
Diff:
---
sysdeps/mach/hurd/i386/init-first.c | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c
index 94c946516a..a558da16bc 100644
--- a/sysdeps/mach/hurd/i386/init-first.c
+++ b/sysdeps/mach/hurd/i386/init-first.c
@@ -195,7 +195,7 @@ init (int *data)
/* Call `init1' (above) with the user code as the return address, and the
argument data immediately above that on the stack. */
- int usercode;
+ void *usercode, **ret_address;
void call_init1 (void);
@@ -206,10 +206,11 @@ init (int *data)
recognize that this read operation may alias the following write
operation, and thus is free to reorder the two, clobbering the
original return address. */
- usercode = *((int *) __builtin_frame_address (0) + 1);
+ ret_address = (void **) __builtin_frame_address (0) + 1;
+ usercode = *ret_address;
/* GCC 4.4.6 also wants us to force loading USERCODE already here. */
asm volatile ("# %0" : : "X" (usercode));
- *((void **) __builtin_frame_address (0) + 1) = &call_init1;
+ *ret_address = &call_init1;
/* Force USERCODE into %eax and &init1 into %ecx, which are not
restored by function return. */
asm volatile ("# a %0 c %1" : : "a" (usercode), "c" (&init1));
@@ -223,19 +224,9 @@ init (int *data)
/* The return address of `init' above, was redirected to here, so at
this point our stack is unwound and callers' registers restored.
Only %ecx and %eax are call-clobbered and thus still have the
- values we set just above. Fetch from there the new stack pointer
- we will run on, and jmp to the run-time address of `init1'; when it
- returns, it will run the user code with the argument data at the
- top of the stack. */
-asm ("switch_stacks:\n"
- " movl %eax, %esp\n"
- " jmp *%ecx");
-
-/* As in the stack-switching case, at this point our stack is unwound
- and callers' registers restored, and only %ecx and %eax communicate
- values from the lines above. In this case we have stashed in %eax
- the user code return address. Push it on the top of the stack so
- it acts as init1's return address, and then jump there. */
+ values we set just above. We have stashed in %eax the user code
+ return address. Push it on the top of the stack so it acts as
+ init1's return address, and then jump there. */
asm ("call_init1:\n"
" push %eax\n"
" jmp *%ecx\n");
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-02-19 23:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-19 23:42 [glibc] hurd: Simplify init-first.c a bit Samuel Thibault
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).