xnu-1699.24.23.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 21513dc5848e9a041cc9f241e5647f4083fd2731..d186546d580435555241f50155a66daebebf1ca5 100644 (file)
--- a/osfmk/kern/syscall_sw.h
+++ b/osfmk/kern/syscall_sw.h
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -66,17 +71,13 @@ typedef     void    mach_munge_t(const void *, void *);
 typedef struct {
        int                     mach_trap_arg_count;
        int                     (*mach_trap_function)(void);
-#if defined(__i386__)
-       boolean_t               mach_trap_stack;
-#else 
+#if 0 /* no active architectures use mungers for mach traps */
        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
        const char*             mach_trap_name;
-#endif /* !MACH_ASSERT */
+#endif /* MACH_ASSERT */
 } mach_trap_t;
 
 #define MACH_TRAP_TABLE_COUNT   128
@@ -85,23 +86,16 @@ typedef struct {
 extern mach_trap_t             mach_trap_table[];
 extern int                     mach_trap_count;
 
-#if defined(__i386__)
-#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 }
-#endif /* !MACH_ASSERT */
-#else  /* !defined(__i386__) */
+#if defined(__i386__) || defined(__x86_64__)
 #if    !MACH_ASSERT
 #define        MACH_TRAP(name, arg_count, munge32, munge64)    \
-               { (arg_count), (int (*)(void)) (name), (munge32), (munge64), 0 }
+               { (arg_count), (int (*)(void)) (name)  }
 #else
 #define MACH_TRAP(name, arg_count, munge32, munge64)           \
-               { (arg_count), (int (*)(void)) (name), (munge32), (munge64), #name }
+               { (arg_count), (int (*)(void)) (name), #name }
 #endif /* !MACH_ASSERT */
-
-#endif /* !defined(__i386__) */
+#else  /* !defined(__i386__) && !defined(__x86_64__) && !defined(__arm__) */
+#error Unsupported architecture
+#endif /* !defined(__i386__) && !defined(__x86_64__) && !defined(__arm__) */
 
 #endif /* _KERN_SYSCALL_SW_H_ */