From 3f3891ab3117fc61172eecccfabef0ac727f87a9 Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Sun, 14 May 2006 15:58:11 +0000
Subject: [PATCH] Move up NATMEM_OFFSET to 0x11000000. This is arbitrarily
 determined to be the base of the largest free block. Turns out SDL libraries
 are loaded around 0x10000000 so we have some luck here.

---
 SheepShaver/src/Windows/main_windows.cpp | 25 +++++-------------------
 SheepShaver/src/Windows/sysdeps.h        |  2 +-
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/SheepShaver/src/Windows/main_windows.cpp b/SheepShaver/src/Windows/main_windows.cpp
index 8b04b9b1..9725eb78 100755
--- a/SheepShaver/src/Windows/main_windows.cpp
+++ b/SheepShaver/src/Windows/main_windows.cpp
@@ -58,7 +58,6 @@
 const char ROM_FILE_NAME[] = "ROM";
 const char ROM_FILE_NAME2[] = "Mac OS ROM";
 
-const uintptr RAM_BASE = 0x20000000;		// Base address of RAM
 const uint32 SIG_STACK_SIZE = 0x10000;		// Size of signal stack
 
 
@@ -79,7 +78,6 @@ DWORD win_os_major;		// Windows OS version major
 
 
 // Global variables
-static bool lm_area_mapped = false;			// Flag: Low Memory area mmap()ped
 static int kernel_area = -1;				// SHM ID of Kernel Data area
 static bool rom_area_mapped = false;		// Flag: Mac ROM mmap()ped
 static bool ram_area_mapped = false;		// Flag: Mac RAM mmap()ped
@@ -261,14 +259,6 @@ int main(int argc, char **argv)
 		if (!PrefsEditor())
 			goto quit;
 
-	// Create Low Memory area (0x0000..0x3000)
-	if (vm_mac_acquire(0, 0x3000) < 0) {
-		sprintf(str, GetString(STR_LOW_MEM_MMAP_ERR), strerror(errno));
-		ErrorAlert(str);
-		goto quit;
-	}
-	lm_area_mapped = true;
-
 	// Create areas for Kernel Data
 	if (!kernel_data_init())
 		goto quit;
@@ -317,14 +307,13 @@ int main(int argc, char **argv)
 		WarningAlert(GetString(STR_SMALL_RAM_WARN));
 		RAMSize = 8*1024*1024;
 	}
-
-	if (vm_mac_acquire(RAM_BASE, RAMSize) < 0) {
+	RAMBase = 0;
+	if (vm_mac_acquire(RAMBase, RAMSize) < 0) {
 		sprintf(str, GetString(STR_RAM_MMAP_ERR), strerror(errno));
 		ErrorAlert(str);
 		goto quit;
 	}
-	RAMBaseHost = Mac2HostAddr(RAM_BASE);
-	RAMBase = RAM_BASE;
+	RAMBaseHost = Mac2HostAddr(RAMBase);
 	ram_area_mapped = true;
 	D(bug("RAM area at %p (%08x)\n", RAMBaseHost, RAMBase));
 
@@ -432,7 +421,7 @@ static void Quit(void)
 
 	// Delete RAM area
 	if (ram_area_mapped)
-		vm_mac_release(RAM_BASE, RAMSize);
+		vm_mac_release(RAMBase, RAMSize);
 
 	// Delete ROM area
 	if (rom_area_mapped)
@@ -447,10 +436,6 @@ static void Quit(void)
 	// Delete Kernel Data area
 	kernel_data_exit();
 
-	// Delete Low Memory area
-	if (lm_area_mapped)
-		vm_mac_release(0, 0x3000);
-
 	// Exit system routines
 	SysExit();
 
@@ -657,7 +642,7 @@ static DWORD tick_func(void *arg)
 	}
 
 	uint64 end = GetTicks_usec();
-	D(bug("%Ld ticks in %Ld usec = %f ticks/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
+	D(bug("%lu ticks in %lu usec = %f ticks/sec\n", (unsigned long)ticks, (unsigned long)(end - start), ticks * 1000000.0 / (end - start)));
 	return 0;
 }
 
diff --git a/SheepShaver/src/Windows/sysdeps.h b/SheepShaver/src/Windows/sysdeps.h
index 5b9f9152..aef4b837 100755
--- a/SheepShaver/src/Windows/sysdeps.h
+++ b/SheepShaver/src/Windows/sysdeps.h
@@ -52,7 +52,7 @@
 
 // Use Direct Addressing mode
 #define DIRECT_ADDRESSING 1
-#define NATMEM_OFFSET 0x02000000
+#define NATMEM_OFFSET 0x11000000
 
 // Always use the complete (non-stubs based) Ethernet driver
 #if DIRECT_ADDRESSING