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 4787a4f06d484993c11b32a54303440423d6be7b..777f9138b2f3b3a74afdfad9401d22f09bd677bc 100644 (file)
Binary files a/16.hed and b/16.hed differ

diff --git a/DEBUG.16 b/DEBUG.16
new file mode 100644 (file)
index 0000000..eaa6aa6
--- /dev/null
+++ b/DEBUG.16
@@ -0,0 +1,17 @@
+Seg:0  Size:6827       Owner:0x21ac\r
+Seg:1b84       Size:33 Owner:0xc846\r
+Seg:1ba5       Size:256        Owner:0xc258\r
+Seg:1f4a       Size:45239      Owner:0xfe54\r
+Seg:d022       Size:4294967263 Owner:0xc483\r
+Seg:d022       Size:4294967263 Owner:0x0\r
+Seg:d022       Size:4294967263 Owner:0x8004\r
+Seg:d022       Size:4294967263 Owner:0x6f6\r
+Seg:d022       Size:4294967263 Owner:0x1\r
+Seg:d022       Size:4294967263 Owner:0x9a08\r
+Seg:d022       Size:4294967263 Owner:0x181e\r
+Seg:d022       Size:4294967263 Owner:0xea46\r
+Seg:d022       Size:4294967263 Owner:0x674\r
+Seg:d022       Size:4294967263 Owner:0x476\r
+Seg:d022       Size:419        Owner:0x0\r
+Seg:d1c5       Size:1959       Owner:0xefb4\r
+Seg:e000       Size:4294909951 Owner:0x5de5\r

diff --git a/MMDUMP.16 b/MMDUMP.16
new file mode 100644 (file)
index 0000000..4e552cd
Binary files /dev/null and b/MMDUMP.16 differ

diff --git a/PROFILE.16 b/PROFILE.16
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/exmmtest.exe b/exmmtest.exe
index a180d7a4cae0046b7ef1a1685eabd81b28ad7ef6..0c814a41b29c631caa2cd89a3bdc531a7a0dd6e7 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/fmemtest.exe b/fmemtest.exe
index dd8b328ada3f1de91a6a84d8241c7b3db6306173..c1c1451031a3fb11f2479c0a72bd129f6cf3ee47 100644 (file)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/makefile b/makefile
index 822004493d8e8929c012e8c5f4665cd6a4893755..b3efaf5453b6a0190d119bacdb291e041244c1a9 100644 (file)
--- 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 afbc9d042000e39255208fa1aab0fb7bca977f0b..2c301c17c63e1e11a601e7a011f20c49fa799561 100644 (file)
--- 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 f74a5710a4349999c819f619c959e02f890c7f2d..8e79a438e20d5b3a71f4f5c02ee4bd691dd428d5 100644 (file)
--- 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;\r
 \r
        size = filelength(handle);\r
-       if(!CA_FarRead(handle,*ptr,size, mm))\r
+       if(!CA_FarRead(handle, (void huge *)ptr,size, mm))\r
        {\r
                close(handle);\r
                return false;\r
@@ -369,7 +369,7 @@ boolean CA_LoadFile(char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi)
 \r
        size = filelength (handle);\r
        MM_GetPtr(ptr,size, mm, mmi);\r
-       if(!CA_FarRead(handle,*ptr,size, mm))\r
+       if(!CA_FarRead(handle,(void huge *)ptr,size, mm))\r
        {\r
                close(handle);\r
                return false;\r

diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index 4a923a8c2c8873c72d05d825621707caeee69534..4b2e226c45203c12805c094ce6d789560fd8cabb 100644 (file)
--- 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
 {\r
        int old_mode;   //old video mode before game!

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 0b562da7eaf3908fe24dfba0d9564d5dbc19f8b5..083a4d299c9edac773a18e1e40688c40b9e62d32 100644 (file)
--- 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