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/i386/longjmp.s | 26 +++++++++++++------------- src/setjmp/i386/setjmp.s | 20 ++++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src/setjmp/i386') diff --git a/src/setjmp/i386/longjmp.s b/src/setjmp/i386/longjmp.s index c1a956c3..249d7b4d 100644 --- a/src/setjmp/i386/longjmp.s +++ b/src/setjmp/i386/longjmp.s @@ -4,19 +4,19 @@ .type longjmp,%function _longjmp: longjmp: - movl 4(%esp),%edx - movl 8(%esp),%eax - testl %eax,%eax - jnz .L0 - incl %eax -.L0: - movl (%edx),%ebx - movl 4(%edx),%esi - movl 8(%edx),%edi - movl 12(%edx),%ebp - movl 16(%edx),%ecx - movl %ecx,%esp - movl 20(%edx),%ecx + mov 4(%esp),%edx + mov 8(%esp),%eax + test %eax,%eax + jnz 1f + inc %eax +1: + mov (%edx),%ebx + mov 4(%edx),%esi + mov 8(%edx),%edi + mov 12(%edx),%ebp + mov 16(%edx),%ecx + mov %ecx,%esp + mov 20(%edx),%ecx jmp *%ecx .size _longjmp,.-_longjmp .size longjmp,.-longjmp diff --git a/src/setjmp/i386/setjmp.s b/src/setjmp/i386/setjmp.s index 6c078b10..89e614fa 100644 --- a/src/setjmp/i386/setjmp.s +++ b/src/setjmp/i386/setjmp.s @@ -7,16 +7,16 @@ __setjmp: _setjmp: setjmp: - movl 4(%esp), %eax - movl %ebx, (%eax) - movl %esi, 4(%eax) - movl %edi, 8(%eax) - movl %ebp, 12(%eax) - leal 4(%esp), %ecx - movl %ecx, 16(%eax) - movl (%esp), %ecx - movl %ecx, 20(%eax) - xorl %eax, %eax + mov 4(%esp), %eax + mov %ebx, (%eax) + mov %esi, 4(%eax) + mov %edi, 8(%eax) + mov %ebp, 12(%eax) + lea 4(%esp), %ecx + mov %ecx, 16(%eax) + mov (%esp), %ecx + mov %ecx, 20(%eax) + xor %eax, %eax ret .size __setjmp,.-__setjmp .size _setjmp,.-_setjmp -- cgit v1.2.1