xnu-1699.32.7.tar.gz

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

diff --git a/libsyscall/custom/SYS.h b/libsyscall/custom/SYS.h
index 53039d9e3e728e099a10f37a56153c65d8218a35..a16f358d8ce0c9fc45d66ee5d6520991238fbd53 100644 (file)
--- a/libsyscall/custom/SYS.h
+++ b/libsyscall/custom/SYS.h
@@ -55,60 +55,7 @@
 #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>
@@ -138,14 +85,14 @@ LEAF(_##name, 0)                                   ;\
        BRANCH_EXTERN(cerror)                           ;\
 2:
 
-#if defined(__SYSCALL_I386_ARG_BYTES) && ((__SYSCALL_I386_ARG_BYTES >= 4) && (__SYSCALL_I386_ARG_BYTES <= 20))
+#if defined(__SYSCALL_32BIT_ARG_BYTES) && ((__SYSCALL_32BIT_ARG_BYTES >= 4) && (__SYSCALL_32BIT_ARG_BYTES <= 20))
 #define UNIX_SYSCALL_NONAME(name, nargs)                       \
-       movl    $(SYS_##name | (__SYSCALL_I386_ARG_BYTES << I386_SYSCALL_ARG_BYTES_SHIFT)), %eax                ;\
+       movl    $(SYS_##name | (__SYSCALL_32BIT_ARG_BYTES << I386_SYSCALL_ARG_BYTES_SHIFT)), %eax               ;\
        UNIX_SYSCALL_SYSENTER                                   ;\
        jnb     2f                                              ;\
        BRANCH_EXTERN(cerror)                                   ;\
 2:
-#else /* __SYSCALL_I386_ARG_BYTES < 4 || > 20 */
+#else /* __SYSCALL_32BIT_ARG_BYTES < 4 || > 20 */
 #define UNIX_SYSCALL_NONAME(name, nargs)               \
        .globl  cerror                                  ;\
        movl    $ SYS_##name, %eax                      ;\
@@ -164,11 +111,11 @@ LEAF(_##name, 0)                                  ;\
 2:
 
 #define PSEUDO(pseudo, name, nargs)                    \
-LEAF(_##pseudo, 0)                                     ;\
+LEAF(pseudo, 0)                                        ;\
        UNIX_SYSCALL_NONAME(name, nargs)
 
 #define PSEUDO_INT(pseudo, name, nargs)                        \
-LEAF(_##pseudo, 0)                                     ;\
+LEAF(pseudo, 0)                                        ;\
        UNIX_SYSCALL_INT_NONAME(name, nargs)
 
 #define __SYSCALL(pseudo, name, nargs)                 \
@@ -206,7 +153,7 @@ LEAF(_##name, 0)                                    ;\
 2:
 
 #define PSEUDO(pseudo, name, nargs)                    \
-LEAF(_##pseudo, 0)                                     ;\
+LEAF(pseudo, 0)                                        ;\
        UNIX_SYSCALL_NONAME(name, nargs)
 
 #define __SYSCALL(pseudo, name, nargs)                 \