From 3a17f757a80816961cd1fbf4664a5cbb02563b2d Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 26 May 2011 20:59:02 -0400 Subject: modernize coding style in sjlj asm --- src/setjmp/x86_64/longjmp.s | 20 ++++++++++---------- src/setjmp/x86_64/setjmp.s | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/setjmp/x86_64') diff --git a/src/setjmp/x86_64/longjmp.s b/src/setjmp/x86_64/longjmp.s index c63b0c95..dd893512 100644 --- a/src/setjmp/x86_64/longjmp.s +++ b/src/setjmp/x86_64/longjmp.s @@ -7,18 +7,18 @@ _longjmp: longjmp: mov %rsi,%rax /* val will be longjmp return */ test %rax,%rax - jnz .L0 + jnz 1f inc %rax /* if val==0, val=1 per longjmp semantics */ -.L0: - movq (%rdi),%rbx /* rdi is the jmp_buf, restore regs from it */ - movq 8(%rdi),%rbp - movq 16(%rdi),%r12 - movq 24(%rdi),%r13 - movq 32(%rdi),%r14 - movq 40(%rdi),%r15 - movq 48(%rdi),%rdx /* this ends up being the stack pointer */ +1: + mov (%rdi),%rbx /* rdi is the jmp_buf, restore regs from it */ + mov 8(%rdi),%rbp + mov 16(%rdi),%r12 + mov 24(%rdi),%r13 + mov 32(%rdi),%r14 + mov 40(%rdi),%r15 + mov 48(%rdi),%rdx /* this ends up being the stack pointer */ mov %rdx,%rsp - movq 56(%rdi),%rdx /* this is the instruction pointer */ + mov 56(%rdi),%rdx /* this is the instruction pointer */ jmp *%rdx /* goto saved address without altering rsp */ .size _longjmp,.-_longjmp .size longjmp,.-longjmp diff --git a/src/setjmp/x86_64/setjmp.s b/src/setjmp/x86_64/setjmp.s index 8f29fa81..faecd353 100644 --- a/src/setjmp/x86_64/setjmp.s +++ b/src/setjmp/x86_64/setjmp.s @@ -14,9 +14,9 @@ setjmp: mov %r13,24(%rdi) mov %r14,32(%rdi) mov %r15,40(%rdi) - leaq 8(%rsp),%rdx /* this is our rsp WITHOUT current ret addr */ + lea 8(%rsp),%rdx /* this is our rsp WITHOUT current ret addr */ mov %rdx,48(%rdi) - movq (%rsp),%rdx /* save return addr ptr for new rip */ + mov (%rsp),%rdx /* save return addr ptr for new rip */ mov %rdx,56(%rdi) xor %rax,%rax /* always return 0 */ ret -- cgit v1.2.1