xnu-6153.141.1.tar.gz

[apple/xnu.git] / libsyscall / mach / exc_catcher_state.c

diff --git a/libsyscall/mach/exc_catcher_state.c b/libsyscall/mach/exc_catcher_state.c
index c372d1c20be69c08703e5cd1a5376ae7c28e7300..47ac3d7fb6f66d431b4711ad0fed09b1221f90c5 100644 (file)
--- a/libsyscall/mach/exc_catcher_state.c
+++ b/libsyscall/mach/exc_catcher_state.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2010 Apple Inc. All rights reserved.
  *
  * @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
@@ -11,10 +11,10 @@
  * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
@@ -35,36 +35,35 @@
 #include <mach/message.h>
 #include <mach/exception.h>
 #include <mach/mig_errors.h>
-#include <mach-o/dyld.h>
-#include <stdlib.h>
 
-__private_extern__ kern_return_t internal_catch_exception_raise_state (
-        mach_port_t exception_port,
-        exception_type_t exception,
-        exception_data_t code,
-        mach_msg_type_number_t codeCnt,
-        int *flavor,
-        thread_state_t old_state,
-        mach_msg_type_number_t old_stateCnt,
-        thread_state_t new_state,
-        mach_msg_type_number_t *new_stateCnt)
+#include "abort.h"
+#include "exc_catcher.h"
+
+__private_extern__ kern_return_t
+internal_catch_exception_raise_state(
+       mach_port_t exception_port,
+       exception_type_t exception,
+       exception_data_t code,
+       mach_msg_type_number_t codeCnt,
+       int *flavor,
+       thread_state_t old_state,
+       mach_msg_type_number_t old_stateCnt,
+       thread_state_t new_state,
+       mach_msg_type_number_t *new_stateCnt)
 {
 #if defined(__DYNAMIC__)
-    static int checkForFunction = 0;
-    /* This will be non-zero if the user has defined this function */
-    static kern_return_t (*func)(mach_port_t, exception_type_t, exception_data_t, mach_msg_type_number_t, int *, thread_state_t, mach_msg_type_number_t, thread_state_t, mach_msg_type_number_t *);
-    if (checkForFunction == 0) {
-        checkForFunction = 1;
-        _dyld_lookup_and_bind("_catch_exception_raise_state", (unsigned long *)&func, (void **)0);
-    }
-    if (func == 0) {
-        /* The user hasn't defined catch_exception_raise in their binary */
-        abort();
-    }
-    return (*func)(exception_port, exception, code, codeCnt, flavor, old_state, old_stateCnt, new_state, new_stateCnt);
+       static _libkernel_exc_raise_state_func_t exc_raise_state_func = (void*)-1;
+
+       if (exc_raise_state_func == ((void*)-1) && _dlsym) {
+               exc_raise_state_func = _dlsym(RTLD_DEFAULT, "catch_exception_raise_state");
+       }
+       if (exc_raise_state_func == 0) {
+               /* The user hasn't defined catch_exception_raise in their binary */
+               abort();
+       }
+       return (*exc_raise_state_func)(exception_port, exception, code, codeCnt, flavor, old_state, old_stateCnt, new_state, new_stateCnt);
 #else
-    extern kern_return_t catch_exception_raise_state(mach_port_t, exception_type_t, exception_data_t, mach_msg_type_number_t, int *, thread_state_t, mach_msg_type_number_t, thread_state_t, mach_msg_type_number_t *);
-    return catch_exception_raise_state(exception_port, exception, code, codeCnt, flavor, old_state, old_stateCnt, new_state, new_stateCnt);
+       extern kern_return_t catch_exception_raise_state(mach_port_t, exception_type_t, exception_data_t, mach_msg_type_number_t, int *, thread_state_t, mach_msg_type_number_t, thread_state_t, mach_msg_type_number_t *);
+       return catch_exception_raise_state(exception_port, exception, code, codeCnt, flavor, old_state, old_stateCnt, new_state, new_stateCnt);
 #endif
 }
-