xnu-2422.100.13.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 879b9cd5c0cf828fc77d9c260dbbac1f96e76732..70d69bfde9aa02203d07f74477cee43f10ca37fa 100644 (file)
--- a/osfmk/kern/syscall_sw.h
+++ b/osfmk/kern/syscall_sw.h
@@ -69,8 +69,12 @@
 typedef        void    mach_munge_t(const void *, void *);
 
 typedef struct {
 typedef        void    mach_munge_t(const void *, void *);
 
 typedef struct {

-       int                     mach_trap_arg_count;
+       int                     mach_trap_arg_count; /* Number of trap arguments (Arch independant) */

        kern_return_t           (*mach_trap_function)(void *);
        kern_return_t           (*mach_trap_function)(void *);

+#if defined(__x86_64__)
+       mach_munge_t            *mach_trap_arg_munge32; /* system call argument munger routine for 32-bit */
+#endif
+       int                     mach_trap_u32_words; /* number of 32-bit words to copyin for U32 */

 #if    MACH_ASSERT
        const char*             mach_trap_name;
 #endif /* MACH_ASSERT */
 #if    MACH_ASSERT
        const char*             mach_trap_name;
 #endif /* MACH_ASSERT */


@@ -82,14 +86,33 @@ typedef struct {
 extern const mach_trap_t       mach_trap_table[];
 extern int                     mach_trap_count;
 
 extern const mach_trap_t       mach_trap_table[];
 extern int                     mach_trap_count;
 

-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
+

 #if    !MACH_ASSERT
 #if    !MACH_ASSERT

-#define        MACH_TRAP(name, arg_count, munge32, munge64)    \
-       { (arg_count), (kern_return_t (*)(void *)) (name)  }
-#else
-#define MACH_TRAP(name, arg_count, munge32, munge64)           \
-       { (arg_count), (kern_return_t (*)(void *)) (name), #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 */

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

 #else  /* !defined(__i386__) && !defined(__x86_64__) && !defined(__arm__) */
 #error Unsupported architecture
 #endif /* !defined(__i386__) && !defined(__x86_64__) && !defined(__arm__) */
 #else  /* !defined(__i386__) && !defined(__x86_64__) && !defined(__arm__) */
 #error Unsupported architecture
 #endif /* !defined(__i386__) && !defined(__x86_64__) && !defined(__arm__) */