xnu-6153.81.5.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..d24b486b6e2266b5c10b8340f67d68d3ce05461e 100644 (file)
--- a/libsyscall/mach/exc_catcher.c
+++ b/libsyscall/mach/exc_catcher.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@
  *
  * @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
  * 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.
  * 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.
  * 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,
  * 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.
  * 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@
  */
 /*
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*


@@ -35,33 +35,32 @@
 #include <mach/message.h>
 #include <mach/exception.h>
 #include <mach/mig_errors.h>
 #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 (
-    mach_port_t exception_port,
-    mach_port_t thread,
-    mach_port_t task,
-    exception_type_t exception,
-    exception_data_t code,
-    mach_msg_type_number_t codeCnt)
+#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,
+       exception_type_t exception,
+       exception_data_t code,
+       mach_msg_type_number_t codeCnt)

 {
 #if defined(__DYNAMIC__)
 {
 #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) && _dlsym) {
+               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
 #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
 }
 #endif
 }

-