X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Flightrec%2Fmem.c;h=9134d893916100053d7566a56fbfecec71e419a6;hb=c6a249e3b48161bcf6d8ab3eb0538d96edd67797;hp=ff67e3d010b3fa28efa3dd070dc0c3c19bda5fe4;hpb=f854810594658feb59b1e67c2d97e19553b4b34c;p=pcsx_rearmed.git

diff --git a/libpcsxcore/lightrec/mem.c b/libpcsxcore/lightrec/mem.c
index ff67e3d0..9134d893 100644
--- a/libpcsxcore/lightrec/mem.c
+++ b/libpcsxcore/lightrec/mem.c
@@ -3,7 +3,9 @@
  * Copyright (C) 2022 Paul Cercueil <paul@crapouillou.net>
  */
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
@@ -31,8 +33,6 @@
 #define MFD_HUGETLB 0x0004
 #endif
 
-void *code_buffer;
-
 static const uintptr_t supported_io_bases[] = {
 	0x0,
 	0x10000000,
@@ -55,8 +55,12 @@ static void * mmap_huge(void *addr, size_t length, int prot, int flags,
 
 	if (map == MAP_FAILED) {
 		map = mmap(addr, length, prot, flags, fd, offset);
-		if (map != MAP_FAILED)
+		if (map != MAP_FAILED) {
 			printf("Regular mmap to address 0x%lx succeeded\n", (uintptr_t) addr);
+#ifdef MADV_HUGEPAGE
+			madvise(map, length, MADV_HUGEPAGE);
+#endif
+		}
 	}
 
 	return map;
@@ -91,11 +95,16 @@ static int lightrec_mmap_ram(bool hugetlb)
 		base = supported_io_bases[i];
 
 		for (j = 0; j < 4; j++) {
-			map = mmap_huge((void *)(base + j * 0x200000),
-					0x200000, PROT_READ | PROT_WRITE,
-					MAP_SHARED | MAP_FIXED, memfd, 0);
+			void *base_ptr = (void *)(base + j * 0x200000);
+			map = mmap_huge(base_ptr, 0x200000, PROT_READ | PROT_WRITE,
+					MAP_SHARED | MAP_FIXED_NOREPLACE, memfd, 0);
 			if (map == MAP_FAILED)
 				break;
+			// some systems ignore MAP_FIXED_NOREPLACE
+			if (map != base_ptr) {
+				munmap(map, 0x200000);
+				break;
+			}
 		}
 
 		/* Impossible to map using this base */
@@ -142,7 +151,7 @@ int lightrec_init_mmap(void)
 
 	map = mmap((void *)(base + 0x1f000000), 0x10000,
 		   PROT_READ | PROT_WRITE,
-		   MAP_PRIVATE | MAP_FIXED_NOREPLACE | MAP_ANONYMOUS, 0, 0);
+		   MAP_PRIVATE | MAP_FIXED_NOREPLACE | MAP_ANONYMOUS, -1, 0);
 	if (map == MAP_FAILED) {
 		err = -EINVAL;
 		fprintf(stderr, "Unable to mmap parallel port\n");
@@ -153,7 +162,7 @@ int lightrec_init_mmap(void)
 
 	map = mmap_huge((void *)(base + 0x1fc00000), 0x200000,
 			PROT_READ | PROT_WRITE,
-			MAP_PRIVATE | MAP_FIXED_NOREPLACE | MAP_ANONYMOUS, 0, 0);
+			MAP_PRIVATE | MAP_FIXED_NOREPLACE | MAP_ANONYMOUS, -1, 0);
 	if (map == MAP_FAILED) {
 		err = -EINVAL;
 		fprintf(stderr, "Unable to mmap BIOS\n");
@@ -176,7 +185,7 @@ int lightrec_init_mmap(void)
 	map = mmap_huge((void *)(base + 0x800000), CODE_BUFFER_SIZE,
 			PROT_EXEC | PROT_READ | PROT_WRITE,
 			MAP_PRIVATE | MAP_FIXED_NOREPLACE | MAP_ANONYMOUS,
-			0, 0);
+			-1, 0);
 	if (map == MAP_FAILED) {
 		err = -EINVAL;
 		fprintf(stderr, "Unable to mmap code buffer\n");
@@ -190,7 +199,7 @@ int lightrec_init_mmap(void)
 err_unmap_scratch:
 	munmap(psxH, 0x10000);
 err_unmap_bios:
-	munmap(psxR, 0x80000);
+	munmap(psxR, 0x200000);
 err_unmap_parallel:
 	munmap(psxP, 0x10000);
 err_unmap:
@@ -205,7 +214,7 @@ void lightrec_free_mmap(void)
 
 	munmap(code_buffer, CODE_BUFFER_SIZE);
 	munmap(psxH, 0x10000);
-	munmap(psxR, 0x80000);
+	munmap(psxR, 0x200000);
 	munmap(psxP, 0x10000);
 	for (i = 0; i < 4; i++)
 		munmap((void *)((uintptr_t)psxM + i * 0x200000), 0x200000);