From: twinaphex Date: Tue, 13 Aug 2013 00:32:10 +0000 (+0200) Subject: (Win32) Some Win32 compatibility patches (courtesy of mudlord) X-Git-Tag: v1.85~8 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=picodrive.git;a=commitdiff_plain;h=e8b6193660a3227fcd113a1eb82ed48727ca8195 (Win32) Some Win32 compatibility patches (courtesy of mudlord) --- diff --git a/platform/libretro.c b/platform/libretro.c index d46cc4a..d246cad 100644 --- a/platform/libretro.c +++ b/platform/libretro.c @@ -10,7 +10,11 @@ #include #include #include +#ifndef _WIN32 #include +#else +#include +#endif #include #ifdef __MACH__ #include @@ -66,27 +70,75 @@ void cache_flush_d_inval_i(void *start, void *end) #endif } +#ifdef _WIN32 +void* mmap(void *desired_addr, + size_t len, + int mmap_prot, + int mmap_flags, + HANDLE fd, + size_t off) +{ + HANDLE fmh; + void *base_addr; + SECURITY_ATTRIBUTES sa; + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = TRUE; + fmh = CreateFileMapping(fd, &sa, PAGE_WRITECOPY , 0, len, NULL); + if (fmh == NULL){ return NULL; } + base_addr = MapViewOfFileEx(fmh, FILE_MAP_WRITE|FILE_MAP_READ, 0, off, len, desired_addr); + CloseHandle(fmh); + return base_addr; +} + +void munmap( + void *base_addr, + size_t len +) +{ + UnmapViewOfFile(base_addr); +} +#define MAP_FAILED 0 +#define PROT_READ 0 +#define PROT_WRITE 0 +#define MAP_PRIVATE 0 +#define MAP_ANONYMOUS 0 +#endif void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed) { - int flags = MAP_PRIVATE | MAP_ANONYMOUS; - void *req, *ret; - - req = (void *)addr; - ret = mmap(req, size, PROT_READ | PROT_WRITE, flags, -1, 0); - if (ret == MAP_FAILED) { - lprintf("mmap(%08lx, %zd) failed: %d\n", addr, size, errno); - return NULL; - } - - if (addr != 0 && ret != (void *)addr) { - lprintf("warning: wanted to map @%08lx, got %p\n", - addr, ret); - - if (is_fixed) { - munmap(ret, size); - return NULL; - } - } +#ifndef _WIN32 + int flags = 0; + void *ret = mmap((void*)addr,size,PROT_READ | PROT_WRITE, flags, -1, 0); + if (addr != 0 && ret != (void *)addr) { + lprintf("warning: wanted to map @%08lx, got %p\n", + addr, ret); + + if (is_fixed) { + munmap(ret, size); + return NULL; + } + } +#else + int flags = MAP_PRIVATE | MAP_ANONYMOUS; + void *req, *ret; + + req = (void *)addr; + ret = mmap(req, size, PROT_READ | PROT_WRITE, flags, -1, 0); + if (ret == MAP_FAILED) { + lprintf("mmap(%08lx, %zd) failed: %d\n", addr, size, errno); + return NULL; + } + + if (addr != 0 && ret != (void *)addr) { + lprintf("warning: wanted to map @%08lx, got %p\n", + addr, ret); + + if (is_fixed) { + munmap(ret, size); + return NULL; + } + } +#endif return ret; } @@ -132,10 +184,15 @@ void plat_munmap(void *ptr, size_t size) int plat_mem_set_exec(void *ptr, size_t size) { - int ret = mprotect(ptr, size, PROT_READ | PROT_WRITE | PROT_EXEC); - if (ret != 0) - lprintf("mprotect(%p, %zd) failed: %d\n", ptr, size, errno); - +#ifdef _WIN32 + int ret = VirtualProtect(ptr,size,PAGE_EXECUTE_READWRITE,0); + if (ret == 0) + lprintf("mprotect(%p, %zd) failed: %d\n", ptr, size, 0); +#else + int ret = mprotect(ptr, size, PROT_READ | PROT_WRITE | PROT_EXEC); + if (ret != 0) + lprintf("mprotect(%p, %zd) failed: %d\n", ptr, size, errno); +#endif return ret; }