xnu-4903.241.1.tar.gz

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

diff --git a/libsyscall/mach/exc_catcher.c b/libsyscall/mach/exc_catcher.c
index a850865198bb172dfb42745789971c11c1e6f6aa..9915eb2a0daa939869eac31a2fe3d7c80704eea1 100644 (file)
--- a/libsyscall/mach/exc_catcher.c
+++ b/libsyscall/mach/exc_catcher.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2010 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -35,10 +35,12 @@
 #include <mach/message.h>
 #include <mach/exception.h>
 #include <mach/mig_errors.h>
-#include <dlfcn.h>
-#include <stdlib.h>
 
-__private_extern__ kern_return_t internal_catch_exception_raise (
+#include "abort.h"
+#include "exc_catcher.h"
+
+__private_extern__ kern_return_t
+internal_catch_exception_raise(
     mach_port_t exception_port,
     mach_port_t thread,
     mach_port_t task,
@@ -47,21 +49,19 @@ __private_extern__ kern_return_t internal_catch_exception_raise (
     mach_msg_type_number_t codeCnt)
 {
 #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, mach_port_t, mach_port_t, exception_type_t, exception_data_t, mach_msg_type_number_t);
-    if (checkForFunction == 0) {
-        checkForFunction = 1;
-               func = dlsym(RTLD_DEFAULT, "catch_exception_raise");
-    }
-    if (func == 0) {
-        /* The user hasn't defined catch_exception_raise in their binary */
-        abort();
-    }
-    return (*func)(exception_port, thread, task, exception, code, codeCnt);
+       static _libkernel_exc_raise_func_t exc_raise_func = (void*)-1;
+       
+       if (exc_raise_func == ((void*)-1)) {
+               exc_raise_func = _dlsym(RTLD_DEFAULT, "catch_exception_raise");
+       }
+       if (exc_raise_func == 0) {
+               /* The user hasn't defined catch_exception_raise in their binary */
+               abort();
+       }
+       return (*exc_raise_func)(exception_port, thread, task, exception, code, codeCnt);
 #else
-    extern kern_return_t catch_exception_raise(mach_port_t, mach_port_t, mach_port_t, exception_type_t, exception_data_t, mach_msg_type_number_t);
-    return catch_exception_raise(exception_port, thread, task, exception, code, codeCnt);
+       extern kern_return_t catch_exception_raise(mach_port_t, mach_port_t, mach_port_t, exception_type_t, exception_data_t, mach_msg_type_number_t);
+       return catch_exception_raise(exception_port, thread, task, exception, code, codeCnt);
 #endif
 }