Ignore:
Timestamp:
Apr 9, 2009, 5:49:58 AM (11 years ago)
Author:
gb
Message:

Back out of recent changes: there's no need to initialize
lisp_global(OBJC_2_PERSONALITY) in main() and no need to handle initialized
ObjC2-exception-related lisp globals specially in SETUP-OJC-EXCEPTION-GLOBALS.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/objc-bridge/objc-support.lisp

    r11913 r11915  
    141141#+apple-objc-2.0
    142142(progn
    143 (defloadvar *objc-exception-globals-setup* nil) 
    144143(defun setup-objc-exception-globals ()
    145144  (flet ((set-global (offset name)
    146            (let* ((p (%int-to-ptr (+ (target-nil-value) (%kernel-global-offset offset))))
    147                   (q (%get-ptr p)))
    148              (unless (%null-ptr-p q)
    149                (setq p q))
    150              (setf (%get-ptr p)
    151                    (foreign-symbol-address name)))))
    152     (unless *objc-exception-globals-setup*
    153       (setq *objc-exception-globals-setup* t)
    154       (set-global 'objc-2-personality "___objc_personality_v0")
    155       (set-global 'objc-2-begin-catch "_objc_begin_catch")
    156       (set-global 'objc-2-end-catch "_objc_end_catch")
    157       (set-global 'unwind-resume "__Unwind_Resume"))))
     145           (setf (%get-ptr (%int-to-ptr (+ (target-nil-value) (%kernel-global-offset offset))))
     146                 (foreign-symbol-address name))))
     147    (set-global 'objc-2-personality "___objc_personality_v0")
     148    (set-global 'objc-2-begin-catch "_objc_begin_catch")
     149    (set-global 'objc-2-end-catch "_objc_end_catch")
     150    (set-global 'unwind-resume "__Unwind_Resume")))
    158151
    159152
     
    161154  (setup-objc-exception-globals))
    162155
     156(setup-objc-exception-globals)
    163157)
    164158
Note: See TracChangeset for help on using the changeset viewer.