system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
2002-12-27  Andreas Schwab  <schwab@suse.de>

	* sysdeps/unix/sysv/linux/m68k/socket.S: Add cancellation support.
This commit is contained in:
Andreas Schwab 2002-12-27 22:15:56 +00:00
parent 9f2567656c
commit 4f172c25f1
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2002-12-27 Andreas Schwab <schwab@suse.de>
* sysdeps/unix/sysv/linux/m68k/socket.S: Add cancellation support.
2002-12-27 Jakub Jelinek <jakub@redhat.com> 2002-12-27 Jakub Jelinek <jakub@redhat.com>
* malloc/arena.c (ptmalloc_init): Don't call next_env_entry if * malloc/arena.c (ptmalloc_init): Don't call next_env_entry if

1
linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
View File

@ -37,6 +37,7 @@
.Lpseudo_cancel: \ .Lpseudo_cancel: \
CENABLE; \ CENABLE; \
DOCARGS_##args \ DOCARGS_##args \
move.l %d0, -(%sp); \
move.l &SYS_ify (syscall_name), %d0; \ move.l &SYS_ify (syscall_name), %d0; \
trap &0; \ trap &0; \
move.l %d0, %d2; \ move.l %d0, %d2; \

42
sysdeps/unix/sysv/linux/m68k/socket.S
View File

@ -16,7 +16,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
#include <sysdep.h> #include <sysdep-cancel.h>
#include <socketcall.h> #include <socketcall.h>
#define P(a, b) P2(a, b) #define P(a, b) P2(a, b)
@ -41,6 +41,10 @@
.globl __socket .globl __socket
ENTRY (__socket) ENTRY (__socket)
#if defined NEED_CANCELLATION && defined CENABLE
SINGLE_THREAD_P
jne 1f
#endif
/* Save registers. */ /* Save registers. */
move.l %d2, %a0 move.l %d2, %a0
@ -64,6 +68,42 @@ ENTRY (__socket)
/* Successful; return the syscall's value. */ /* Successful; return the syscall's value. */
rts rts
#if defined NEED_CANCELLATION && defined CENABLE
1: /* Enable asynchronous cancellation. */
CENABLE
/* Save registers. */
move.l %d2, -(%sp)
move.l %d0, -(%sp)
move.l #SYS_ify (socketcall), %d0 /* System call number in %d0. */
/* Use ## so `socket' is a separate token that might be #define'd. */
move.l #P (SOCKOP_,socket), %d1 /* Subcode is first arg to syscall. */
lea 4+8(%sp), %a1 /* Address of args is 2nd arg. */
move.l %a1, %d2
/* Do the system call trap. */
trap #0
/* Restore cancellation. */
move.l %d0, %d2
CDISABLE
addq.l #4, %sp
move.l %d2, %d0
/* Restore registers. */
move.l (%sp)+, %d2
/* %d0 is < 0 if there was an error. */
tst.l %d0
jmi SYSCALL_ERROR_LABEL
/* Successful; return the syscall's value. */
rts
#endif
PSEUDO_END (__socket) PSEUDO_END (__socket)
#ifndef NO_WEAK_ALIAS #ifndef NO_WEAK_ALIAS