X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.h;h=984f932c00adc443128e5d90d383296b316a8f8a;hb=9ada0e848c6a1a951a4325d66532282e00238d17;hp=27fa00b0b0efaaf74c544e02f9c02863c869f101;hpb=2bc6e98511fbe156f4ec68b1b7dbc7c8c03f866f;p=16.git

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 27fa00b0..984f932c 100644
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -1,4 +1,4 @@
-/* Catacomb Armageddon Source Code
+/* Catacomb Apocalypse Source Code
  * Copyright (C) 1993-2014 Flat Rock Software
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,17 +23,18 @@
 
 #include <string.h>
 #include <malloc.h>
-#include "src/lib/lib_head.h"
+//#include <bios.h>
+#include "src/lib/16_head.h"
 //++++mh	#include "src/lib/16_in.h"
 
-//****#if 1		// 1 == Debug/Dev  ;  0 == Production/final
+#ifdef __DEBUG__		// 1 == Debug/Dev  ;  0 == Production/final
 #define OUT_OF_MEM_MSG	"MM_GetPtr: Out of memory!\nYou were short :%ld bytes"
-//****#else
-//****#define OUT_OF_MEM_MSG	"\npee\n"
-//****#endif
+#else
+#define OUT_OF_MEM_MSG	"\npee\n"
+#endif
 
 
-#define SAVENEARHEAP	0x400		// space to leave in data segment
+#define SAVENEARHEAP	0x200		// space to leave in data segment
 #define SAVEFARHEAP		0			// space to leave in far heap
 
 #define	BUFFERSIZE		0x1000		// miscelanious, allways available buffer
@@ -79,22 +80,20 @@
 #define	XMS_FREEUMB		0x11
 
 //==========================================================================
-
-typedef void /*__seg*/ * memptr;
+//I hope this is correct!
+//__segment                seg;
+typedef void __based(__self) * memptr; //__based(seg) * memptr;
 
 typedef struct
 {
-	long	nearheap,farheap,EMSmem,XMSmem,mainmem;
+	dword	nearheap,farheap,EMSmem,XMSmem,mainmem;
 } mminfotype;
 
 //==========================================================================
 
-/*extern	mminfotype	mminfo;
-extern	memptr		bufferseg;
-extern	boolean		mmerror;
-
 extern	void		(* beforesort) (void);
-extern	void		(* aftersort) (void);*/
+extern	void		(* aftersort) (void);
+extern void		(* XMSaddr) (void);		// far pointer to XMS driver
 
 //==========================================================================
 
@@ -111,20 +110,33 @@ extern	void		(* aftersort) (void);*/
 #define PURGEMASK	0xfffc
 #define BASEATTRIBUTES	0	// unlocked, non purgable
 
-#define MAXUMBS		10
+#define MAXUMBS		12
 
 typedef struct mmblockstruct
 {
-	unsigned	start,length;
+	word	start,length;
+	//dword	start,length;
+	//word	start;
+	//dword length;
+	//byte segm;				//how many 64kb segment blocks it takes up if there is many data!
 	unsigned	attributes;
 	memptr		*useptr;	// pointer to the segment start
-	struct mmblockstruct far *next;
+	struct mmblockstruct huge *next;
 } mmblocktype;
 
 
-//#define GETNEWBLOCK {if(!(mmnew=mmfree))Quit("MM_GETNEWBLOCK: No free blocks!");mmfree=mmfree->next;}
-#define GETNEWBLOCK {if(!mmfree)MML_ClearBlock();mmnew=mmfree;mmfree=mmfree->next;}
-#define FREEBLOCK(x) {*x->useptr=NULL;x->next=mmfree;mmfree=x;}
+typedef struct
+{
+	memptr bufferseg;
+	boolean		mmstarted, bombonerror, mmerror;
+	void huge	*farheap;
+	void		*nearheap;
+	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;
+} mminfo_t;
 
 /*
 =============================================================================
@@ -134,14 +146,6 @@ typedef struct mmblockstruct
 =============================================================================
 */
 
-mminfotype	mminfo;
-memptr		bufferseg;
-boolean		mmerror;
-
-void		(* beforesort) (void);
-void		(* aftersort) (void);
-
-static	char *ParmStringsexmm[] = {"noems","noxms",""};
 
 /*
 =============================================================================
@@ -151,58 +155,34 @@ static	char *ParmStringsexmm[] = {"noems","noxms",""};
 =============================================================================
 */
 
-boolean		mmstarted;
-
-void huge	*hugeheap;
-void far	*farheap;
-void		*nearheap;
-
-mmblocktype	far mmblocks[MAXBLOCKS]
-			,far *mmhead,far *mmfree,far *mmrover,far *mmnew;
-
-boolean		bombonerror;
-
-unsigned	totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
-
-void		(* XMSaddr) (void);		// far pointer to XMS driver
-
-unsigned	numUMBs,UMBbase[MAXUMBS];
-
-//==========================================================================
-
-void MM_Startup (void);
-void MM_Shutdown (void);
-void MM_MapEMS (void);
-
-void MM_GetPtr (memptr *baseptr,dword size);
-void MM_FreePtr (memptr *baseptr);
-
-void MM_SetPurge (memptr *baseptr, int purge);
-void MM_SetLock (memptr *baseptr, boolean locked);
-void MM_SortMem (void);
-
-void MM_ShowMemory (void);
-
-long MM_UnusedMemory (void);
-long MM_TotalFree (void);
-
-void MM_BombOnError (boolean bomb);
-
 //==========================================================================
 
-//
-// local prototypes
-//
-
-boolean		MML_CheckForEMS (void);
-void 		MML_ShutdownEMS (void);
-void 		MM_MapEMS (void);
-boolean 	MML_CheckForXMS (void);
-void 		MML_ShutdownXMS (void);
-void		MML_UseSpace (unsigned segstart, unsigned seglength);
-void 		MML_ClearBlock (void);
-
-int US_CheckParm(char *parm,char **strings);
+boolean MML_CheckForEMS(void);
+unsigned MML_SetupEMS(mminfo_t *mm);
+void MML_ShutdownEMS(mminfo_t *mm);
+unsigned MM_MapEMS(mminfo_t *mm);
+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_ClearBlock(mminfo_t *mm);
+
+void MM_Startup(mminfo_t *mm, mminfotype *mmi);
+void MM_Shutdown(mminfo_t *mm);
+
+void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi);
+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(mminfo_t *mm);
+dword MM_UnusedMemory(mminfo_t *mm);
+dword MM_TotalFree(mminfo_t *mm);
+void MM_Report(mminfo_t *mm, mminfotype *mmi);
+//int MM_EMSVer(void);
+void MM_BombOnError(boolean bomb, mminfo_t *mm);
+void MM_GetNewBlock(mminfo_t *mm);
+void MM_FreeBlock(mmblocktype *x, mminfo_t *mm);
 
 //==========================================================================