Skip to content

Commit bc49269

Browse files
author
Yifan Zhu
committed
adjust spacing
1 parent 09c2766 commit bc49269

File tree

2 files changed

+27
-26
lines changed

2 files changed

+27
-26
lines changed

libc/src/setjmp/x86_64/longjmp.cpp

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,19 @@ namespace LIBC_NAMESPACE_DECL {
2121
[[gnu::naked]]
2222
LLVM_LIBC_FUNCTION(void, longjmp, (__jmp_buf * buf, int val)) {
2323
asm(R"(
24-
pushq %%rbp
25-
pushq %%rbx
26-
mov %%rdi, %%rbp
27-
mov %%esi, %%ebx
28-
subq $8, %%rsp
29-
call %P0
30-
addq $8, %%rsp
31-
mov %%ebx, %%esi
32-
mov %%rbp, %%rdi
33-
popq %%rbx
34-
popq %%rbp
35-
)" :: "i"(jmpbuf::verify) : "rax", "rcx", "rdx", "r8", "r9", "r10", "r11");
24+
pushq %%rbp
25+
pushq %%rbx
26+
mov %%rdi, %%rbp
27+
mov %%esi, %%ebx
28+
subq $8, %%rsp
29+
call %P0
30+
addq $8, %%rsp
31+
mov %%ebx, %%esi
32+
mov %%rbp, %%rdi
33+
popq %%rbx
34+
popq %%rbp
35+
)" ::"i"(jmpbuf::verify)
36+
: "rax", "rcx", "rdx", "r8", "r9", "r10", "r11");
3637

3738
register __UINT64_TYPE__ rcx __asm__("rcx");
3839
// Load cookie
@@ -55,13 +56,13 @@ LLVM_LIBC_FUNCTION(void, longjmp, (__jmp_buf * buf, int val)) {
5556
RECOVER(rsp);
5657

5758
asm(R"(
58-
xor %%eax,%%eax
59-
cmp $1,%%esi
60-
adc %%esi,%%eax
61-
mov %c[rip](%%rdi),%%rdx
62-
xor %%rdx, %%rcx
63-
jmp *%%rdx
64-
)" ::[rip] "i"(offsetof(__jmp_buf, rip))
59+
xor %%eax,%%eax
60+
cmp $1,%%esi
61+
adc %%esi,%%eax
62+
mov %c[rip](%%rdi),%%rdx
63+
xor %%rdx, %%rcx
64+
jmp *%%rdx
65+
)" ::[rip] "i"(offsetof(__jmp_buf, rip))
6566
: "rdx");
6667
}
6768

libc/src/setjmp/x86_64/setjmp.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ LLVM_LIBC_FUNCTION(int, setjmp, (__jmp_buf * buf)) {
3939
STORE(r14);
4040
STORE(r15);
4141
asm(R"(
42-
lea 8(%%rsp),%%rdx
43-
xor %%rdx, %%rcx
44-
mov %%rdx,%c[rsp](%%rdi)
45-
mov (%%rsp),%%rdx
46-
xor %%rdx, %%rcx
47-
mov %%rdx,%c[rip](%%rdi)
48-
)" ::[rsp] "i"(offsetof(__jmp_buf, rsp)),
42+
lea 8(%%rsp),%%rdx
43+
xor %%rdx, %%rcx
44+
mov %%rdx,%c[rsp](%%rdi)
45+
mov (%%rsp),%%rdx
46+
xor %%rdx, %%rcx
47+
mov %%rdx,%c[rip](%%rdi)
48+
)" ::[rsp] "i"(offsetof(__jmp_buf, rsp)),
4949
[rip] "i"(offsetof(__jmp_buf, rip))
5050
: "rdx");
5151

0 commit comments

Comments
 (0)