Changeset 7912

Timestamp:

Dec 14, 2007, 4:07:47 PM (17 years ago)

Author:

gz

Message:

update from trunk to rev 7911

Location:

branches/event-ide/ccl

Files:

• level-1/l1-readloop.lisp (modified) (1 diff)
• lisp-kernel/lisp-debug.c (modified) (1 diff)
• lisp-kernel/pmcl-kernel.c (modified) (2 diffs)

branches/event-ide/ccl/level-1/l1-readloop.lisp

@@ -124 +124 @@
 
 
-(defglobal *quitting* nil)
+(defloadvar *quitting* nil)
 
 

branches/event-ide/ccl/lisp-kernel/lisp-debug.c

@@ -866 +866 @@
     fprintf(stderr, "Exception occurred while executing foreign code\n");
   }
-
   if (lisp_global(BATCH_FLAG)) {
     abort();
   }
+#ifdef DARWIN
+#ifdef X8664
+  if (xp) {
+    extern void *_sigtramp();
+    extern int os_major_version;
+
+    if (xpPC(xp) == (natural)_sigtramp) {
+      xp = (ExceptionInformation *) xpGPR(xp,os_major_version < 9 ? REG_RSI :REG_RCX);
+      fprintf(stderr, "Exception raised at _sigtramp; using context passed to _sigtramp.  Raw register values (R) may be more interesting then lisp values or lisp backtrace\n");
+    }
+  }
+#endif
+#endif
+
+
   if (xp) {
     if (why > debug_entry_exception) {

branches/event-ide/ccl/lisp-kernel/pmcl-kernel.c

@@ -1286 +1286 @@
 #endif
 
+int
+os_major_version = 0;
+
 void
 check_os_version(char *progname)
@@ -1296 +1299 @@
     exit(1);
   }
+  sscanf(uts.release,"%d",&os_major_version);
+
 #ifdef PPC
 #ifdef DARWIN