Changeset 9651 for branches

Timestamp:

Jun 1, 2008, 11:31:55 PM (16 years ago)

Author:

Gary Byers

Message:

CommitMemory: on windows, the region that contains NIL is already mapped,
so just return true.

File:

• branches/win64/lisp-kernel/memory.c (modified) (2 diffs)

branches/win64/lisp-kernel/memory.c

@@ -222 +222 @@
 #endif
 #ifdef WINDOWS
+  if ((start < ((LogicalAddress)nil_value)) &&
+      (((LogicalAddress)nil_value) < (start+len))) {
+    /* nil area is in the executable on Windows, do nothing */
+    return true;
+  }
   rc = VirtualAlloc(start, len, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
   if (!rc) {
@@ -351 +356 @@
 
 int
-MapFile(LogicalAddress addr, natural pos, natural nbytes, int permissions, int fd) {
+MapFile(LogicalAddress addr, natural pos, natural nbytes, int permissions, int fd) 
+{
 #ifdef WINDOWS
 #if 0