X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/316670eb35587141e969394ae8537d66b9211e80..22ba694c5857e62b5a553b1505dcf2e509177f28:/osfmk/kern/syscall_sw.h

diff --git a/osfmk/kern/syscall_sw.h b/osfmk/kern/syscall_sw.h
index 879b9cd5c..70d69bfde 100644
--- 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 {
-	int			mach_trap_arg_count;
+	int			mach_trap_arg_count; /* Number of trap arguments (Arch independant) */
 	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 */
@@ -82,14 +86,33 @@ typedef struct {
 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
-#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 */
+
+
+
+
+#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__) */