diff options
| author | Jean-Baptiste Boric <jblbeurope@gmail.com> | 2021-08-25 17:10:08 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-08-26 00:54:23 +0200 |
| commit | 295e89af04c816ebf632672ab23bc5a36994f4f2 (patch) | |
| tree | 0fd18ae473ed77027cd677f19d36ebb96536f98b /Userland | |
| parent | c87aa6d908c8a4c3572d10c984f13a7191150113 (diff) | |
| download | serenity-295e89af04c816ebf632672ab23bc5a36994f4f2.zip | |
LibC: Fix sigsetjmp on x86_64
Registers were clobbered, offset values into __jmp_buf were wrong...
Diffstat (limited to 'Userland')
| -rw-r--r-- | Userland/Libraries/LibC/arch/x86_64/setjmp.S | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Userland/Libraries/LibC/arch/x86_64/setjmp.S b/Userland/Libraries/LibC/arch/x86_64/setjmp.S index 42a2f97764..57e401d2d0 100644 --- a/Userland/Libraries/LibC/arch/x86_64/setjmp.S +++ b/Userland/Libraries/LibC/arch/x86_64/setjmp.S @@ -16,17 +16,20 @@ setjmp: .global sigsetjmp sigsetjmp: - mov %esi, 60(%rdi) // Store val into did_save_signal_mask - movl $0, 64(%rdi) // Clear saved_signal_mask + mov %esi, 64(%rdi) // Store val into did_save_signal_mask + movl $0, 68(%rdi) // Clear saved_signal_mask test %esi, %esi jz .Lsaveregs - mov %rdi, %r12 // Preserve sigjmp_buf argument - mov $0, %rdi // Set argument how + push %rbp // Prepare ABI-compliant call to sigprocmask + mov %rsp, %rbp + push %rdi + lea 68(%rdi), %rdx // Set argument oldset mov $0, %rsi // Set argument set - lea 64(%rdi), %rdx // Set argument oldset + mov $0, %rdi // Set argument how call sigprocmask@plt - mov %r12, %rdi // Restore sigjmp_buf argument + pop %rdi + pop %rbp .Lsaveregs: mov %rbx, (0 * 8)(%rdi) // Save registers |