xnu-1228.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..4aab31696a7972bdccff6780e0492384e5670d1d 100644 (file)
--- a/osfmk/kern/syscall_sw.h
+++ b/osfmk/kern/syscall_sw.h
@@ -73,12 +73,16 @@ typedef struct {
        int                     (*mach_trap_function)(void);
 #if defined(__i386__)
        boolean_t               mach_trap_stack;
        int                     (*mach_trap_function)(void);
 #if defined(__i386__)
        boolean_t               mach_trap_stack;

-#else 
+#elif defined(__arm__)
+       /* no space */
+#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 */
 #endif
 #if    !MACH_ASSERT
        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 */
 #endif
 #if    !MACH_ASSERT

+#if !defined(__arm__)

        int                     mach_trap_unused;
        int                     mach_trap_unused;

+#endif

 #else
        const char*             mach_trap_name;
 #endif /* !MACH_ASSERT */
 #else
        const char*             mach_trap_name;
 #endif /* !MACH_ASSERT */


@@ -98,6 +102,14 @@ extern int                  mach_trap_count;
 #define MACH_TRAP(name, arg_count, munge32, munge64)           \
                { (arg_count), (int (*)(void)) (name), FALSE, #name }
 #endif /* !MACH_ASSERT */
 #define MACH_TRAP(name, arg_count, munge32, munge64)           \
                { (arg_count), (int (*)(void)) (name), FALSE, #name }
 #endif /* !MACH_ASSERT */

+#elif defined(__arm__)
+#if    !MACH_ASSERT
+#define        MACH_TRAP(name, arg_count, munge32, munge64)    \
+               { (arg_count), (int (*)(void)) (name) }
+#else
+#define MACH_TRAP(name, arg_count, munge32, munge64)           \
+               { (arg_count), (int (*)(void)) (name), #name }
+#endif /* !MACH_ASSERT */

 #else  /* !defined(__i386__) */
 #if    !MACH_ASSERT
 #define        MACH_TRAP(name, arg_count, munge32, munge64)    \
 #else  /* !defined(__i386__) */
 #if    !MACH_ASSERT
 #define        MACH_TRAP(name, arg_count, munge32, munge64)    \