wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 42cb7d2ad1caba08de235e6319b9967296b5d554.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-07-16 08:18:59 +10:00
parent 884f646404
commit c3c5d48b18
9 changed files with 73 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
patches/ntdll-ForceBottomUpAlloc/0005-ntdll-Use-free-area-list-for-virtual-memory-allocati.patch
View File

@@ -1,4 +1,4 @@
From 04a45064d81f63de64effc2748b70cf15bba5f5d Mon Sep 17 00:00:00 2001
From 7264548fa5272de83119327be9f7b1f2815dbc79 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Tue, 14 Jan 2020 21:42:21 +0300
Subject: [PATCH] ntdll: Use free area list for virtual memory allocation.
@@ -8,10 +8,10 @@ Subject: [PATCH] ntdll: Use free area list for virtual memory allocation.
1 file changed, 230 insertions(+), 112 deletions(-)
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 00b29bc5d1d..667401aaa93 100644
index cc7ca87241b..ec404479329 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -186,7 +186,11 @@ static BYTE *pages_vprot;
@@ -189,7 +189,11 @@ static BYTE *pages_vprot;
#endif
static struct file_view *view_block_start, *view_block_end, *next_free_view;
@@ -23,7 +23,7 @@ index 00b29bc5d1d..667401aaa93 100644
static void *preload_reserve_start;
static void *preload_reserve_end;
static BOOL force_exec_prot; /* whether to force PROT_EXEC on all PROT_READ mmaps */
@@ -521,13 +525,13 @@ static struct range_entry *free_ranges_lower_bound( void *addr )
@@ -546,13 +550,13 @@ static struct range_entry *free_ranges_lower_bound( void *addr )
*
* Updates the free_ranges after a new view has been created.
*/
@@ -40,7 +40,7 @@ index 00b29bc5d1d..667401aaa93 100644
/* free_ranges initial value is such that the view is either inside range or before another one. */
assert( range != free_ranges_end );
assert( range->end > view_base || next != free_ranges_end );
@@ -538,7 +542,7 @@ static void free_ranges_insert_view( struct file_view *view )
@@ -563,7 +567,7 @@ static void free_ranges_insert_view( struct file_view *view )
(range->end == view_base && next->base >= view_end))
{
/* on Win64, assert that it's correctly aligned so we're not going to be in trouble later */
@@ -49,7 +49,7 @@ index 00b29bc5d1d..667401aaa93 100644
WARN( "range %p - %p is already mapped\n", view_base, view_end );
return;
}
@@ -578,6 +582,12 @@ static void free_ranges_insert_view( struct file_view *view )
@@ -603,6 +607,12 @@ static void free_ranges_insert_view( struct file_view *view )
}
}
@@ -62,7 +62,7 @@ index 00b29bc5d1d..667401aaa93 100644
/***********************************************************************
* free_ranges_remove_view
@@ -608,6 +618,7 @@ static void free_ranges_remove_view( struct file_view *view )
@@ -633,6 +643,7 @@ static void free_ranges_remove_view( struct file_view *view )
return;
}
#endif
@@ -70,7 +70,7 @@ index 00b29bc5d1d..667401aaa93 100644
/* free_ranges initial value is such that the view is either inside range or before another one. */
assert( range != free_ranges_end );
@@ -954,44 +965,6 @@ static struct file_view *find_view_range( const void *addr, size_t size )
@@ -1008,44 +1019,6 @@ static struct file_view *find_view_range( const void *addr, size_t size )
}
@@ -115,7 +115,7 @@ index 00b29bc5d1d..667401aaa93 100644
/***********************************************************************
* try_map_free_area
*
@@ -1035,65 +1008,11 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
@@ -1084,65 +1057,11 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
return NULL;
}
@@ -181,7 +181,7 @@ index 00b29bc5d1d..667401aaa93 100644
*/
static void *find_reserved_free_area( void *base, void *end, size_t size, int top_down )
{
@@ -1307,8 +1226,7 @@ static void delete_view( struct file_view *view ) /* [in] View */
@@ -1356,8 +1275,7 @@ static void delete_view( struct file_view *view ) /* [in] View */
{
if (!(view->protect & VPROT_SYSTEM)) unmap_area( view->base, view->size );
set_page_vprot( view->base, view->size, 0 );
@@ -191,7 +191,7 @@ index 00b29bc5d1d..667401aaa93 100644
wine_rb_remove( &views_tree, &view->entry );
*(struct file_view **)view = next_free_view;
next_free_view = view;
@@ -1356,8 +1274,7 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz
@@ -1405,8 +1323,7 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz
set_page_vprot( base, size, vprot );
wine_rb_put( &views_tree, view->base, &view->entry );
@@ -201,7 +201,7 @@ index 00b29bc5d1d..667401aaa93 100644
*view_ret = view;
@@ -1589,6 +1506,7 @@ struct alloc_area
@@ -1651,6 +1568,7 @@ struct alloc_area
int top_down;
void *limit;
void *result;
@@ -209,7 +209,7 @@ index 00b29bc5d1d..667401aaa93 100644
};
/***********************************************************************
@@ -1630,6 +1548,210 @@ static int CDECL alloc_reserved_area_callback( void *start, SIZE_T size, void *a
@@ -1692,6 +1610,210 @@ static int CDECL alloc_reserved_area_callback( void *start, SIZE_T size, void *a
return 0;
}
@@ -420,7 +420,7 @@ index 00b29bc5d1d..667401aaa93 100644
/***********************************************************************
* map_fixed_area
*
@@ -1715,11 +1837,15 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
@@ -1777,11 +1899,15 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
alloc.size = size;
alloc.top_down = top_down;
alloc.limit = (void*)(get_zero_bits_64_mask( zero_bits_64 ) & (UINT_PTR)user_space_limit);
@@ -439,7 +439,7 @@ index 00b29bc5d1d..667401aaa93 100644
}
if (mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down ))
@@ -1731,15 +1857,6 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
@@ -1793,15 +1919,6 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
goto done;
}
@@ -455,14 +455,14 @@ index 00b29bc5d1d..667401aaa93 100644
view_size = size + granularity_mask + 1;
for (;;)
@@ -2392,6 +2509,7 @@ void virtual_init(void)
@@ -2456,6 +2573,7 @@ void virtual_init(void)
if (preload_reserve_start)
address_space_start = min( address_space_start, preload_reserve_start );
}
+ TRACE("preload reserve %p-%p.\n", preload_reserve_start, preload_reserve_end);
}
size = ROUND_SIZE( 0, sizeof(TEB) ) + max( MINSIGSTKSZ, 8192 );
size = teb_size + max( MINSIGSTKSZ, 8192 );
--
2.27.0