xnu-4903.241.1.tar.gz

[apple/xnu.git] / osfmk / kern / syscall_sw.h

diff --git a/osfmk/kern/syscall_sw.h b/osfmk/kern/syscall_sw.h
index 57eb9daea7c66f25e64d5a953279ce03089951c2..2816a65fc768d8c080dd3d19ebe54c8830dfaea3 100644 (file)
--- a/osfmk/kern/syscall_sw.h
+++ b/osfmk/kern/syscall_sw.h
@@ -66,47 +66,51 @@
  *     its kernel stack.  Some architectures may need
  *     to save more state in the pcb for these traps.
  */
  *     its kernel stack.  Some architectures may need
  *     to save more state in the pcb for these traps.
  */

-typedef        void    mach_munge_t(const void *, void *);
+#if CONFIG_REQUIRES_U32_MUNGING
+typedef        void    mach_munge_t(void *);
+#elif __arm__ && (__BIGGEST_ALIGNMENT__ > 4)
+typedef        int     mach_munge_t(const void *, void *);
+#endif

 
 typedef struct {
 
 typedef struct {

-       int                     mach_trap_arg_count;
-       int                     (*mach_trap_function)(void);
-#if defined(__i386__)
-       boolean_t               mach_trap_stack;
-#else 
-       mach_munge_t            *mach_trap_arg_munge32; /* system call arguments for 32-bit */
-       mach_munge_t            *mach_trap_arg_munge64; /* system call arguments for 64-bit */
+       int                     mach_trap_arg_count; /* Number of trap arguments (Arch independant) */
+       kern_return_t           (*mach_trap_function)(void *);
+#if CONFIG_REQUIRES_U32_MUNGING || (__arm__ && (__BIGGEST_ALIGNMENT__ > 4))
+       mach_munge_t            *mach_trap_arg_munge32; /* system call argument munger routine for 32-bit */

 #endif
 #endif

-#if    !MACH_ASSERT
-       int                     mach_trap_unused;
-#else
+       int                     mach_trap_u32_words; /* number of 32-bit words to copyin for U32 */
+#if    MACH_ASSERT

        const char*             mach_trap_name;
        const char*             mach_trap_name;

-#endif /* !MACH_ASSERT */
+#endif /* MACH_ASSERT */

 } mach_trap_t;
 
 #define MACH_TRAP_TABLE_COUNT   128
 
 
 } mach_trap_t;
 
 #define MACH_TRAP_TABLE_COUNT   128
 
 

-extern mach_trap_t             mach_trap_table[];
+extern const mach_trap_t       mach_trap_table[];

 extern int                     mach_trap_count;
 
 extern int                     mach_trap_count;
 

-#if defined(__i386__)
+#if CONFIG_REQUIRES_U32_MUNGING || (__arm__ && (__BIGGEST_ALIGNMENT__ > 4))
+

 #if    !MACH_ASSERT
 #if    !MACH_ASSERT

-#define        MACH_TRAP(name, arg_count, munge32, munge64)    \
-               { (arg_count), (int (*)(void)) (name), FALSE, 0 }
-#else
-#define MACH_TRAP(name, arg_count, munge32, munge64)           \
-               { (arg_count), (int (*)(void)) (name), FALSE, #name }
+#define        MACH_TRAP(name, arg_count, u32_arg_words, munge32)      \
+       { (arg_count), (kern_return_t (*)(void *)) (name), munge32, (u32_arg_words)  }
+#else /* !MACH_ASSERT */
+#define        MACH_TRAP(name, arg_count, u32_arg_words, munge32)      \
+       { (arg_count), (kern_return_t (*)(void *)) (name), munge32, (u32_arg_words), #name  }

 #endif /* !MACH_ASSERT */
 #endif /* !MACH_ASSERT */

-#else  /* !defined(__i386__) */
+
+
+#else /* !CONFIG_REQUIRES_U32_MUNGING || (__arm__ && (__BIGGEST_ALIGNMENT__ > 4)) */
+

 #if    !MACH_ASSERT
 #if    !MACH_ASSERT

-#define        MACH_TRAP(name, arg_count, munge32, munge64)    \
-               { (arg_count), (int (*)(void)) (name), (munge32), (munge64), 0 }
-#else
-#define MACH_TRAP(name, arg_count, munge32, munge64)           \
-               { (arg_count), (int (*)(void)) (name), (munge32), (munge64), #name }
+#define        MACH_TRAP(name, arg_count, u32_arg_words, munge32)      \
+       { (arg_count), (kern_return_t (*)(void *)) (name), (u32_arg_words)  }
+#else /* !MACH_ASSERT */
+#define        MACH_TRAP(name, arg_count, u32_arg_words, munge32)      \
+       { (arg_count), (kern_return_t (*)(void *)) (name), (u32_arg_words), #name  }

 #endif /* !MACH_ASSERT */
 
 #endif /* !MACH_ASSERT */
 

-#endif /* !defined(__i386__) */
+#endif /* !CONFIG_REQUIRES_U32_MUNGING */

 
 #endif /* _KERN_SYSCALL_SW_H_ */
 
 #endif /* _KERN_SYSCALL_SW_H_ */