nasmlib/file: move memory-mapping functions out of file.c

Move memory-mapping functions from file.c into a separate mmap.c.
This will be cleaner especially once (if) we end up doing a Windows
implementation, which is likely to look entirely different.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

4 files changed, 21 insertions, 8 deletions

diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index 54b1b24c..76378c66 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -82,7 +82,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
 	nasmlib/ver.$(O) \
 	nasmlib/crc64.$(O) nasmlib/malloc.$(O) \
 	nasmlib/error.$(O) nasmlib/md5c.$(O) nasmlib/string.$(O) \
-	nasmlib/file.$(O) nasmlib/ilog2.$(O) \
+	nasmlib/file.$(O) nasmlib/mmap.$(O) nasmlib/ilog2.$(O) \
 	nasmlib/realpath.$(O) nasmlib/filename.$(O) nasmlib/srcfile.$(O) \
 	nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O) \
 	nasmlib/rbtree.$(O) nasmlib/hashtbl.$(O) \
@@ -384,7 +384,8 @@ nasmlib/crc64.$(O): nasmlib/crc64.c config/msvc.h config/unknown.h \
 nasmlib/error.$(O): nasmlib/error.c config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/file.$(O): nasmlib/file.c config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h \
+ nasmlib/file.h
 nasmlib/filename.$(O): nasmlib/filename.c config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h \
@@ -398,6 +399,9 @@ nasmlib/malloc.$(O): nasmlib/malloc.c config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/md5c.$(O): nasmlib/md5c.c config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/md5.h include/nasmint.h
+nasmlib/mmap.$(O): nasmlib/mmap.c config/msvc.h config/unknown.h \
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h \
+ nasmlib/file.h
 nasmlib/raa.$(O): nasmlib/raa.c config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h \
  include/raa.h
diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak
index 68900ab3..df27ac59 100644
--- a/Mkfiles/netware.mak
+++ b/Mkfiles/netware.mak
@@ -59,7 +59,7 @@ LIBOBJ = snprintf.o vsnprintf.o strlcpy.o \
 	ver.o \
 	crc64.o malloc.o \
 	error.o md5c.o string.o \
-	file.o ilog2.o \
+	file.o mmap.o ilog2.o \
 	realpath.o filename.o srcfile.o \
 	zerobuf.o readnum.o bsi.o \
 	rbtree.o hashtbl.o \
@@ -225,7 +225,7 @@ crc64.o: crc64.c config.h msvc.h unknown.h watcom.h compiler.h hashtbl.h \
 error.o: error.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
  nasmlib.h
 file.o: file.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
- nasmlib.h
+ nasmlib.h file.h
 filename.o: filename.c config.h msvc.h unknown.h watcom.h compiler.h \
  nasmint.h nasmlib.h
 hashtbl.o: hashtbl.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
@@ -236,6 +236,8 @@ ilog2.o: ilog2.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
 malloc.o: malloc.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
  nasmlib.h
 md5c.o: md5c.c config.h msvc.h unknown.h watcom.h compiler.h md5.h nasmint.h
+mmap.o: mmap.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
+ nasmlib.h file.h
 raa.o: raa.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
  nasmlib.h raa.h
 rbtree.o: rbtree.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak
index de2a8702..4f6c291a 100644
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -75,7 +75,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) &
 	nasmlib/ver.$(O) &
 	nasmlib/crc64.$(O) nasmlib/malloc.$(O) &
 	nasmlib/error.$(O) nasmlib/md5c.$(O) nasmlib/string.$(O) &
-	nasmlib/file.$(O) nasmlib/ilog2.$(O) &
+	nasmlib/file.$(O) nasmlib/mmap.$(O) nasmlib/ilog2.$(O) &
 	nasmlib/realpath.$(O) nasmlib/filename.$(O) nasmlib/srcfile.$(O) &
 	nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O) &
 	nasmlib/rbtree.$(O) nasmlib/hashtbl.$(O) &
@@ -373,7 +373,8 @@ nasmlib/crc64.$(O): nasmlib/crc64.c config/msvc.h config/unknown.h &
 nasmlib/error.$(O): nasmlib/error.c config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/file.$(O): nasmlib/file.c config/msvc.h config/unknown.h &
- config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h &
+ nasmlib/file.h
 nasmlib/filename.$(O): nasmlib/filename.c config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h &
@@ -387,6 +388,9 @@ nasmlib/malloc.$(O): nasmlib/malloc.c config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/md5c.$(O): nasmlib/md5c.c config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/md5.h include/nasmint.h
+nasmlib/mmap.$(O): nasmlib/mmap.c config/msvc.h config/unknown.h &
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h &
+ nasmlib/file.h
 nasmlib/raa.$(O): nasmlib/raa.c config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h &
  include/raa.h
diff --git a/Mkfiles/owlinux.mak b/Mkfiles/owlinux.mak
index 4bff0322..ae644716 100644
--- a/Mkfiles/owlinux.mak
+++ b/Mkfiles/owlinux.mak
@@ -86,7 +86,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
 	nasmlib/ver.$(O) \
 	nasmlib/crc64.$(O) nasmlib/malloc.$(O) \
 	nasmlib/error.$(O) nasmlib/md5c.$(O) nasmlib/string.$(O) \
-	nasmlib/file.$(O) nasmlib/ilog2.$(O) \
+	nasmlib/file.$(O) nasmlib/mmap.$(O) nasmlib/ilog2.$(O) \
 	nasmlib/realpath.$(O) nasmlib/filename.$(O) nasmlib/srcfile.$(O) \
 	nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O) \
 	nasmlib/rbtree.$(O) nasmlib/hashtbl.$(O) \
@@ -382,7 +382,7 @@ nasmlib/error.$(O): nasmlib/error.c config/config.h config/msvc.h \
  include/nasmlib.h
 nasmlib/file.$(O): nasmlib/file.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
- include/nasmlib.h
+ include/nasmlib.h nasmlib/file.h
 nasmlib/filename.$(O): nasmlib/filename.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
  include/nasmlib.h
@@ -400,6 +400,9 @@ nasmlib/malloc.$(O): nasmlib/malloc.c config/config.h config/msvc.h \
 nasmlib/md5c.$(O): nasmlib/md5c.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/md5.h \
  include/nasmint.h
+nasmlib/mmap.$(O): nasmlib/mmap.c config/config.h config/msvc.h \
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
+ include/nasmlib.h nasmlib/file.h
 nasmlib/raa.$(O): nasmlib/raa.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
  include/nasmlib.h include/raa.h