diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2005-12-27 23:20:09 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2005-12-27 23:20:09 +0300 |
| commit | a5912e6dbcd831d1d15c161d252c19ceea45f913 (patch) | |
| tree | b546d08e0e384c083672ebc0005b7e9b236c535c | |
| parent | 4f122755019ae56abf2af352b9f985184818d0f8 (diff) | |
* exceptions.cc (inside_kernel): Rename from interruptible.
Accommodate change throughout file.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/exceptions.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index d9166a652..82e9ba521 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2005-12-27 Corinna Vinschen <corinna@vinschen.de> + * exceptions.cc (inside_kernel): Rename from interruptible. + Accommodate change throughout file. + +2005-12-27 Corinna Vinschen <corinna@vinschen.de> + * exceptions.cc (interruptible): New function, code stripped from _cygtls::interrupt_now. (_cygtls::handle_exceptions): Handle STATUS_DATATYPE_MISALIGNMENT as diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc index cca745764..e13f6fa54 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -287,7 +287,7 @@ stackdump (DWORD ebp, int open_file, bool isexception) } static bool -interruptible (CONTEXT *cx) +inside_kernel (CONTEXT *cx) { int res; MEMORY_BASIC_INFORMATION m; @@ -620,7 +620,7 @@ _cygtls::handle_exceptions (EXCEPTION_RECORD *e, exception_list *frame, CONTEXT error_code |= 1; if (e->ExceptionInformation[0]) /* Write access */ error_code |= 2; - if (!interruptible (in)) /* User space */ + if (!inside_kernel (in)) /* User space */ error_code |= 4; klog (LOG_INFO, "%s[%d]: segfault at %08x rip %08x rsp %08x error %d", __progname, myself->pid, @@ -725,7 +725,7 @@ _cygtls::interrupt_now (CONTEXT *cx, int sig, void *handler, { bool interrupted; - if (!interruptible (cx) || (incyg || spinning || locked ())) + if (!inside_kernel (cx) || (incyg || spinning || locked ())) interrupted = false; else { |