Use ENTER_KERNEL instead of int $0x80.

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
index 334866d..4d5f8fd 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
@@ -45,7 +45,7 @@ __lll_lock_wait:
 1:
        leal    -1(%eax), %edx  /* account for the preceeded xadd.  */
        movl    $SYS_futex, %eax
 1:
        leal    -1(%eax), %edx  /* account for the preceeded xadd.  */
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        orl     $-1, %eax       /* Load -1.  */
 #ifndef UP
 
        orl     $-1, %eax       /* Load -1.  */
 #ifndef UP


@@ -109,7 +109,7 @@ __lll_unlock_wake:
        xorl    %esi, %esi
        movl    %edx, (%ebx)    /* Stores '$1'.  */
        movl    $SYS_futex, %eax
        xorl    %esi, %esi
        movl    %edx, (%ebx)    /* Stores '$1'.  */
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        popl    %edx
        popl    %ecx
 
        popl    %edx
        popl    %ecx


@@ -136,7 +136,7 @@ __lll_timedwait_tid:
 2:     movl    %esp, %ebx
        xorl    %ecx, %ecx
        movl    $SYS_gettimeofday, %eax
 2:     movl    %esp, %ebx
        xorl    %ecx, %ecx
        movl    $SYS_gettimeofday, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax
 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax


@@ -163,7 +163,7 @@ __lll_timedwait_tid:
        xorl    %ecx, %ecx      /* movl $FUTEX_WAIT, %ecx */
        movl    %ebp, %ebx
        movl    $SYS_futex, %eax
        xorl    %ecx, %ecx      /* movl $FUTEX_WAIT, %ecx */
        movl    %ebp, %ebx
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        movl    %eax, %edx
 
 
        movl    %eax, %edx
 

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevelmutex.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevelmutex.S
index dac8f4a..ccae01b 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevelmutex.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevelmutex.S
@@ -46,7 +46,7 @@ __lll_mutex_lock_wait:
 1:
        leal    1(%eax), %edx   /* account for the preceeded xadd.  */
        movl    $SYS_futex, %eax
 1:
        leal    1(%eax), %edx   /* account for the preceeded xadd.  */
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        movl    $1, %eax
 #ifndef UP
 
        movl    $1, %eax
 #ifndef UP


@@ -94,7 +94,7 @@ __lll_mutex_timedlock_wait:
        movl    %esp, %ebx
        xorl    %ecx, %ecx
        movl    $SYS_gettimeofday, %eax
        movl    %esp, %ebx
        xorl    %ecx, %ecx
        movl    $SYS_gettimeofday, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax
 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax


@@ -118,7 +118,7 @@ __lll_mutex_timedlock_wait:
        xorl    %ecx, %ecx      /* movl $FUTEX_WAIT, %ecx */
        movl    %ebp, %ebx
        movl    $SYS_futex, %eax
        xorl    %ecx, %ecx      /* movl $FUTEX_WAIT, %ecx */
        movl    %ebp, %ebx
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        movl    $1, %esi
 #ifndef UP
 
        movl    $1, %esi
 #ifndef UP


@@ -170,7 +170,7 @@ __lll_mutex_unlock_wake:
        movl    $0, (%ebx)
        movl    $1, %edx        /* Wake one thread.  */
        movl    $SYS_futex, %eax
        movl    $0, (%ebx)
        movl    $1, %edx        /* Wake one thread.  */
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        popl    %edx
        popl    %ecx
 
        popl    %edx
        popl    %ecx

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelcond.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelcond.S
index 9e2b9fe..e8c8d5d 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelcond.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelcond.S
@@ -63,7 +63,7 @@ __lll_cond_wait:
 
 3:     xorl    %ecx, %ecx
        movl    $SYS_futex, %eax
 
 3:     xorl    %ecx, %ecx
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        movl    $1, %eax
        LOCK
 
        movl    $1, %eax
        LOCK


@@ -121,7 +121,7 @@ __lll_cond_timedwait:
 7:     movl    %esp, %ebx
        xorl    %ecx, %ecx
        movl    $SYS_gettimeofday, %eax
 7:     movl    %esp, %ebx
        xorl    %ecx, %ecx
        movl    $SYS_gettimeofday, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax
 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax


@@ -144,7 +144,7 @@ __lll_cond_timedwait:
        xorl    %ecx, %ecx      /* movl $FUTEX_WAIT, %ecx */
        movl    %ebp, %ebx
        movl    $SYS_futex, %eax
        xorl    %ecx, %ecx      /* movl $FUTEX_WAIT, %ecx */
        movl    %ebp, %ebx
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        movl    %eax, %edx
 
 
        movl    %eax, %edx
 


@@ -212,7 +212,7 @@ __lll_cond_wake:
        xorl    %esi, %esi
        movl    %ecx, %edx      /* movl $1, %edx */
        movl    $SYS_futex, %eax
        xorl    %esi, %esi
        movl    %ecx, %edx      /* movl $1, %edx */
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
 3:     LOCK
        decl    cond_lock-cond_nr_wakers(%ebx)
 
 3:     LOCK
        decl    cond_lock-cond_nr_wakers(%ebx)


@@ -260,7 +260,7 @@ __lll_cond_broadcast:
 6:     movl    $FUTEX_WAKE, %ecx
        xorl    %esi, %esi
        movl    $SYS_futex, %eax
 6:     movl    $FUTEX_WAKE, %ecx
        xorl    %esi, %esi
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
 3:     LOCK
        decl    cond_lock-cond_nr_wakers(%ebx)
 
 3:     LOCK
        decl    cond_lock-cond_nr_wakers(%ebx)

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
index 400413d..e79e65b 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
@@ -50,7 +50,7 @@ __lll_lock_wait:
 1:
        leal    -1(%eax), %edx  /* account for the preceeded xadd.  */
        movl    $SYS_futex, %eax
 1:
        leal    -1(%eax), %edx  /* account for the preceeded xadd.  */
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        orl     $-1, %eax       /* Load -1.  */
        LOCK
 
        orl     $-1, %eax       /* Load -1.  */
        LOCK


@@ -104,7 +104,7 @@ __lll_unlock_wake:
        xorl    %esi, %esi
        movl    %edx, (%ebx)    /* Stores '$1'.  */
        movl    $SYS_futex, %eax
        xorl    %esi, %esi
        movl    %edx, (%ebx)    /* Stores '$1'.  */
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        popl    %edx
        popl    %ecx
 
        popl    %edx
        popl    %ecx


@@ -131,7 +131,7 @@ __lll_timedwait_tid:
 2:     movl    %esp, %ebx
        xorl    %ecx, %ecx
        movl    $SYS_gettimeofday, %eax
 2:     movl    %esp, %ebx
        xorl    %ecx, %ecx
        movl    $SYS_gettimeofday, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax
 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax


@@ -158,7 +158,7 @@ __lll_timedwait_tid:
        xorl    %ecx, %ecx      /* movl $FUTEX_WAIT, %ecx */
        movl    %ebp, %ebx
        movl    $SYS_futex, %eax
        xorl    %ecx, %ecx      /* movl $FUTEX_WAIT, %ecx */
        movl    %ebp, %ebx
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        movl    %eax, %edx
 
 
        movl    %eax, %edx
 

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelmutex.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelmutex.S
index a48cd88..e369c65 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelmutex.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelmutex.S
@@ -52,7 +52,7 @@ __lll_mutex_lock_wait:
 1:
        leal    1(%eax), %edx   /* account for the preceeded xadd.  */
        movl    $SYS_futex, %eax
 1:
        leal    1(%eax), %edx   /* account for the preceeded xadd.  */
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        movl    $1, %eax
        LOCK
 
        movl    $1, %eax
        LOCK


@@ -95,7 +95,7 @@ __lll_mutex_timedlock_wait:
        movl    %esp, %ebx
        xorl    %ecx, %ecx
        movl    $SYS_gettimeofday, %eax
        movl    %esp, %ebx
        xorl    %ecx, %ecx
        movl    $SYS_gettimeofday, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax
 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax


@@ -119,7 +119,7 @@ __lll_mutex_timedlock_wait:
        xorl    %ecx, %ecx      /* movl $FUTEX_WAIT, %ecx */
        movl    %ebp, %ebx
        movl    $SYS_futex, %eax
        xorl    %ecx, %ecx      /* movl $FUTEX_WAIT, %ecx */
        movl    %ebp, %ebx
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        movl    $1, %esi
        LOCK
 
        movl    $1, %esi
        LOCK


@@ -166,7 +166,7 @@ __lll_mutex_unlock_wake:
        movl    $0, (%ebx)
        movl    $1, %edx        /* Wake one thread.  */
        movl    $SYS_futex, %eax
        movl    $0, (%ebx)
        movl    $1, %edx        /* Wake one thread.  */
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        popl    %edx
        popl    %ecx
 
        popl    %edx
        popl    %ecx

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrwlock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrwlock.S
index 8d682d9..4e021dc 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrwlock.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrwlock.S
@@ -83,7 +83,7 @@ __pthread_rwlock_rdlock:
 11:    addl    $READERS_WAKEUP-MUTEX, %ebx
        movl    %esi, %ecx      /* movl $FUTEX_WAIT, %ecx */
        movl    $SYS_futex, %eax
 11:    addl    $READERS_WAKEUP-MUTEX, %ebx
        movl    %esi, %ecx      /* movl $FUTEX_WAIT, %ecx */
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        subl    $READERS_WAKEUP-MUTEX, %ebx
 
 
        subl    $READERS_WAKEUP-MUTEX, %ebx
 


@@ -188,7 +188,7 @@ pthread_rwlock_timedrdlock:
        movl    %esp, %ebx
        xorl    %ecx, %ecx
        movl    $SYS_gettimeofday, %eax
        movl    %esp, %ebx
        xorl    %ecx, %ecx
        movl    $SYS_gettimeofday, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax
 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax


@@ -212,7 +212,7 @@ pthread_rwlock_timedrdlock:
        movl    %ecx, %edx
        leal    READERS_WAKEUP(%ebp), %ebx
        movl    $SYS_futex, %eax
        movl    %ecx, %edx
        leal    READERS_WAKEUP(%ebp), %ebx
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

        movl    %eax, %edx
 17:
 
        movl    %eax, %edx
 17:
 


@@ -320,7 +320,7 @@ __pthread_rwlock_wrlock:
 11:    addl    $WRITERS_WAKEUP-MUTEX, %ebx
        movl    %esi, %ecx      /* movl $FUTEX_WAIT, %ecx */
        movl    $SYS_futex, %eax
 11:    addl    $WRITERS_WAKEUP-MUTEX, %ebx
        movl    %esi, %ecx      /* movl $FUTEX_WAIT, %ecx */
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        subl    $WRITERS_WAKEUP-MUTEX, %ebx
 
 
        subl    $WRITERS_WAKEUP-MUTEX, %ebx
 


@@ -415,7 +415,7 @@ pthread_rwlock_timedwrlock:
        movl    %esp, %ebx
        xorl    %ecx, %ecx
        movl    $SYS_gettimeofday, %eax
        movl    %esp, %ebx
        xorl    %ecx, %ecx
        movl    $SYS_gettimeofday, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax
 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax


@@ -439,7 +439,7 @@ pthread_rwlock_timedwrlock:
        movl    %ecx, %edx
        leal    WRITERS_WAKEUP(%ebp), %ebx
        movl    $SYS_futex, %eax
        movl    %ecx, %edx
        leal    WRITERS_WAKEUP(%ebp), %ebx
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

        movl    %eax, %edx
 17:
 
        movl    %eax, %edx
 17:
 


@@ -547,7 +547,7 @@ __pthread_rwlock_unlock:
 0:
 #endif
        movl    $SYS_futex, %eax
 0:
 #endif
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
 6:     LOCK
        decl    MUTEX(%edi)
 
 6:     LOCK
        decl    MUTEX(%edi)

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelsem.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelsem.S
index 18fb16f..bfec6fa 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelsem.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelsem.S
@@ -66,7 +66,7 @@ __new_sem_wait:
        movl    $SYS_futex, %eax
        movl    %esi, %ecx
        movl    %esi, %edx
        movl    $SYS_futex, %eax
        movl    %esi, %ecx
        movl    %esi, %edx

-       int     $0x80
+       ENTER_KERNEL

 
        testl   %eax, %eax
        je      3b
 
        testl   %eax, %eax
        je      3b


@@ -171,7 +171,7 @@ sem_timedwait:
        movl    %esp, %ebx
        movl    %ecx, %edx
        movl    $SYS_gettimeofday, %eax
        movl    %esp, %ebx
        movl    %ecx, %edx
        movl    $SYS_gettimeofday, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax
 
        /* Compute relative timeout.  */
        movl    4(%esp), %eax


@@ -194,7 +194,7 @@ sem_timedwait:
        xorl    %ecx, %ecx
        movl    $SYS_futex, %eax
        xorl    %edx, %edx
        xorl    %ecx, %ecx
        movl    $SYS_futex, %eax
        xorl    %edx, %edx

-       int     $0x80
+       ENTER_KERNEL

 
        testl   %eax, %eax
        je,pt   9f
 
        testl   %eax, %eax
        je,pt   9f


@@ -255,7 +255,7 @@ __new_sem_post:
        movl    $SYS_futex, %eax
        movl    $FUTEX_WAKE, %ecx
        incl    %edx
        movl    $SYS_futex, %eax
        movl    $FUTEX_WAKE, %ecx
        incl    %edx

-       int     $0x80
+       ENTER_KERNEL

 
        testl   %eax, %eax
        js      1f
 
        testl   %eax, %eax
        js      1f

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S
index a385adc..b77c342 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S
@@ -70,7 +70,7 @@ pthread_barrier_wait:
           if the CURR_EVENT memory has meanwhile been changed.  */
 7:     movl    %esi, %ecx              /* movl $FUTEX_WAIT, %ecx */
 8:     movl    $SYS_futex, %eax
           if the CURR_EVENT memory has meanwhile been changed.  */
 7:     movl    %esi, %ecx              /* movl $FUTEX_WAIT, %ecx */
 8:     movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        /* Don't return on spurious wakeups.  The syscall does not change
           any register except %eax so there is no need to reload any of
 
        /* Don't return on spurious wakeups.  The syscall does not change
           any register except %eax so there is no need to reload any of


@@ -95,7 +95,7 @@ pthread_barrier_wait:
        movl    $0x7fffffff, %edx
        movl    $FUTEX_WAKE, %ecx
        movl    $SYS_futex, %eax
        movl    $0x7fffffff, %edx
        movl    $FUTEX_WAKE, %ecx
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        /* Release the mutex.  */
        LOCK
 
        /* Release the mutex.  */
        LOCK

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S b/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S
index 931e38b..f35ae27 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S
@@ -86,7 +86,7 @@ __pthread_once:
        /* Somebody else got here first.  Wait.  */
        movl    %esi, %ecx              /* movl $FUTEX_WAIT, %ecx */
        movl    $SYS_futex, %eax
        /* Somebody else got here first.  Wait.  */
        movl    %esi, %ecx              /* movl $FUTEX_WAIT, %ecx */
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

        jmp     6b
 
 3:     /* Call the initializer function after setting up the
        jmp     6b
 
 3:     /* Call the initializer function after setting up the


@@ -125,7 +125,7 @@ __pthread_once:
        movl    $0x7fffffff, %edx
        movl    $FUTEX_WAKE, %ecx
        movl    $SYS_futex, %eax
        movl    $0x7fffffff, %edx
        movl    $FUTEX_WAKE, %ecx
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
 4:     popl    %esi
        popl    %ebx
 
 4:     popl    %esi
        popl    %ebx


@@ -154,7 +154,7 @@ clear_once_control:
        movl    $0x7fffffff, %edx
        movl    $FUTEX_WAKE, %ecx
        movl    $SYS_futex, %eax
        movl    $0x7fffffff, %edx
        movl    $FUTEX_WAKE, %ecx
        movl    $SYS_futex, %eax

-       int     $0x80
+       ENTER_KERNEL

 
        popl    %ebx
        popl    %esi
 
        popl    %ebx
        popl    %esi