X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.h;h=de35b428b6197884a9ead179cce0d1e9c0e388ad;hb=734addea4c40d2e7fb6470bdf51ce96343a25e59;hp=010a26265d932149300e24804178c17c8cdb11b2;hpb=3b3f3b4bc62245426ea4dec22cbfaa7cfbf13645;p=16.git

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
old mode 100644
new mode 100755
index 010a2626..de35b428
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -23,11 +23,9 @@
 
 #include <string.h>
 #include <malloc.h>
-//#include <bios.h>
 #include "src/lib/16_head.h"
 #include "src/lib/16_hc.h"
-#include "src/lib/modex16.h"
-//#include "src/lib/16_ca.h"
+//#include "src/lib/modex16.h"
 //++++mh	#include "src/lib/16_in.h"
 
 #ifdef __DEBUG__		// 1 == Debug/Dev  ;  0 == Production/final
@@ -36,13 +34,17 @@
 #define OUT_OF_MEM_MSG	"\npee\n"
 #endif
 
+//#define GETNEWBLOCK {if(!(mmnew=mmfree))Quit("MM_GETNEWBLOCK: No free blocks!") ;mmfree=mmfree->next;}
+#define GETNEWBLOCK {if(!mm->mmfree)MML_ClearBlock(mm);mm->mmnew=mm->mmfree;mm->mmfree=mm->mmfree->next;}
 
-#define SAVENEARHEAP	0//_memavl()/4		// space to leave in data segment
+#define FREEBLOCK(x) {*x->useptr=NULL;x->next=mm->mmfree;mm->mmfree=x;}
+
+#define SAVENEARHEAP	0x200		// space to leave in data segment
 #define SAVEFARHEAP	0//x400			// space to leave in far heap
 
 #define	BUFFERSIZE		0x1000		// miscelanious, allways available buffer
 
-#define MAXBLOCKS		720
+#define MAXBLOCKS		1024
 
 
 
@@ -89,7 +91,6 @@
 typedef struct
 {
 	dword	nearheap,farheap,EMSmem,XMSmem,mainmem;
-	//__segment segu;
 } mminfotype;
 
 //==========================================================================
@@ -118,11 +119,13 @@ extern void		(* XMSaddr) (void);		// far pointer to XMS driver
 
 typedef struct mmblockstruct
 {
-	//word	start,length;
-	word	start;	dword length;
+	word	start,length;
+	//word	start;	dword length;
+	word	blob;	//for data larger than 64k
 	unsigned	attributes;
 	memptr		*useptr;	// pointer to the segment start
-	struct mmblockstruct huge *next;
+	//huge struct mmblockstruct huge *next;
+	struct mmblockstruct far *next;
 } mmblocktype;
 
 
@@ -130,14 +133,21 @@ typedef struct
 {
 	memptr bufferseg;
 	boolean		mmstarted, bombonerror, mmerror;
-	void huge	*farheap;
+	//huge void huge	*farheap;
+	void far	*farheap;
+#ifdef __BORLANDC__
+	void	*nearheap;
+#endif
+#ifdef __WATCOMC__
 	void __near	*nearheap;
+#endif
 	//byte		EMS_status;
 	unsigned	totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
 	unsigned int EMSVer;
 	word numUMBs,UMBbase[MAXUMBS];
 	//dword	numUMBs,UMBbase[MAXUMBS];
-	mmblocktype	huge mmblocks[MAXBLOCKS],huge *mmhead,huge *mmfree,huge *mmrover,huge *mmnew;
+	//huge mmblocktype	huge mmblocks[MAXBLOCKS],huge *mmhead,huge *mmfree,huge *mmrover,huge *mmnew;
+	mmblocktype	far mmblocks[MAXBLOCKS],far *mmhead,far *mmfree,far *mmrover,far *mmnew;
 } mminfo_t;
 
 /*
@@ -167,7 +177,7 @@ byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi);
 boolean MML_CheckForXMS(mminfo_t *mm);
 void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi);
 void MML_ShutdownXMS(mminfo_t *mm);
-void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm);
+void MML_UseSpace(word segstart, dword seglength, mminfo_t *mm);
 void MML_ClearBlock(mminfo_t *mm);
 
 void MM_Startup(mminfo_t *mm, mminfotype *mmi);
@@ -178,15 +188,15 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm);
 void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm);
 void MM_SetLock(memptr *baseptr, boolean locked, mminfo_t *mm);
 void MM_SortMem(mminfo_t *mm);
-void MM_ShowMemory(/*page_t *page, */mminfo_t *mm);
+void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm);
 void MM_DumpData(mminfo_t *mm);
 dword MM_UnusedMemory(mminfo_t *mm);
 dword MM_TotalFree(mminfo_t *mm);
 void MM_Report(/*page_t *page, */mminfo_t *mm, mminfotype *mmi);
 static void MM_EMSerr(byte *stri, byte err);
 void MM_BombOnError(boolean bomb, mminfo_t *mm);
-void MM_GetNewBlock(mminfo_t *mm);
-void MM_FreeBlock(mmblocktype *x, mminfo_t *mm);
+//void MM_GetNewBlock(mminfo_t *mm);
+//void MM_FreeBlock(mmblocktype *x, mminfo_t *mm);
 
 //==========================================================================