reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-28 14:10:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libwine: Reenable the memory reservation code on FreeBSD.

Browse Source
This commit is contained in:
Francois Gouget 2009-03-08 23:42:43 +01:00 committed by Alexandre Julliard
parent b0cd0d1ea8
commit ae28fdb560
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/wine/mmap.c
View File

@ -243,7 +243,7 @@ static inline int mmap_reserve( void *addr, size_t size )
* *
* Reserve as much memory as possible in the given area. * Reserve as much memory as possible in the given area.
*/ */
#if defined(__i386__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) /* commented out until FreeBSD gets fixed */ #ifdef __i386__
static void reserve_area( void *addr, void *end ) static void reserve_area( void *addr, void *end )
{ {
size_t size = (char *)end - (char *)addr; size_t size = (char *)end - (char *)addr;
@ -343,7 +343,7 @@ void mmap_init(void)
{ {
struct reserved_area *area; struct reserved_area *area;
struct list *ptr; struct list *ptr;
#if defined(__i386__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) /* commented out until FreeBSD gets fixed */ #ifdef __i386__
char stack; char stack;
char * const stack_ptr = &stack; char * const stack_ptr = &stack;
char *user_space_limit = (char *)0x7ffe0000; char *user_space_limit = (char *)0x7ffe0000;
@ -369,8 +369,8 @@ void mmap_init(void)
char *base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) - (granularity_mask + 1); char *base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) - (granularity_mask + 1);
if (base > user_space_limit) reserve_area( user_space_limit, base ); if (base > user_space_limit) reserve_area( user_space_limit, base );
base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) + (granularity_mask + 1); base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) + (granularity_mask + 1);
#ifdef linux #if defined(linux) || defined(__FreeBSD__)
/* Linux heuristic: assume the stack is near the end of the address */ /* Heuristic: assume the stack is near the end of the address */
/* space, this avoids a lot of futile allocation attempts */ /* space, this avoids a lot of futile allocation attempts */
end = (char *)(((unsigned long)base + 0x0fffffff) & 0xf0000000); end = (char *)(((unsigned long)base + 0x0fffffff) & 0xf0000000);
#endif #endif