Changeset 9399 for branches

Timestamp:

May 7, 2008, 9:11:43 PM (17 years ago)

Author:

R. Matthew Emerson

Message:

create_thread_context: use the foreign stack pointer, duh.

File:

• branches/ia32/lisp-kernel/x86-exceptions.c (modified) (3 diffs)

branches/ia32/lisp-kernel/x86-exceptions.c

@@ -367 +367 @@
 #ifdef X8632
   if (fulltag_of(tra) == fulltag_tra) {
-    if (*((unsigned char *)(tra)) == RECOVER_FN_OPCODE) {
-      tra_f = (LispObj)(*((natural *)(tra + 1)));
+    unsigned char *p = (unsigned char *)tra;
+
+    if (*p == RECOVER_FN_OPCODE) {
+      tra_f = (LispObj)(*((natural *)(p + 1)));
     }
     if (tra_f && header_subtag(header_of(tra_f)) != subtag_function) {
@@ -383 +385 @@
   if (fulltag_of(f) == fulltag_function) {
 #else
-  if (header_subtag(header_of(f)) == subtag_function) {
+  if (fulltag_of(f) == fulltag_misc &&
+      header_subtag(header_of(f)) == subtag_function) {
 #endif
     nominal_function = f;
@@ -2296 +2299 @@
   stackp = TRUNC_DOWN(stackp, C_REDZONE_LEN, C_STK_ALIGN);
 #else
-  stackp = (LispObj) ts->__esp;
+  stackp = (LispObj) find_foreign_rsp(ts->__esp, tcr->cs_area, tcr);
 #endif
   stackp = TRUNC_DOWN(stackp, sizeof(siginfo_t), C_STK_ALIGN);