comparison loader/ext.c @ 21248:2de480457872

Remove useless fd parameter for mmap_anon

21247:c0400a8091a8

    if (size_high || offset_high)
        printf("offsets larger than 4Gb not supported\n");

    if (unix_handle == -1)
    {
        ret = mmap_anon( start, size_low, prot, flags, &fd, offset_low );
    }
    else 
    {
        fd = unix_handle;
        ret = mmap( start, size_low, prot, flags, fd, offset_low );

	mmap_access |=PROT_READ;
    else
	mmap_access |=PROT_READ|PROT_WRITE;

    if(anon)
        answer=mmap_anon(NULL, len, mmap_access, MAP_PRIVATE, &hFile, 0);
    else
        answer=mmap(NULL, len, mmap_access, MAP_PRIVATE, hFile, 0);

    if(anon && hFile != -1)
        close(hFile);
    if(answer!=(LPVOID)-1)
    {
	if(fm==0)
	{
	    fm = (file_mapping*) malloc(sizeof(file_mapping));

	}
	else
	    fm->name=NULL;
	fm->mapping_size=len;

	if(anon && hFile != -1)
	    close(hFile);
	return (HANDLE)answer;
    }
    return (HANDLE)0;
}
WIN_BOOL WINAPI UnmapViewOfFile(LPVOID handle)

	    return NULL;
	}
    }

    answer=mmap_anon(address, size, PROT_READ | PROT_WRITE | PROT_EXEC,
            MAP_PRIVATE, &fd, 0);
//    answer=FILE_dommap(-1, address, 0, size, 0, 0,
//	PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE);
    if (fd != -1)
        close(fd);

    if (answer != (void *)-1 && address && answer != address) {
	/* It is dangerous to try mmap() with MAP_FIXED since it does not
	   always detect conflicts or non-allocation and chaos ensues after
	   a successful call but an overlapping or non-allocated region.  */

21248:2de480457872

    if (size_high || offset_high)
        printf("offsets larger than 4Gb not supported\n");

    if (unix_handle == -1)
    {
        ret = mmap_anon( start, size_low, prot, flags, offset_low );
    }
    else 
    {
        fd = unix_handle;
        ret = mmap( start, size_low, prot, flags, fd, offset_low );

	mmap_access |=PROT_READ;
    else
	mmap_access |=PROT_READ|PROT_WRITE;

    if(anon)
        answer=mmap_anon(NULL, len, mmap_access, MAP_PRIVATE, 0);
    else
        answer=mmap(NULL, len, mmap_access, MAP_PRIVATE, hFile, 0);

    if(answer!=(LPVOID)-1)
    {
	if(fm==0)
	{
	    fm = (file_mapping*) malloc(sizeof(file_mapping));

	}
	else
	    fm->name=NULL;
	fm->mapping_size=len;

	return (HANDLE)answer;
    }
    return (HANDLE)0;
}
WIN_BOOL WINAPI UnmapViewOfFile(LPVOID handle)

	    return NULL;
	}
    }

    answer=mmap_anon(address, size, PROT_READ | PROT_WRITE | PROT_EXEC,
            MAP_PRIVATE, 0);
//    answer=FILE_dommap(-1, address, 0, size, 0, 0,
//	PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE);

    if (answer != (void *)-1 && address && answer != address) {
	/* It is dangerous to try mmap() with MAP_FIXED since it does not
	   always detect conflicts or non-allocation and chaos ensues after
	   a successful call but an overlapping or non-allocated region.  */