xnu-3248.60.10.tar.gz

[apple/xnu.git] / libsyscall / custom / SYS.h

diff --git a/libsyscall/custom/SYS.h b/libsyscall/custom/SYS.h
index 53039d9e3e728e099a10f37a56153c65d8218a35..46e3735d9fb5ae74449d0edb9e83c1ae9df125ca 100644 (file)
--- a/libsyscall/custom/SYS.h
+++ b/libsyscall/custom/SYS.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 1999-2007 Apple Inc. All rights reserved.
+ * Copyright (c) 1999-2011 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -48,6 +48,8 @@
 
 #include <sys/syscall.h>
 
 
 #include <sys/syscall.h>
 

+/* Binary compatibility stubs for syscalls that no longer exist */
+

 #ifndef SYS_setquota
 #define SYS_setquota   148
 #endif
 #ifndef SYS_setquota
 #define SYS_setquota   148
 #endif


@@ -55,60 +57,7 @@
 #define SYS_quota      149
 #endif
 
 #define SYS_quota      149
 #endif
 

-#if defined(__ppc__) || defined(__ppc64__)
-
-#include <architecture/ppc/mode_independent_asm.h>
-
-/* From rhapsody kernel mach/ppc/syscall_sw.h */
-#define        kernel_trap_args_0
-#define        kernel_trap_args_1
-#define        kernel_trap_args_2
-#define        kernel_trap_args_3
-#define        kernel_trap_args_4
-#define        kernel_trap_args_5
-#define        kernel_trap_args_6
-#define        kernel_trap_args_7
-#define        kernel_trap_args_8
-/* End of rhapsody kernel mach/ppc/syscall_sw.h */
-
-/*
- * Macros.
- */
-
-#define        SYSCALL(name, nargs)                    \
-       .globl  cerror                          @\
-    MI_ENTRY_POINT(_##name)     @\
-       kernel_trap_args_##nargs    @\
-       li      r0,SYS_##name                   @\
-       sc                          @\
-       b       1f                      @\
-       blr                         @\
-1:     MI_BRANCH_EXTERNAL(cerror)
-
-
-#define        SYSCALL_NONAME(name, nargs)             \
-       .globl  cerror                          @\
-       kernel_trap_args_##nargs    @\
-       li      r0,SYS_##name                   @\
-       sc                          @\
-       b       1f                      @\
-       b       2f                      @\
-1:     MI_BRANCH_EXTERNAL(cerror)  @\
-2:
-
-
-#define        PSEUDO(pseudo, name, nargs)             \
-    .private_extern  _##pseudo           @\
-    .text                       @\
-    .align  2                   @\
-_##pseudo:                      @\
-       SYSCALL_NONAME(name, nargs)
-
-#define __SYSCALL(pseudo, name, nargs) \
-    PSEUDO(pseudo, name, nargs)        @\
-    blr
-
-#elif defined(__i386__)
+#if defined(__i386__)

 
 #include <architecture/i386/asm_help.h>
 #include <mach/i386/syscall_sw.h>
 
 #include <architecture/i386/asm_help.h>
 #include <mach/i386/syscall_sw.h>


@@ -121,58 +70,61 @@ _##pseudo:                      @\
 
 #define UNIX_SYSCALL_SYSENTER          call __sysenter_trap
 #define UNIX_SYSCALL(name, nargs)                      \
 
 #define UNIX_SYSCALL_SYSENTER          call __sysenter_trap
 #define UNIX_SYSCALL(name, nargs)                      \

-       .globl  cerror                                  ;\
+       .globl  tramp_cerror                            ;\

 LEAF(_##name, 0)                                       ;\
        movl    $ SYS_##name, %eax                      ;\
        UNIX_SYSCALL_SYSENTER                           ;\
        jnb     2f                                      ;\
 LEAF(_##name, 0)                                       ;\
        movl    $ SYS_##name, %eax                      ;\
        UNIX_SYSCALL_SYSENTER                           ;\
        jnb     2f                                      ;\

-       BRANCH_EXTERN(cerror)                           ;\
+       BRANCH_EXTERN(tramp_cerror)                     ;\

 2:
 
 #define UNIX_SYSCALL_INT(name, nargs)                  \
 2:
 
 #define UNIX_SYSCALL_INT(name, nargs)                  \

-       .globl  cerror                                  ;\
+       .globl  tramp_cerror                            ;\

 LEAF(_##name, 0)                                       ;\
        movl    $ SYS_##name, %eax                      ;\
        UNIX_SYSCALL_TRAP                               ;\
        jnb     2f                                      ;\
 LEAF(_##name, 0)                                       ;\
        movl    $ SYS_##name, %eax                      ;\
        UNIX_SYSCALL_TRAP                               ;\
        jnb     2f                                      ;\

-       BRANCH_EXTERN(cerror)                           ;\
+       BRANCH_EXTERN(tramp_cerror)                     ;\

 2:
 
 2:
 

-#if defined(__SYSCALL_I386_ARG_BYTES) && ((__SYSCALL_I386_ARG_BYTES >= 4) && (__SYSCALL_I386_ARG_BYTES <= 20))
-#define UNIX_SYSCALL_NONAME(name, nargs)                       \
-       movl    $(SYS_##name | (__SYSCALL_I386_ARG_BYTES << I386_SYSCALL_ARG_BYTES_SHIFT)), %eax                ;\
+#if defined(__SYSCALL_32BIT_ARG_BYTES) && ((__SYSCALL_32BIT_ARG_BYTES >= 4) && (__SYSCALL_32BIT_ARG_BYTES <= 20))
+#define UNIX_SYSCALL_NONAME(name, nargs, cerror)                       \
+       movl    $(SYS_##name | (__SYSCALL_32BIT_ARG_BYTES << I386_SYSCALL_ARG_BYTES_SHIFT)), %eax               ;\

        UNIX_SYSCALL_SYSENTER                                   ;\
        jnb     2f                                              ;\
        UNIX_SYSCALL_SYSENTER                                   ;\
        jnb     2f                                              ;\

-       BRANCH_EXTERN(cerror)                                   ;\
+       BRANCH_EXTERN(tramp_##cerror)                           ;\

 2:
 2:

-#else /* __SYSCALL_I386_ARG_BYTES < 4 || > 20 */
-#define UNIX_SYSCALL_NONAME(name, nargs)               \
-       .globl  cerror                                  ;\
+#else /* __SYSCALL_32BIT_ARG_BYTES < 4 || > 20 */
+#define UNIX_SYSCALL_NONAME(name, nargs, cerror)       \

        movl    $ SYS_##name, %eax                      ;\
        UNIX_SYSCALL_SYSENTER                           ;\
        jnb     2f                                      ;\
        movl    $ SYS_##name, %eax                      ;\
        UNIX_SYSCALL_SYSENTER                           ;\
        jnb     2f                                      ;\

-       BRANCH_EXTERN(cerror)                           ;\
+       BRANCH_EXTERN(tramp_##cerror)                   ;\

 2:
 #endif
 
 #define UNIX_SYSCALL_INT_NONAME(name, nargs)           \
 2:
 #endif
 
 #define UNIX_SYSCALL_INT_NONAME(name, nargs)           \

-       .globl  cerror                                  ;\
+       .globl  tramp_cerror_nocancel                   ;\

        movl    $ SYS_##name, %eax                      ;\
        UNIX_SYSCALL_TRAP                               ;\
        jnb     2f                                      ;\
        movl    $ SYS_##name, %eax                      ;\
        UNIX_SYSCALL_TRAP                               ;\
        jnb     2f                                      ;\

-       BRANCH_EXTERN(cerror)                           ;\
+       BRANCH_EXTERN(tramp_cerror_nocancel)            ;\

 2:
 
 2:
 

-#define PSEUDO(pseudo, name, nargs)                    \
-LEAF(_##pseudo, 0)                                     ;\
-       UNIX_SYSCALL_NONAME(name, nargs)
+#define PSEUDO(pseudo, name, nargs, cerror)    \
+LEAF(pseudo, 0)                                        ;\
+       UNIX_SYSCALL_NONAME(name, nargs, cerror)

 
 

-#define PSEUDO_INT(pseudo, name, nargs)                        \
-LEAF(_##pseudo, 0)                                     ;\
+#define PSEUDO_INT(pseudo, name, nargs)                \
+LEAF(pseudo, 0)                                        ;\

        UNIX_SYSCALL_INT_NONAME(name, nargs)
 
        UNIX_SYSCALL_INT_NONAME(name, nargs)
 

+#define __SYSCALL2(pseudo, name, nargs, cerror)                        \
+       PSEUDO(pseudo, name, nargs, cerror)                     ;\
+       ret
+

 #define __SYSCALL(pseudo, name, nargs)                 \
 #define __SYSCALL(pseudo, name, nargs)                 \

-       PSEUDO(pseudo, name, nargs)                     ;\
+       PSEUDO(pseudo, name, nargs, cerror)             ;\

        ret
 
 #define __SYSCALL_INT(pseudo, name, nargs)             \
        ret
 
 #define __SYSCALL_INT(pseudo, name, nargs)             \


@@ -188,31 +140,38 @@ LEAF(_##pseudo, 0)                                        ;\
        movq    %rcx, %r10              ;\
        syscall
 
        movq    %rcx, %r10              ;\
        syscall
 

-#define UNIX_SYSCALL(name, nargs)                      \
-       .globl  cerror                                  ;\
-LEAF(_##name, 0)                                       ;\
-       movl    $ SYSCALL_CONSTRUCT_UNIX(SYS_##name), %eax      ;\
-       UNIX_SYSCALL_SYSCALL                            ;\
-       jnb     2f                                      ;\
-       BRANCH_EXTERN(cerror)                           ;\
+#define UNIX_SYSCALL(name, nargs)                                               \
+       .globl  cerror                                                          ;\
+LEAF(_##name, 0)                                                               ;\
+       movl    $ SYSCALL_CONSTRUCT_UNIX(SYS_##name), %eax                      ;\
+       UNIX_SYSCALL_SYSCALL                                                    ;\
+       jnb             2f                                                      ;\
+       movq    %rax, %rdi                                                      ;\
+       BRANCH_EXTERN(_cerror)                                                  ;\

 2:
 
 2:
 

-#define UNIX_SYSCALL_NONAME(name, nargs)               \
-       .globl  cerror                                  ;\
-       movl    $ SYSCALL_CONSTRUCT_UNIX(SYS_##name), %eax      ;\
-       UNIX_SYSCALL_SYSCALL                            ;\
-       jnb     2f                                      ;\
-       BRANCH_EXTERN(cerror)                           ;\
+#define UNIX_SYSCALL_NONAME(name, nargs, cerror)                \
+       .globl  cerror                                                          ;\
+       movl    $ SYSCALL_CONSTRUCT_UNIX(SYS_##name), %eax                      ;\
+       UNIX_SYSCALL_SYSCALL                                                    ;\
+       jnb             2f                                                      ;\
+       movq    %rax, %rdi                                                      ;\
+       BRANCH_EXTERN(_##cerror)                                                ;\

 2:
 
 2:
 

-#define PSEUDO(pseudo, name, nargs)                    \
-LEAF(_##pseudo, 0)                                     ;\
-       UNIX_SYSCALL_NONAME(name, nargs)
+#define PSEUDO(pseudo, name, nargs, cerror)                    \
+LEAF(pseudo, 0)                                        ;\
+       UNIX_SYSCALL_NONAME(name, nargs, cerror)
+
+#define __SYSCALL2(pseudo, name, nargs, cerror) \
+       PSEUDO(pseudo, name, nargs, cerror)                     ;\
+       ret

 
 #define __SYSCALL(pseudo, name, nargs)                 \
 
 #define __SYSCALL(pseudo, name, nargs)                 \

-       PSEUDO(pseudo, name, nargs)                     ;\
+       PSEUDO(pseudo, name, nargs, cerror)                     ;\

        ret
 
 #else
 #error Unsupported architecture
 #endif
        ret
 
 #else
 #error Unsupported architecture
 #endif

+