diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2011-08-20 22:55:45 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2011-08-20 22:55:45 +0400 |
| commit | f71c1cdb55eab4203036ac33b0269d90d2216cc2 (patch) | |
| tree | 7f1a5ef5a0304bc4426af0db75f1f7467e9d06d6 | |
| parent | fe9bdaedffbb26dfc4339908babc517cec0872b2 (diff) | |
* fhandler_process.cc (format_process_maps): Define page protection
shortcuts RO, X, and WC. Use in creating access flag string. Don't
set type flag to 's' for copy-on-write pages, as on Linux.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_process.cc | 15 |
2 files changed, 15 insertions, 6 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 3cabade63..30e1df40d 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2011-08-20 Corinna Vinschen <corinna@vinschen.de> + + * fhandler_process.cc (format_process_maps): Define page protection + shortcuts RO, X, and WC. Use in creating access flag string. Don't + set type flag to 's' for copy-on-write pages, as on Linux. + 2011-08-19 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> * devices.h (fh_devices): Define DEV_MISC_MAJOR, DEV_MEM_MAJOR, diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc index 36270d1ba..91e2286d0 100644 --- a/winsup/cygwin/fhandler_process.cc +++ b/winsup/cygwin/fhandler_process.cc @@ -907,16 +907,19 @@ format_process_maps (void *data, char *&destbuf) } else { + static DWORD const RO = (PAGE_EXECUTE_READ | PAGE_READONLY); static DWORD const RW = (PAGE_EXECUTE_READWRITE | PAGE_READWRITE | PAGE_EXECUTE_WRITECOPY | PAGE_WRITECOPY); + static DWORD const X = (PAGE_EXECUTE | PAGE_EXECUTE_READ + | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_WRITECOPY); + static DWORD const WC = (PAGE_EXECUTE_WRITECOPY | PAGE_WRITECOPY); DWORD p = mb.Protect; a = (access) {{ - (p & (RW | PAGE_EXECUTE_READ | PAGE_READONLY)) ? 'r' : '-', - (p & (RW)) ? 'w' : '-', - (p & (PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ - | PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE)) ? 'x' : '-', - (mb.Type & MEM_MAPPED) ? 's' - : (p & PAGE_GUARD) ? 'g' : 'p', + (p & (RO | RW)) ? 'r' : '-', + (p & (RW)) ? 'w' : '-', + (p & (X)) ? 'x' : '-', + (mb.Type & MEM_MAPPED) && !(p & (WC)) ? 's' + : (p & PAGE_GUARD) ? 'g' : 'p', '\0', // zero-fill the remaining bytes }}; } |