X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.h;h=33e1e526cfb55f87c27e0120ec225a42f96d77a8;hb=c5a5d3be15dc4c1de46f86cec8dd5a161563b1b9;hp=4bb9f69367258f3b6cc931c809858d968c9c7994;hpb=31377c25387fcc208b2efb0b89a5cefbcab947f3;p=16.git

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
old mode 100644
new mode 100755
index 4bb9f693..33e1e526
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -25,6 +25,7 @@
 #include <malloc.h>
 #include "src/lib/16_head.h"
 #include "src/lib/16_hc.h"
+#include "src/lib/16_lib.h"
 //#include "src/lib/modex16.h"
 //++++mh	#include "src/lib/16_in.h"
 
@@ -35,26 +36,17 @@
 #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;mm->endid++;}
+#define GETNEWBLOCK {if(!mm->mmfree)MML_ClearBlock(mm);mm->mmnew=mm->mmfree;mm->mmfree=mm->mmfree->next;}
 
-#define FREEBLOCK(x) {*x->useptr=NULL;x->next=mm->mmfree;mm->mmfree=x;mm->endid--;}
-
-#define AARED		"\x1b[41;31m"
-#define AABLUE		"\x1b[44;34m"
-#define AAGREEN	"\x1b[42;32m"
-#define AAYELLOW	"\x1b[43;33m"
-#define AAGREY		"\x1b[47;37m"
-#define AABLACK	"\x1b[40;30m"
-#define AAWHITE		"\x1b[47;37m"
-#define AAMAGENTA	"\x1b[45;35m"
-#define AARESET	"\x1b[0m"
+#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		1024
+//moved to typdefst
+//#define MAXBLOCKS		1024
 
 
 
@@ -98,10 +90,11 @@
 
 //==========================================================================
 
-typedef struct
+//moved to typdefst
+/*typedef struct
 {
 	dword	nearheap,farheap,EMSmem,XMSmem,mainmem;
-} mminfotype;
+} mminfotype;*/
 
 //==========================================================================
 
@@ -124,17 +117,20 @@ extern void		(* XMSaddr) (void);		// far pointer to XMS driver
 #define PURGEMASK	0xfffc
 #define BASEATTRIBUTES	0	// unlocked, non purgable
 
-#define MAXUMBS		12
+//moved to typedefst
+//#define MAXUMBS		12
 #define MAPPAGES		4//mm->EMSpagesmapped
 
-typedef struct mmblockstruct
+//moved to typdefst
+/*typedef struct mmblockstruct
 {
-	//word	start,length;
-	word	start;	dword length;
-	word	blob;	//fore data larger than 64k
+	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;
 
 
@@ -142,7 +138,8 @@ typedef struct
 {
 	memptr bufferseg;
 	boolean		mmstarted, bombonerror, mmerror;
-	void huge	*farheap;
+	//huge void huge	*farheap;
+	void far	*farheap;
 #ifdef __BORLANDC__
 	void	*nearheap;
 #endif
@@ -153,10 +150,10 @@ typedef struct
 	unsigned	totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
 	unsigned int EMSVer;
 	word numUMBs,UMBbase[MAXUMBS];
-	word	endid;	//end of list
 	//dword	numUMBs,UMBbase[MAXUMBS];
-	mmblocktype	huge mmblocks[MAXBLOCKS],huge *mmhead,huge *mmfree,huge *mmrover,huge *mmnew;
-} mminfo_t;
+	//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;*/
 
 /*
 =============================================================================
@@ -196,11 +193,11 @@ 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(global_game_variables_t *gvar,/*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);
+void MM_Report_(global_game_variables_t *gvar);
 static void MM_EMSerr(byte *stri, byte err);
 void MM_BombOnError(boolean bomb, mminfo_t *mm);
 //void MM_GetNewBlock(mminfo_t *mm);