Changeset 6781 for branches

Timestamp:

Jun 29, 2007, 1:01:56 AM (17 years ago)

Author:

Gary Byers

Message:

Use #_objc_exception_throw on x86-64. (Should really do this for
ppc64 as well.)

File:

• branches/ide-1.0/ccl/examples/objc-support.lisp (modified) (3 diffs)

branches/ide-1.0/ccl/examples/objc-support.lisp

@@ -226 +226 @@
 #+apple-objc
 (progn
-;;; (#__NSRaiseError nsexception) is entirely equivalent to
-;;; -[NSException raise].  If we get nervous about passing the former
-;;; around, we can always look up the method imp of the latter.
-(defmacro raising-ns-exception-on-error (&body body)
-  `(handler-case (progn ,@body)
-    (error (c) (external-call "__NSRaiseError" :address (ns-exception c) :void))))
+
 
 #+ppc-target
@@ -269 +264 @@
   ;; The callback glue reserves space for %rax at return-value-pointer-8,
   ;; for %rdx at -16, for %xmm0 at -24.  Store NS-EXCEPTION in the
-  ;; %rax slot, the address of #__NSRaiseError in the %rdx slot, the
+  ;; %rax slot, the address of #_objc_exception_throw in the %rdx slot, the
   ;; original return address in the %xmm0 slot, and force a return to
   ;; the trampoline code above.
@@ -277 +272 @@
         (%get-ptr return-address-pointer 0) *x8664-objc-callback-error-return-trampoline*)
   ;; A foreign entry point is always an integer on x8664.
-  (let* ((addr (%reference-external-entry-point (load-time-value (external "__NSRaiseError")))))
+  (let* ((addr (%reference-external-entry-point (load-time-value (external "_objc_exception_throw")))))
     (if (< addr 0)                      ;unlikely
       (setf (%%get-signed-longlong return-value-pointer -24) addr)
       (setf (%%get-unsigned-longlong return-value-pointer -24) addr)))
   nil)
-