xnu-792.25.20.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 c8b3d31bd2a603b0fb7282633b6a4e38a4f4d071..72a8afad0c27cfbd864a1bfc81435307edf7ac03 100644 (file)
--- a/osfmk/kern/syscall_sw.h
+++ b/osfmk/kern/syscall_sw.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -60,28 +60,47 @@
  *     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 *);

 
 typedef struct {
        int                     mach_trap_arg_count;
        int                     (*mach_trap_function)(void);
 
 typedef struct {
        int                     mach_trap_arg_count;
        int                     (*mach_trap_function)(void);

-       boolean_t       mach_trap_stack;
+#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 */
+#endif

 #if    !MACH_ASSERT
        int                     mach_trap_unused;
 #else
 #if    !MACH_ASSERT
        int                     mach_trap_unused;
 #else

-       char*           mach_trap_name;
+       const char*             mach_trap_name;

 #endif /* !MACH_ASSERT */
 } mach_trap_t;
 
 #endif /* !MACH_ASSERT */
 } mach_trap_t;
 

+#define MACH_TRAP_TABLE_COUNT   128
+
+

 extern mach_trap_t             mach_trap_table[];
 extern mach_trap_t             mach_trap_table[];

-extern int                             mach_trap_count;
-extern kern_return_t   kern_invalid(void);
+extern int                     mach_trap_count;

 
 

+#if defined(__i386__)

 #if    !MACH_ASSERT
 #if    !MACH_ASSERT

-#define        MACH_TRAP(name, arg_count)                      \
+#define        MACH_TRAP(name, arg_count, munge32, munge64)    \

                { (arg_count), (int (*)(void)) (name), FALSE, 0 }
 #else
                { (arg_count), (int (*)(void)) (name), FALSE, 0 }
 #else

-#define MACH_TRAP(name, arg_count)                     \
+#define MACH_TRAP(name, arg_count, munge32, munge64)           \

                { (arg_count), (int (*)(void)) (name), FALSE, #name }
 #endif /* !MACH_ASSERT */
                { (arg_count), (int (*)(void)) (name), FALSE, #name }
 #endif /* !MACH_ASSERT */

+#else  /* !defined(__i386__) */
+#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 }
+#endif /* !MACH_ASSERT */
+
+#endif /* !defined(__i386__) */

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