compatible with FreeBSD mmap()

FreeBSD mmap() requires MAP_FIXED to map to desired address.
pharo-project · Oct 27, 2024 · 52bca4d · 52bca4d
1 parent ecf2995
commit 52bca4d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/memoryUnix.c b/src/memoryUnix.c
@@ -103,6 +103,8 @@ void* allocateJITMemory(usqInt desiredSize, usqInt desiredPosition){
 #else
 	int additionalFlags = 0;
 #endif
+
+	if (desiredPosition) additionalFlags |= MAP_FIXED;
 
 	logDebug("Trying to allocate JIT memory in %p\n", (void* )desiredBaseAddressAligned);
 
@@ -123,6 +125,7 @@ sqAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize, usqInt desiredBaseA
     char *heap    =  0;
     sqInt   heapSize    =  0;
     sqInt   heapLimit    =  0;
+    int additionalFlags  = desiredBaseAddress ? MAP_FIXED : 0;
 
 	pageSize = getpagesize();
 	pageMask = ~(pageSize - 1);
@@ -142,7 +145,7 @@ sqAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize, usqInt desiredBaseA
 			(void* )desiredBaseAddressAligned);
 
 	while ((!heap) && (heapLimit >= minHeapSize)) {
-		if (MAP_FAILED == (heap = mmap((void*) desiredBaseAddressAligned, heapLimit, MAP_PROT, MAP_FLAGS, devZero, 0))) {
+		if (MAP_FAILED == (heap = mmap((void*) desiredBaseAddressAligned, heapLimit, MAP_PROT, MAP_FLAGS | additionalFlags, devZero, 0))) {
 			heap = 0;
 			heapLimit = valign(heapLimit / 4 * 3);
 		}