Cygwin: drop wincap::mmap_storage_high

Only required for Windows 7 and Windows 8.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2022-11-15 17:46:52 +01:00
parent 8af023a357
commit ae2829a226
3 changed files with 2 additions and 21 deletions

View File

@ -53,11 +53,6 @@ details. */
#define USERHEAP_START 0xa00000000UL #define USERHEAP_START 0xa00000000UL
/* The memory region used for memory maps. Mmaps grow downwards. /* The memory region used for memory maps. Mmaps grow downwards.
Set the lowest address to leave ~32 Gigs for heap. Set the lowest address to leave ~32 Gigs for heap. */
Up to Win 8 we only have a 44 bit address space, 48 bit address space
starting with 8.1, so the max value is a system-specific variable. */
#define MMAP_STORAGE_LOW 0x001000000000UL #define MMAP_STORAGE_LOW 0x001000000000UL
#define __MMAP_STORAGE_HIGH_LEGACY 0x070000000000UL #define MMAP_STORAGE_HIGH 0x700000000000UL
#define __MMAP_STORAGE_HIGH 0x700000000000UL
#define MMAP_STORAGE_HIGH wincap.mmap_storage_high ()

View File

@ -12,7 +12,6 @@ details. */
struct wincaps struct wincaps
{ {
DWORD def_guard_pages; DWORD def_guard_pages;
int64_t mmap_storage_high;
/* The bitfields must be 8 byte aligned on x86_64, otherwise the bitfield /* The bitfields must be 8 byte aligned on x86_64, otherwise the bitfield
ops generated by gcc are off by 4 bytes. */ ops generated by gcc are off by 4 bytes. */
struct __attribute__ ((aligned (8))) { struct __attribute__ ((aligned (8))) {
@ -67,7 +66,6 @@ public:
{ {
return ((wincaps *) this->caps)->def_guard_pages * page_size (); return ((wincaps *) this->caps)->def_guard_pages * page_size ();
} }
intptr_t IMPLEMENT (mmap_storage_high)
bool IMPLEMENT (is_server) bool IMPLEMENT (is_server)
bool IMPLEMENT (has_new_pebteb_region) bool IMPLEMENT (has_new_pebteb_region)
bool IMPLEMENT (has_unprivileged_createsymlink) bool IMPLEMENT (has_unprivileged_createsymlink)

View File

@ -21,7 +21,6 @@ details. */
wincaps wincap_7 __attribute__((section (".cygwin_dll_common"), shared)) = { wincaps wincap_7 __attribute__((section (".cygwin_dll_common"), shared)) = {
def_guard_pages:2, def_guard_pages:2,
mmap_storage_high:__MMAP_STORAGE_HIGH_LEGACY,
{ {
is_server:false, is_server:false,
has_new_pebteb_region:false, has_new_pebteb_region:false,
@ -45,7 +44,6 @@ wincaps wincap_7 __attribute__((section (".cygwin_dll_common"), shared)) = {
wincaps wincap_8 __attribute__((section (".cygwin_dll_common"), shared)) = { wincaps wincap_8 __attribute__((section (".cygwin_dll_common"), shared)) = {
def_guard_pages:3, def_guard_pages:3,
mmap_storage_high:__MMAP_STORAGE_HIGH_LEGACY,
{ {
is_server:false, is_server:false,
has_new_pebteb_region:false, has_new_pebteb_region:false,
@ -69,7 +67,6 @@ wincaps wincap_8 __attribute__((section (".cygwin_dll_common"), shared)) = {
wincaps wincap_8_1 __attribute__((section (".cygwin_dll_common"), shared)) = { wincaps wincap_8_1 __attribute__((section (".cygwin_dll_common"), shared)) = {
def_guard_pages:3, def_guard_pages:3,
mmap_storage_high:__MMAP_STORAGE_HIGH,
{ {
is_server:false, is_server:false,
has_new_pebteb_region:false, has_new_pebteb_region:false,
@ -93,7 +90,6 @@ wincaps wincap_8_1 __attribute__((section (".cygwin_dll_common"), shared)) = {
wincaps wincap_10_1507 __attribute__((section (".cygwin_dll_common"), shared)) = { wincaps wincap_10_1507 __attribute__((section (".cygwin_dll_common"), shared)) = {
def_guard_pages:3, def_guard_pages:3,
mmap_storage_high:__MMAP_STORAGE_HIGH,
{ {
is_server:false, is_server:false,
has_new_pebteb_region:false, has_new_pebteb_region:false,
@ -117,7 +113,6 @@ wincaps wincap_10_1507 __attribute__((section (".cygwin_dll_common"), shared))
wincaps wincap_10_1607 __attribute__((section (".cygwin_dll_common"), shared)) = { wincaps wincap_10_1607 __attribute__((section (".cygwin_dll_common"), shared)) = {
def_guard_pages:3, def_guard_pages:3,
mmap_storage_high:__MMAP_STORAGE_HIGH,
{ {
is_server:false, is_server:false,
has_new_pebteb_region:false, has_new_pebteb_region:false,
@ -141,7 +136,6 @@ wincaps wincap_10_1607 __attribute__((section (".cygwin_dll_common"), shared))
wincaps wincap_10_1703 __attribute__((section (".cygwin_dll_common"), shared)) = { wincaps wincap_10_1703 __attribute__((section (".cygwin_dll_common"), shared)) = {
def_guard_pages:3, def_guard_pages:3,
mmap_storage_high:__MMAP_STORAGE_HIGH,
{ {
is_server:false, is_server:false,
has_new_pebteb_region:true, has_new_pebteb_region:true,
@ -165,7 +159,6 @@ wincaps wincap_10_1703 __attribute__((section (".cygwin_dll_common"), shared)) =
wincaps wincap_10_1709 __attribute__((section (".cygwin_dll_common"), shared)) = { wincaps wincap_10_1709 __attribute__((section (".cygwin_dll_common"), shared)) = {
def_guard_pages:3, def_guard_pages:3,
mmap_storage_high:__MMAP_STORAGE_HIGH,
{ {
is_server:false, is_server:false,
has_new_pebteb_region:true, has_new_pebteb_region:true,
@ -189,7 +182,6 @@ wincaps wincap_10_1709 __attribute__((section (".cygwin_dll_common"), shared)) =
wincaps wincap_10_1803 __attribute__((section (".cygwin_dll_common"), shared)) = { wincaps wincap_10_1803 __attribute__((section (".cygwin_dll_common"), shared)) = {
def_guard_pages:3, def_guard_pages:3,
mmap_storage_high:__MMAP_STORAGE_HIGH,
{ {
is_server:false, is_server:false,
has_new_pebteb_region:true, has_new_pebteb_region:true,
@ -213,7 +205,6 @@ wincaps wincap_10_1803 __attribute__((section (".cygwin_dll_common"), shared)) =
wincaps wincap_10_1809 __attribute__((section (".cygwin_dll_common"), shared)) = { wincaps wincap_10_1809 __attribute__((section (".cygwin_dll_common"), shared)) = {
def_guard_pages:3, def_guard_pages:3,
mmap_storage_high:__MMAP_STORAGE_HIGH,
{ {
is_server:false, is_server:false,
has_new_pebteb_region:true, has_new_pebteb_region:true,
@ -237,7 +228,6 @@ wincaps wincap_10_1809 __attribute__((section (".cygwin_dll_common"), shared)) =
wincaps wincap_10_1903 __attribute__((section (".cygwin_dll_common"), shared)) = { wincaps wincap_10_1903 __attribute__((section (".cygwin_dll_common"), shared)) = {
def_guard_pages:3, def_guard_pages:3,
mmap_storage_high:__MMAP_STORAGE_HIGH,
{ {
is_server:false, is_server:false,
has_new_pebteb_region:true, has_new_pebteb_region:true,
@ -261,7 +251,6 @@ wincaps wincap_10_1903 __attribute__((section (".cygwin_dll_common"), shared)) =
wincaps wincap_10_2004 __attribute__((section (".cygwin_dll_common"), shared)) = { wincaps wincap_10_2004 __attribute__((section (".cygwin_dll_common"), shared)) = {
def_guard_pages:3, def_guard_pages:3,
mmap_storage_high:__MMAP_STORAGE_HIGH,
{ {
is_server:false, is_server:false,
has_new_pebteb_region:true, has_new_pebteb_region:true,
@ -285,7 +274,6 @@ wincaps wincap_10_2004 __attribute__((section (".cygwin_dll_common"), shared)) =
wincaps wincap_11 __attribute__((section (".cygwin_dll_common"), shared)) = { wincaps wincap_11 __attribute__((section (".cygwin_dll_common"), shared)) = {
def_guard_pages:3, def_guard_pages:3,
mmap_storage_high:__MMAP_STORAGE_HIGH,
{ {
is_server:false, is_server:false,
has_new_pebteb_region:true, has_new_pebteb_region:true,