Fixing header and removing unused function

hernanmd · Apr 8, 2022 · e9f3a44 · e9f3a44
1 parent 2c5abc1
commit e9f3a44
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 45 deletions.
diff --git a/extracted/vm/include/common/sq.h b/extracted/vm/include/common/sq.h
@@ -57,7 +57,6 @@
  * If the attempt fails, answer null.  If the attempt succeeds, answer the
  * start of the region and assign its size through asp.
  */
-extern void *sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(sqInt sz, void *minAddr, sqInt *asp);
 extern void sqDeallocateMemorySegmentAtOfSize(void *addr, sqInt sz);
 #endif /* SPURVM */
 /* Platform-dependent memory size adjustment macro. */

diff --git a/extracted/vm/src/win/sqWin32SpurAlloc.c b/extracted/vm/src/win/sqWin32SpurAlloc.c
@@ -156,6 +156,7 @@ sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(sqInt size, void *minAddress
 			continue;
 		}
 		alloc = VirtualAlloc(address, bytes, MEM_COMMIT|MEM_RESERVE, PAGE_READWRITE);
+		logError("%p %p %lld", alloc, address, bytes);
 		/* For some reason (large page support?) we can ask for a page-aligned
 		 * address such as 0xNNNNf000 but VirtualAlloc will answer 0xNNNN0000.
 		 * So accept allocs above minAddress rather than allocs above address
@@ -168,9 +169,8 @@ sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(sqInt size, void *minAddress
 			return alloc;
 		}
 		if (!alloc) {
-			DWORD lastError = GetLastError();
-			logWarn("Unable to VirtualAlloc committed memory at desired address (%lld bytes requested at %p, above %p), Error: %lu\n",
-						bytes, address, minAddress, lastError);
+			logWarn("Unable to VirtualAlloc committed memory at desired address (%lld bytes requested at %p, above %p)", bytes, address, minAddress);
+			logErrorFromGetLastError("Unable to VirtualAlloc committed memory at desired address");
 			return 0;
 		}
 		/* VirtualAlloc answered a mapping well away from where Spur prefers.

diff --git a/src/memoryUnix.c b/src/memoryUnix.c
@@ -196,44 +196,3 @@ sqDeallocateMemorySegmentAtOfSize(void *addr, sqInt sz)
 		logErrorFromErrno("sqDeallocateMemorySegment... munmap");
 }
 
-void *
-sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(sqInt size, void *minAddress, sqInt *allocatedSizePointer)
-{
-	void *alloc;
-	long bytes = roundUpToPage(size);
-	void *startAddress;
-	int count = 0;
-
-	if (!pageSize) {
-		pageSize = getpagesize();
-		pageMask = pageSize - 1;
-	}
-	*allocatedSizePointer = bytes;
-	while ((char *)minAddress + bytes > (char *)minAddress) {
-		startAddress = (void*)roundUpToPage((sqInt)minAddress);
-
-		alloc = mmap(startAddress, bytes,
-					PROT_READ | PROT_WRITE, MAP_ANON | MAP_SHARED, -1, 0);
-		if (alloc == MAP_FAILED) {
-			logWarnFromErrno("sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto mmap");
-			return 0;
-		}
-
-		if(count >= 6){
-			logTrace("More than 6 retries... maybe something is wrong\n");
-		}
-
-		logTrace("Asked: %10p %10p %10p\n", alloc, minAddress, startAddress);
-		if (alloc >= minAddress){
-			logTrace("Allocated Piece: %10p\n", alloc);
-			return alloc;
-		}
-
-		count++;
-
-		if (munmap(alloc, bytes) != 0)
-			logWarnFromErrno("sqAllocateMemorySegment... munmap");
-		minAddress = (void *)((char *)minAddress + bytes);
-	}
-	return 0;
-}