X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..4b17d6b6e417f714551ec129064745ea9919780e:/osfmk/kern/exception.c?ds=inline

diff --git a/osfmk/kern/exception.c b/osfmk/kern/exception.c
index 0122c44b1..8df6e268b 100644
--- a/osfmk/kern/exception.c
+++ b/osfmk/kern/exception.c
@@ -56,8 +56,6 @@
 /*
  */
 
-#include <mach_kdb.h>
-
 #include <mach/mach_types.h>
 #include <mach/boolean.h>
 #include <mach/kern_return.h>
@@ -86,22 +84,7 @@
 #include <kern/host.h>
 #include <kern/misc_protos.h>
 #include <string.h>
-
-#if	MACH_KDB
-#include <ddb/db_trap.h>
-#endif	/* MACH_KDB */
-
-#if	MACH_KDB
-
-#include <ddb/db_output.h>
-
-#if iPSC386 || iPSC860
-boolean_t debug_user_with_kdb = TRUE;
-#else
-boolean_t debug_user_with_kdb = FALSE;
-#endif
-
-#endif	/* MACH_KDB */
+#include <pexpert/pexpert.h>
 
 unsigned long c_thr_exc_raise = 0;
 unsigned long c_thr_exc_raise_state = 0;
@@ -117,7 +100,7 @@ kern_return_t exception_deliver(
 	mach_exception_data_t	code,
 	mach_msg_type_number_t  codeCnt,
 	struct exception_action *excp,
-	mutex_t			*mutex);
+	lck_mtx_t			*mutex);
 
 #ifdef MACH_BSD
 kern_return_t bsd_exception(
@@ -145,7 +128,7 @@ exception_deliver(
 	mach_exception_data_t	code,
 	mach_msg_type_number_t  codeCnt,
 	struct exception_action *excp,
-	mutex_t			*mutex)
+	lck_mtx_t			*mutex)
 {
 	ipc_port_t		exc_port;
 	exception_data_type_t	small_code[EXCEPTION_CODE_MAX];
@@ -168,16 +151,16 @@ exception_deliver(
 	 * the port from disappearing between now and when
 	 * ipc_object_copyin_from_kernel is finally called.
 	 */
-	mutex_lock(mutex);
+	lck_mtx_lock(mutex);
 	exc_port = excp->port;
 	if (!IP_VALID(exc_port)) {
-		mutex_unlock(mutex);
+		lck_mtx_unlock(mutex);
 		return KERN_FAILURE;
 	}
 	ip_lock(exc_port);
 	if (!ip_active(exc_port)) {
 		ip_unlock(exc_port);
-		mutex_unlock(mutex);
+		lck_mtx_unlock(mutex);
 		return KERN_FAILURE;
 	}
 	ip_reference(exc_port);	
@@ -186,14 +169,14 @@ exception_deliver(
 
 	flavor = excp->flavor;
 	behavior = excp->behavior;
-	mutex_unlock(mutex);
+	lck_mtx_unlock(mutex);
 
 	code64 = (behavior & MACH_EXCEPTION_CODES);
 	behavior &= ~MACH_EXCEPTION_CODES;
 
 	if (!code64) {
-		small_code[0] = CAST_DOWN(exception_data_type_t, code[0]);
-		small_code[1] = CAST_DOWN(exception_data_type_t, code[1]);
+		small_code[0] = CAST_DOWN_EXPLICIT(exception_data_type_t, code[0]);
+		small_code[1] = CAST_DOWN_EXPLICIT(exception_data_type_t, code[1]);
 	}
 
 
@@ -323,19 +306,17 @@ exception_triage(
 	task_t			task;
 	host_priv_t		host_priv;
 	struct exception_action *excp;
-	mutex_t			*mutex;
+	lck_mtx_t			*mutex;
 	kern_return_t		kr;
 
 	assert(exception != EXC_RPC_ALERT);
 
-	if (exception == KERN_SUCCESS)
-		panic("exception");
+	thread = current_thread();
 
 	/*
 	 * Try to raise the exception at the activation level.
 	 */
-	thread = current_thread();
-	mutex = mutex_addr(thread->mutex);
+	mutex = &thread->mutex;
 	excp = &thread->exc_actions[exception];
 	kr = exception_deliver(thread, exception, code, codeCnt, excp, mutex);
 	if (kr == KERN_SUCCESS || kr == MACH_RCV_PORT_DIED)
@@ -345,7 +326,7 @@ exception_triage(
 	 * Maybe the task level will handle it.
 	 */
 	task = current_task();
-	mutex = mutex_addr(task->lock);
+	mutex = &task->lock;
 	excp = &task->exc_actions[exception];
 	kr = exception_deliver(thread, exception, code, codeCnt, excp, mutex);
 	if (kr == KERN_SUCCESS || kr == MACH_RCV_PORT_DIED)
@@ -355,7 +336,7 @@ exception_triage(
 	 * How about at the host level?
 	 */
 	host_priv = host_priv_self();
-	mutex = mutex_addr(host_priv->lock);
+	mutex = &host_priv->lock;
 	excp = &host_priv->exc_actions[exception];
 	kr = exception_deliver(thread, exception, code, codeCnt, excp, mutex);
 	if (kr == KERN_SUCCESS || kr == MACH_RCV_PORT_DIED)
@@ -365,22 +346,10 @@ exception_triage(
 	 * Nobody handled it, terminate the task.
 	 */
 
-#if	MACH_KDB
-	if (debug_user_with_kdb) {
-		/*
-		 *	Debug the exception with kdb.
-		 *	If kdb handles the exception,
-		 *	then thread_kdb_return won't return.
-		 */
-		db_printf("No exception server, calling kdb...\n");
-		thread_kdb_return();
-	}
-#endif	/* MACH_KDB */
-
 	(void) task_terminate(task);
 
 out:
-	if (exception != EXC_CRASH)
+	if ((exception != EXC_CRASH) && (exception != EXC_RESOURCE))
 		thread_exception_return();
 	return;
 }
@@ -393,7 +362,7 @@ bsd_exception(
 {
 	task_t			task;
 	struct exception_action *excp;
-	mutex_t			*mutex;
+	lck_mtx_t		*mutex;
 	thread_t		self = current_thread();
 	kern_return_t		kr;
 
@@ -401,7 +370,7 @@ bsd_exception(
 	 * Maybe the task level will handle it.
 	 */
 	task = current_task();
-	mutex = mutex_addr(task->lock);
+	mutex = &task->lock;
 	excp = &task->exc_actions[exception];
 
 	kr = exception_deliver(self, exception, code, codeCnt, excp, mutex);
@@ -413,11 +382,11 @@ bsd_exception(
 
 
 /*
- * Raise an EXC_CRASH exception on the dying task.
+ * Raise an exception on a task.
  * This should tell launchd to launch Crash Reporter for this task.
  */
-kern_return_t abnormal_exit_notify(mach_exception_data_type_t exccode, 
-		mach_exception_data_type_t excsubcode)
+kern_return_t task_exception_notify(exception_type_t exception,
+	mach_exception_data_type_t exccode, mach_exception_data_type_t excsubcode)
 {
 	mach_exception_data_type_t	code[EXCEPTION_CODE_MAX];
 	wait_interrupt_t		wsave;
@@ -426,7 +395,7 @@ kern_return_t abnormal_exit_notify(mach_exception_data_type_t exccode,
 	code[1] = excsubcode;
 
 	wsave = thread_interrupt_level(THREAD_UNINT);
-	exception_triage(EXC_CRASH, code, EXCEPTION_CODE_MAX);
+	exception_triage(exception, code, EXCEPTION_CODE_MAX);
 	(void) thread_interrupt_level(wsave);
 	return (KERN_SUCCESS);
 }