Changeset 15372


Ignore:
Timestamp:
May 22, 2012, 1:26:54 PM (7 years ago)
Author:
gb
Message:

lisp_globals.*: Spell "catch" with fewer c characters in OBJC_2_END_CATCH definition.

x86-spentry64.s: use new names for objc_2_begin/end_catch.

Location:
trunk/source/lisp-kernel
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/lisp-kernel/lisp_globals.h

    r15370 r15372  
    6060#define IN_GC (-32)             /* non-zero when lisp addresses may be invalid */
    6161#define FREE_STATIC_CONSES (-33)     /* length of freelist */
    62 #define OBJC_2_END_CACTCH (-34)          /* address of ObjC 2.0 objc_end_catch() */
     62#define OBJC_2_END_CATCH (-34)          /* address of ObjC 2.0 objc_end_catch() */
    6363#define SHORT_FLOAT_ZERO (-35)  /* low half of 1.0d0 */
    6464#define DOUBLE_FLOAT_ONE (-36)  /* high half of 1.0d0 */
  • trunk/source/lisp-kernel/lisp_globals.s

    r15370 r15372  
    194194         _rnode(in_gc)             /* non-zero when lisp addresses may be invalid */
    195195         _rnode(free_static_conses)     /* length of freelist */
    196          _rnode(objc_2_end_cactch)          /* address of ObjC 2.0 objc_end_catch() */
     196         _rnode(objc_2_end_catch)          /* address of ObjC 2.0 objc_end_catch() */
    197197         _rnode(short_float_zero)  /* low half of 1.0d0 */
    198198         _rnode(double_float_one)  /* high half of 1.0d0 */
  • trunk/source/lisp-kernel/x86-spentry64.s

    r15366 r15372  
    423142311:      __(movq %save1,%rdi)
    42324232LocalLabelPrefix`'ffcallBeginCatch:             
    4233         __(call *lisp_global(objc2_begin_catch))
     4233        __(call *lisp_global(objc_2_begin_catch))
    42344234LocalLabelPrefix`'ffcallBeginCatch_end:         
    42354235        __(movq (%rax),%save1) /* indirection is necessary because we don't provide type info in lsda */
    42364236LocalLabelPrefix`'ffcallEndCatch:               
    4237         __(call *lisp_global(objc2_end_catch))
     4237        __(call *lisp_global(objc_2_end_catch))
    42384238LocalLabelPrefix`'ffcallEndCatch_end:           
    42394239        __(ref_global(get_tcr,%rax))
     
    442544251:      __(movq %save1,%rdi)
    44264426LocalLabelPrefix`'ffcall_return_registersBeginCatch:             
    4427         __(call *lisp_global(objc2_begin_catch))
     4427        __(call *lisp_global(objc_2_begin_catch))
    44284428LocalLabelPrefix`'ffcall_return_registersBeginCatch_end:         
    44294429        __(movq (%rax),%save1) /* indirection is necessary because we don't provide type info in lsda */
    44304430LocalLabelPrefix`'ffcall_return_registersEndCatch:               
    4431         __(call *lisp_global(objc2_end_catch))
     4431        __(call *lisp_global(objc_2_end_catch))
    44324432LocalLabelPrefix`'ffcall_return_registersEndCatch_end:           
    44334433        __(ref_global(get_tcr,%rax))
Note: See TracChangeset for help on using the changeset viewer.