Changeset 12638

Timestamp:

Aug 21, 2009, 11:45:21 AM (15 years ago)

Author:

Gary Byers

Message:

ppc-constants.s: define lisp_globals for ObjC 2 exception stuff.
ppc-spentry.s: first draft of ObjC 2.0 exception code for PPC64 Darwin.
(Need to repeat all of this for the variant of ffcall that returns multiple
registers, and hook up the DWARF exception stuff.)

Location:

trunk/source/lisp-kernel

Files:

• ppc-constants.s (modified) (3 diffs)
• ppc-spentry.s (modified) (1 diff)

trunk/source/lisp-kernel/ppc-constants.s

@@ -190 +190 @@
          _node(image_name)              /* --image-name argument */
          _node(BADfpscr_save_high)              /* high word of FP reg used to save FPSCR */
-         _node(BADfpscr_save)              /* saved FPSCR */
+         _node(unwind_resume)           /* _Unwind_Resume */
          _node(batch_flag)              /* -b */
          _node(host_platform)           /* for runtime platform-specific stuff */
@@ -201 +201 @@
          _node(double_float_one)        /* high half of 1.0d0 */
          _node(short_float_zero)        /* low half of 1.0d0 */
-         _node(doh_head)                /* creole objects header */
+         _node(objc2_end_catch)         /* objc_end_catch() */
          _node(metering_info)           /* address of lisp_metering global */
          _node(in_gc)                   /* non-zero when GC active */
@@ -209 +209 @@
          _node(BAD_cs_overflow_limit)   /* limit for control-stack overflow check */
          _node(kernel_name)             /* real executable name */
-         _node(BAD_current_vs)          /* current value-stack area */
+         _node(objc2_begin_catch)       /* objc_begin_catch */
          _node(statically_linked)       /* non-zero if -static */
          _node(heap_end)                /* end of lisp heap */

trunk/source/lisp-kernel/ppc-spentry.s

@@ -1577 +1577 @@
         __(mtxer rzero)
         __(mtctr rzero)
-        __(blr)
-
+        __ifdef([PPC64])
+         __ifdef([DARWIN])
+          __(li imm3,1<<TCR_FLAG_BIT_FOREIGN_EXCEPTION)
+          __(ld imm4,tcr.flags(rcontext))
+          __(and. imm3,imm3,imm4)
+          __(bne cr0,0f)
+         __endif
+        __endif
+        __(blr)
+        __ifdef([PPC64])
+         __ifdef([DARWIN])
+0:        /* Got here because TCR_FLAG_BIT_FOREIGN_EXCEPTION */
+          /* was set in tcr.flags.  Clear that bit. */
+          __(andc imm4,imm4,imm3)
+          __(std imm4,tcr.flags(rcontext))
+          /* Unboxed foreign exception (likely an NSException) in %imm0. */
+          /* Box it, then signal a lisp error. */
+          __(Misc_Alloc_Fixed(arg_z,imm1,macptr.size))
+          __(std imm0,macptr.address(arg_z))
+          __(li arg_y,XFOREIGNEXCEPTION)
+          __(set_nargs(2))
+          __(b _SPksignalerr)
+        /* Handle exceptions, for ObjC 2.0 */
+LocalLabelPrefix[]ffcallLandingPad:      
+          __(mr save1,r3)
+          __(cmpdi r4,1)
+          __(beq 1f)
+LocalLabelPrefix[]ffcallUnwindResume:
+          __(ref_global(r12,unwind_resume))
+          __(mtctr r12)
+          __(bctrl)
+LocalLabelPrefix[]ffcallUnwindResume_end:         
+1:        __(mr r3,save1)
+LocalLabelPrefix[]ffcallBeginCatch:
+          __(ref_global(r12,objc2_begin_catch))
+          __(mtctr r12)
+          __(bctrl)
+LocalLabelPrefix[]ffcallBeginCatch_end:          
+          __(ld save1,0(r3)) /* indirection is necessary because we don't provide type info in lsda */
+LocalLabelPrefix[]ffcallEndCatch:  
+          __(ref_global(r12,objc2_end_catch))
+          __(mtctr r12)
+          __(bctrl)              
+LocalLabelPrefix[]ffcallEndCatch_end:     
+          __(ref_global(r12,get_tcr))
+          __(mtctr r12)
+          __(li imm0,1)       
+          __(bctrl)
+          __(ld imm2,tcr.flags(imm0))
+          __(ori imm2,imm2,1<<TCR_FLAG_BIT_FOREIGN_EXCEPTION)
+          __(std imm2,tcr.flags(imm0))
+          __(mr imm0,save1)
+          __(b LocalLabelPrefix[]ffcall_call_end)
+LocalLabelPrefix[]ffcall_end:   
+         __endif
+        __endif
 
 /* Just like poweropen_ffcall, only we save all argument(result)