From: sparky4 <sparky4@cock.li>
Date: Wed, 29 Jul 2015 00:34:55 +0000 (-0500)
Subject: what the fuck!?!?
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=37b3feef9bd6d93de08d5c5e92bcb5332c3a8a22;p=16.git

what the fuck!?!?
	modified:   16.hed
	new file:   DEBUG.16
	new file:   MMDUMP.16
	new file:   PROFILE.16
	modified:   exmmtest.exe
	modified:   fmemtest.exe
	modified:   makefile
	modified:   src/exmmtest.c
	modified:   src/lib/16_ca.c
	modified:   src/lib/16_head.h
	modified:   src/lib/16_mm.h
---

diff --git a/16.hed b/16.hed
index 4787a4f0..777f9138 100644
Binary files a/16.hed and b/16.hed differ
diff --git a/DEBUG.16 b/DEBUG.16
new file mode 100644
index 00000000..eaa6aa6e
--- /dev/null
+++ b/DEBUG.16
@@ -0,0 +1,17 @@
+Seg:0	Size:6827	Owner:0x21ac
+Seg:1b84	Size:33	Owner:0xc846
+Seg:1ba5	Size:256	Owner:0xc258
+Seg:1f4a	Size:45239	Owner:0xfe54
+Seg:d022	Size:4294967263	Owner:0xc483
+Seg:d022	Size:4294967263	Owner:0x0
+Seg:d022	Size:4294967263	Owner:0x8004
+Seg:d022	Size:4294967263	Owner:0x6f6
+Seg:d022	Size:4294967263	Owner:0x1
+Seg:d022	Size:4294967263	Owner:0x9a08
+Seg:d022	Size:4294967263	Owner:0x181e
+Seg:d022	Size:4294967263	Owner:0xea46
+Seg:d022	Size:4294967263	Owner:0x674
+Seg:d022	Size:4294967263	Owner:0x476
+Seg:d022	Size:419	Owner:0x0
+Seg:d1c5	Size:1959	Owner:0xefb4
+Seg:e000	Size:4294909951	Owner:0x5de5
diff --git a/MMDUMP.16 b/MMDUMP.16
new file mode 100644
index 00000000..4e552cd6
Binary files /dev/null and b/MMDUMP.16 differ
diff --git a/PROFILE.16 b/PROFILE.16
new file mode 100644
index 00000000..e69de29b
diff --git a/exmmtest.exe b/exmmtest.exe
index a180d7a4..0c814a41 100644
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/fmemtest.exe b/fmemtest.exe
index dd8b328a..c1c14510 100644
Binary files a/fmemtest.exe and b/fmemtest.exe differ
diff --git a/makefile b/makefile
index 82200449..b3efaf54 100644
--- a/makefile
+++ b/makefile
@@ -21,7 +21,7 @@ WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
 ZFLAGS=-zk0 -zu -zc# -zm# -zdp# -zp16 -zq
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1
-CFLAGS=-ei -wo -x -mc -r -fh=16.hed -k60000#16384#
+CFLAGS=-ei -wo -x -mc -r -k60000 -fh=16.hed#16384#
 OFLAGS=-ot -ox -ob -oh -or -om -ol# -ol+
 FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS) $(ZFLAGS)
 
diff --git a/src/exmmtest.c b/src/exmmtest.c
index afbc9d04..2c301c17 100644
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -36,7 +36,7 @@
 
 //file load or read definition
 #define FILERL
-#define FILEREAD
+//#define FILEREAD
 
 void
 main(int argc, char *argv[])
diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index f74a5710..8e79a438 100644
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -337,7 +337,7 @@ boolean CA_ReadFile(char *filename, memptr *ptr, mminfo_t *mm)
 		return false;
 
 	size = filelength(handle);
-	if(!CA_FarRead(handle,*ptr,size, mm))
+	if(!CA_FarRead(handle, (void huge *)ptr,size, mm))
 	{
 		close(handle);
 		return false;
@@ -369,7 +369,7 @@ boolean CA_LoadFile(char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi)
 
 	size = filelength (handle);
 	MM_GetPtr(ptr,size, mm, mmi);
-	if(!CA_FarRead(handle,*ptr,size, mm))
+	if(!CA_FarRead(handle,(void huge *)ptr,size, mm))
 	{
 		close(handle);
 		return false;
diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index 4a923a8c..4b2e226c 100644
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -153,7 +153,8 @@ typedef union REGPACK	regs_t;
 typedef	enum	{false,true}	boolean;
 //I hope this is correct!
 //__self
-typedef void __based(__self) * memptr;
+//typedef void __based(__self) * memptr;
+typedef __segment * memptr;
 typedef struct
 {
 	int old_mode;	//old video mode before game!
diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 0b562da7..083a4d29 100644
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -36,7 +36,7 @@
 #endif
 
 
-#define SAVENEARHEAP	0//x200		// space to leave in data segment
+#define SAVENEARHEAP	0x200		// space to leave in data segment
 #define SAVEFARHEAP	0x400			// space to leave in far heap
 
 #define	BUFFERSIZE		0x1000		// miscelanious, allways available buffer