libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cygwin: Move shared regions, rename PINFO... to MYSELF_REGION_ADDRESS 

Fix comments accordingly.

This is in preparation for a change in open_shared, handling shared
regions more cleanly.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2023-01-16 22:20:48 +01:00
parent 93508e5bb8
commit 50cbbb1c0e
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
winsup/cygwin/local_includes/memory_layout.h
View File

@ -16,14 +16,16 @@ details. */
dynamicbase is accidentally not set in the PE/COFF header of the DLL. */ dynamicbase is accidentally not set in the PE/COFF header of the DLL. */
#define CYGWIN_DLL_ADDRESS 0x180040000UL #define CYGWIN_DLL_ADDRESS 0x180040000UL
/* New with ASLR: We need a fixed place for the global shared memory areas. /* Default addresses of required standard shared regions (Cygwin shared,
Prior to ASLR, the addresses were relative to the address the Cygwin DLL user shared, myself, shared console). */
was loaded to. */ #define CYGWIN_REGION_ADDRESS 0x1a0000000UL
#define SHARED_REGIONS_ADDRESS_LOW 0x1f0000000UL #define USER_REGION_ADDRESS 0x1a1000000UL
#define CYGWIN_REGION_ADDRESS 0x1f0000000UL #define MYSELF_REGION_ADDRESS 0x1a2000000UL
#define USER_REGION_ADDRESS 0x1f2000000UL #define SHARED_CONSOLE_REGION_ADDRESS 0x1a3000000UL
#define PINFO_REGION_ADDRESS 0x1f4000000UL
#define SHARED_CONSOLE_REGION_ADDRESS 0x1f6000000UL /* Area for non-fixed-address Cygwin-specific shared memory regions. Fallback
for standard shared regions if the can't load at their default address. */
#define SHARED_REGIONS_ADDRESS_LOW 0x1a4000000UL
#define SHARED_REGIONS_ADDRESS_HIGH 0x200000000UL #define SHARED_REGIONS_ADDRESS_HIGH 0x200000000UL
/* Rebased DLLs are located in this 16 Gigs arena. Will be kept for /* Rebased DLLs are located in this 16 Gigs arena. Will be kept for

2
winsup/cygwin/mm/shared.cc
View File

@ -118,7 +118,7 @@ static uintptr_t region_address[] =
{ {
CYGWIN_REGION_ADDRESS, /* SH_CYGWIN_SHARED */ CYGWIN_REGION_ADDRESS, /* SH_CYGWIN_SHARED */
USER_REGION_ADDRESS, /* SH_USER_SHARED */ USER_REGION_ADDRESS, /* SH_USER_SHARED */
PINFO_REGION_ADDRESS, /* SH_MYSELF */ MYSELF_REGION_ADDRESS, /* SH_MYSELF */
SHARED_CONSOLE_REGION_ADDRESS, /* SH_SHARED_CONSOLE */ SHARED_CONSOLE_REGION_ADDRESS, /* SH_SHARED_CONSOLE */
0 0
}; };