Ignore:
Timestamp:
Jun 29, 2010, 1:25:33 PM (9 years ago)
Author:
gb
Message:

Propagate r13869 from trunk to 1.5.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release/1.5/source/lisp-kernel/thread_manager.c

    r13455 r13898  
    100100      (!((where < (pc)lisp_global(HEAP_END)) &&
    101101         (where >= (pc)lisp_global(HEAP_START))) &&
     102       (!((where < (pc)(managed_static_area->active)) &&
     103         (where >= (pc)(readonly_area->low)))) &&
    102104       !((where < spentry_end) && (where >= spentry_start)) &&
    103105       !((where < subprims_end) && (where >= subprims_start)) &&
     
    19471949    *pcontext = * (CONTEXT *)(pcontext->Rcx);
    19481950#else
    1949     *pcontext = * (CONTEXT *)(pcontext->Ecx);
     1951    if (where == restore_windows_context_start) {
     1952      *pcontext = * (CONTEXT *)((pcontext->Esp)+4);
     1953    } else {
     1954      *pcontext = * (CONTEXT *)(pcontext->Ecx);
     1955    }
    19501956#endif
    19511957  } else {
     
    19701976  }
    19711977  tcr->pending_exception_context = NULL;
     1978  /* We basically never return from an exception unless we
     1979     were executing lisp code when the exception returned.
     1980     If that ever changes, we need to know what valence
     1981     would have been restored here.*/
     1982  tcr->valence = TCR_STATE_LISP;
    19721983}
    19731984
     
    20162027        if (!((where < (pc)lisp_global(HEAP_END)) &&
    20172028              (where >= (pc)lisp_global(HEAP_START))) &&
     2029            (!((where < (pc)(managed_static_area->active)) &&
     2030              (where >= (pc)(readonly_area->low)))) &&
    20182031            !((where < spentry_end) && (where >= spentry_start)) &&
    20192032            !((where < subprims_end) && (where >= subprims_start)) &&
Note: See TracChangeset for help on using the changeset viewer.