Changeset 7909

Timestamp:

Dec 13, 2007, 3:30:28 PM (17 years ago)

Author:

Gary Byers

Message:

Save major OS version on startup, use it to determine where _sigtramp
keeps its contenxt argument (which differs between 10.4 and 10.5.)

Location:

trunk/ccl/lisp-kernel

Files:

• lisp-debug.c (modified) (1 diff)
• pmcl-kernel.c (modified) (2 diffs)

trunk/ccl/lisp-kernel/lisp-debug.c

@@ -873 +873 @@
   if (xp) {
     extern void *_sigtramp();
-    
+    extern int os_major_version;
+
     if (xpPC(xp) == (natural)_sigtramp) {
-      xp = (ExceptionInformation *) xpGPR(xp,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");
+      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");
     }
   }

trunk/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