Changeset 6777 for branches

Timestamp:

Jun 26, 2007, 2:10:45 AM (17 years ago)

Author:

Gary Byers

Message:

Replace some unused globals with things for ObjC 2.0 exception handling.

Location:

branches/ide-1.0/ccl/lisp-kernel

Files:

• lisp_globals.h (modified) (4 diffs)
• x86-constants.s (modified) (4 diffs)

branches/ide-1.0/ccl/lisp-kernel/lisp_globals.h

@@ -25 +25 @@
 #define INTERRUPT_SIGNAL  (-3)  /* signal to use for PROCESS-INTERRUPT */
 #define KERNEL_IMPORTS (-4)     /* some things we need to have imported for us. */
-#define badTCR_LOCK (-5)        /* (obsolete) lock on the TCR queue */
+#define OBJC_2_PERSONALITY (-5) /* A good listener.  Doesn't say much */
 #define SAVETOC (-6)            /* Saved TOC register, for some platforms */
 #define SAVER13 (-7)            /* Saved (global) r13, on some platforms */
@@ -47 +47 @@
 #define STATICALLY_LINKED (-25)        /* non-zero if -static */
 #define STACK_SIZE (-26)        /* from the command line */
-#define BAD_CURRENT_TS (-27)        /* area describing temp-stack */
+#define OBJC_2_BEGIN_CATCH (-27)  /* address of ObjC 2.0 objc_begin_catch() */
 #define BAD_FUNCALL (-28)       /* funcall pseudo-target on x86 */
 #define ALL_AREAS (-29)         /* doubly-linked list of stack & heap areas */
@@ -54 +54 @@
 #define IN_GC (-32)             /* non-zero when lisp addresses may be invalid */
 #define METERING_INFO (-33)     /* address of lisp_metering global */
-#define DOH_HEAD (-34)          /* Homer ? */
+#define OBJC_2_END_CACTCH (-34)          /* address of ObjC 2.0 objc_end_catch() */
 #define SHORT_FLOAT_ZERO (-35)  /* low half of 1.0d0 */
 #define DOUBLE_FLOAT_ONE (-36)  /* high half of 1.0d0 */
@@ -65 +65 @@
 #define HOST_PLATFORM (-43)     /* for platform-specific initialization */
 #define BATCH_FLAG (-44)        /* -b arg */
-#define BAD_FPSCR_SAVE (-45)    /* saved FPSCR for FFI */
+#define UNWIND_RESUME (-45)     /* address of _Unwind_Resume from libobjc */
 #define BAD_FPSCR_SAVE_HIGH (-46)       /* high word of FP reg used to save FPSCR */
 #define IMAGE_NAME (-47)        /* --image-name arg */

branches/ide-1.0/ccl/lisp-kernel/x86-constants.s

@@ -66 +66 @@
          _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   */
@@ -77 +77 @@
          _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   */
@@ -84 +84 @@
          _node(all_areas)               /* doubly-linked list of all memory areas   */
          _node(bad_funcall)             /* pseudo-funcall target for cmove   */
-         _node(BAD_current_ts)          /* current temp-stack area   */
+         _node(objc2_begin_catch)       /* objc_begin_catch   */
          _node(BAD_current_vs)          /* current value-stack area   */
          _node(statically_linked)       /* non-zero if -static   */
@@ -106 +106 @@
          _node(saveR13)                 /* probably don]t really need this   */
          _node(saveTOC)                 /* where the 68K emulator stores the  emulated regs   */
-         _node(tcr_lock)                /* this thread]s exception frame chain   */
+         _node(objc_2_personality)              /* exception "personality routine" address for ObjC 2.0 */
          _node(kernel_imports)          /* some things we need imported for us   */
          _node(interrupt_signal)        /* signal used by PROCESS-INTERRUPT   */