X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.c;h=389bdba5166e491e345080abd03a448577f5faeb;hb=d3f0cb2bbea928854c0e05fcc43f9447a01c71c6;hp=42755e52957396bfe2a74319382b66f6ecb4d17f;hpb=b34d6a805a50ee4a897b0a53bbc0b89e3eb7f72e;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 42755e52..389bdba5 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -44,16 +44,29 @@
 static void * psxMapDefault(unsigned long addr, size_t size,
 			    int is_fixed, enum psxMapTag tag)
 {
-#if !P_HAVE_MMAP
 	void *ptr;
-
-	ptr = malloc(size);
+#if !P_HAVE_MMAP
+	ptr = calloc(1, size);
 	return ptr ? ptr : MAP_FAILED;
 #else
 	int flags = MAP_PRIVATE | MAP_ANONYMOUS;
 
-	return mmap((void *)(uintptr_t)addr, size,
+	ptr = mmap((void *)(uintptr_t)addr, size,
 		    PROT_READ | PROT_WRITE, flags, -1, 0);
+#ifdef MADV_HUGEPAGE
+	if (size >= 2*1024*1024) {
+		if (ptr != MAP_FAILED && ((uintptr_t)ptr & (2*1024*1024 - 1))) {
+			// try to manually realign assuming bottom-to-top alloc
+			munmap(ptr, size);
+			addr = (uintptr_t)ptr & ~(2*1024*1024 - 1);
+			ptr = mmap((void *)(uintptr_t)addr, size,
+				PROT_READ | PROT_WRITE, flags, -1, 0);
+		}
+		if (ptr != MAP_FAILED)
+			madvise(ptr, size, MADV_HUGEPAGE);
+	}
+#endif
+	return ptr;
 #endif
 }