Changeset 14330

Timestamp:

Oct 4, 2010, 8:17:13 PM (14 years ago)

Author:

Gary Byers

Message:

Mach exception entry/return maintain tcr->last_lisp_frame.

File:

• trunk/source/lisp-kernel/arm-exceptions.c (modified) (3 diffs)

trunk/source/lisp-kernel/arm-exceptions.c

@@ -1958 +1958 @@
   fprintf(dbgout, "doing pseudo_sigreturn for 0x%x\n",tcr);
 #endif
+  tcr->last_lisp_frame = *((natural *)(tcr->last_lisp_frame));
   xp = tcr->pending_exception_context;
   if (xp) {
@@ -2052 +2053 @@
   ExceptionInformation *pseudosigcontext;
   int old_valence = tcr->valence;
-  natural stackp;
+  natural stackp, *pstackp;
 
 #ifdef DEBUG_MACH_EXCEPTIONS
@@ -2058 +2059 @@
 #endif
   pseudosigcontext = create_thread_context_frame(thread, &stackp);
+  pstackp = (natural *)stackp;
+  *--pstackp = tcr->last_lisp_frame;
+  stackp = (natural)pstackp;
+  tcr->last_lisp_frame = stackp;
   pseudosigcontext->uc_onstack = 0;
   pseudosigcontext->uc_sigmask = (sigset_t) 0;
+  pseudosigcontext->uc_mcsize = ARM_MCONTEXT_SIZE;
   tcr->pending_exception_context = pseudosigcontext;
   tcr->valence = TCR_STATE_EXCEPTION_WAIT;