X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/6d2010ae8f7a6078e10b361c6962983bab233e0f..143464d58d2bd6378e74eec636961ceb0d32fb91:/osfmk/i386/bsd_i386.c

diff --git a/osfmk/i386/bsd_i386.c b/osfmk/i386/bsd_i386.c
index 57b222a14..147951308 100644
--- a/osfmk/i386/bsd_i386.c
+++ b/osfmk/i386/bsd_i386.c
@@ -71,6 +71,7 @@
 
 #ifdef MACH_BSD
 extern void	mach_kauth_cred_uthread_update(void);
+extern void throttle_lowpri_io(int);
 #endif
 
 void * find_user_regs(thread_t);
@@ -81,8 +82,6 @@ unsigned int get_msr_nbits(void);
 
 unsigned int get_msr_rbits(void);
 
-extern void throttle_lowpri_io(int);
-
 /*
  * thread_userstack:
  *
@@ -146,6 +145,24 @@ thread_userstack(
 	return (KERN_SUCCESS);
 }
 
+/*
+ * thread_userstackdefault:
+ *
+ * Return the default stack location for the
+ * thread, if otherwise unknown.
+ */
+kern_return_t
+thread_userstackdefault(
+	thread_t thread,
+	mach_vm_offset_t *default_user_stack)
+{
+	if (thread_is_64bit(thread)) {
+		*default_user_stack = VM_USRSTACK64;
+	} else {
+		*default_user_stack = VM_USRSTACK32;
+	}
+	return (KERN_SUCCESS);
+}
 
 kern_return_t
 thread_entrypoint(
@@ -229,7 +246,7 @@ machdep_syscall(x86_saved_state_t *state)
 	int			args[machdep_call_count];
 	int			trapno;
 	int			nargs;
-	machdep_call_t		*entry;
+	const machdep_call_t	*entry;
 	x86_saved_state32_t	*regs;
 
 	assert(is_saved_state32(state));
@@ -300,7 +317,7 @@ machdep_syscall(x86_saved_state_t *state)
 
 	DEBUG_KPRINT_SYSCALL_MDEP("machdep_syscall: retval=%u\n", regs->eax);
 
-	throttle_lowpri_io(TRUE);
+	throttle_lowpri_io(1);
 
 	thread_exception_return();
 	/* NOTREACHED */
@@ -311,7 +328,7 @@ void
 machdep_syscall64(x86_saved_state_t *state)
 {
 	int			trapno;
-	machdep_call_t		*entry;
+	const machdep_call_t	*entry;
 	x86_saved_state64_t	*regs;
 
 	assert(is_saved_state64(state));
@@ -345,7 +362,7 @@ machdep_syscall64(x86_saved_state_t *state)
 
 	DEBUG_KPRINT_SYSCALL_MDEP("machdep_syscall: retval=%llu\n", regs->rax);
 
-	throttle_lowpri_io(TRUE);
+	throttle_lowpri_io(1);
 
 	thread_exception_return();
 	/* NOTREACHED */
@@ -369,37 +386,15 @@ struct mach_call_args {
 };
 
 static kern_return_t
-mach_call_arg_munger32(uint32_t sp, int nargs, int call_number, struct mach_call_args *args);
+mach_call_arg_munger32(uint32_t sp, struct mach_call_args *args, const mach_trap_t *trapp);
 
 
 static kern_return_t
-mach_call_arg_munger32(uint32_t sp, int nargs, int call_number, struct mach_call_args *args)
+mach_call_arg_munger32(uint32_t sp, struct mach_call_args *args, const mach_trap_t *trapp)
 {
-	unsigned int args32[9];
-
-	if (copyin((user_addr_t)(sp + sizeof(int)), (char *)args32, nargs * sizeof (int)))
+	if (copyin((user_addr_t)(sp + sizeof(int)), (char *)args, trapp->mach_trap_u32_words * sizeof (int)))
 		return KERN_INVALID_ARGUMENT;
-
-	switch (nargs) {
-	case 9: args->arg9 = args32[8];
-	case 8: args->arg8 = args32[7];
-	case 7: args->arg7 = args32[6];
-	case 6: args->arg6 = args32[5];
-	case 5: args->arg5 = args32[4];
-	case 4: args->arg4 = args32[3];
-	case 3: args->arg3 = args32[2];
-	case 2: args->arg2 = args32[1];
-	case 1: args->arg1 = args32[0];
-	}
-	if (call_number == 90) {
-		/* munge_l for mach_wait_until_trap() */
-		args->arg1 = (((uint64_t)(args32[0])) | ((((uint64_t)(args32[1]))<<32)));
-	}
-	if (call_number == 93) {
-		/* munge_wl for mk_timer_arm_trap() */
-		args->arg2 = (((uint64_t)(args32[1])) | ((((uint64_t)(args32[2]))<<32)));
-	}
-
+	trapp->mach_trap_arg_munge32(NULL, args);
 	return KERN_SUCCESS;
 }
 
@@ -445,7 +440,7 @@ mach_call_munger(x86_saved_state_t *state)
 
 	argc = mach_trap_table[call_number].mach_trap_arg_count;
 	if (argc) {
-		retval = mach_call_arg_munger32(regs->uesp, argc, call_number, &args);
+		retval = mach_call_arg_munger32(regs->uesp, &args,  &mach_trap_table[call_number]);
 		if (retval != KERN_SUCCESS) {
 			regs->eax = retval;
 
@@ -460,18 +455,22 @@ mach_call_munger(x86_saved_state_t *state)
 #ifdef MACH_BSD
 	mach_kauth_cred_uthread_update();
 #endif
-	KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_SC, (call_number)) | DBG_FUNC_START,
-			args.arg1, args.arg2, args.arg3, args.arg4, 0);
+
+	KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,
+		MACHDBG_CODE(DBG_MACH_EXCP_SC, (call_number)) | DBG_FUNC_START,
+		args.arg1, args.arg2, args.arg3, args.arg4, 0);
 
 	retval = mach_call(&args);
 
 	DEBUG_KPRINT_SYSCALL_MACH("mach_call_munger: retval=0x%x\n", retval);
 
-	KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_SC,(call_number)) | DBG_FUNC_END,
-			retval, 0, 0, 0, 0);
+	KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,
+		MACHDBG_CODE(DBG_MACH_EXCP_SC,(call_number)) | DBG_FUNC_END,
+		retval, 0, 0, 0, 0);
+
 	regs->eax = retval;
 
-	throttle_lowpri_io(TRUE);
+	throttle_lowpri_io(1);
 
 	thread_exception_return();
 	/* NOTREACHED */
@@ -497,10 +496,9 @@ mach_call_munger64(x86_saved_state_t *state)
 		"mach_call_munger64: code=%d(%s)\n",
 		call_number, mach_syscall_name_table[call_number]);
 
-	KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_SC,
-					   (call_number)) | DBG_FUNC_START,
-			      regs->rdi, regs->rsi,
-			      regs->rdx, regs->r10, 0);
+	KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE, 
+		MACHDBG_CODE(DBG_MACH_EXCP_SC,(call_number)) | DBG_FUNC_START,
+		regs->rdi, regs->rsi, regs->rdx, regs->r10, 0);
 	
 	if (call_number < 0 || call_number >= mach_trap_count) {
 	        i386_exception(EXC_SYSCALL, regs->rax, 1);
@@ -535,11 +533,11 @@ mach_call_munger64(x86_saved_state_t *state)
 	
 	DEBUG_KPRINT_SYSCALL_MACH( "mach_call_munger64: retval=0x%llx\n", regs->rax);
 
-	KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_SC,
-					   (call_number)) | DBG_FUNC_END,
-			      regs->rax, 0, 0, 0, 0);
+	KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE, 
+		MACHDBG_CODE(DBG_MACH_EXCP_SC,(call_number)) | DBG_FUNC_END, 
+		regs->rax, 0, 0, 0, 0);
 
-	throttle_lowpri_io(TRUE);
+	throttle_lowpri_io(1);
 
 	thread_exception_return();
 	/* NOTREACHED */