refresh wwww

[16.git] / src / lib / 16_mm.h

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
old mode 100644 (file)
new mode 100755 (executable)
index 6899952..de35b42
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -23,25 +23,28 @@
 
 #include <string.h>
 #include <malloc.h>
-//#include <bios.h>
 #include "src/lib/16_head.h"
-#include "src/lib/modex16.h"
-//#include "src/lib/16_ca.h"
+#include "src/lib/16_hc.h"
+//#include "src/lib/modex16.h"
 //++++mh       #include "src/lib/16_in.h"
 
 #ifdef __DEBUG__               // 1 == Debug/Dev  ;  0 == Production/final
-#define OUT_OF_MEM_MSG "MM_GetPtr: Out of memory!\nYou were short :%ld bytes"
+#define OUT_OF_MEM_MSG "MM_GetPtr: Out of memory!\nYou were short :%lu bytes\n"
 #else
 #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 FREEBLOCK(x) {*x->useptr=NULL;x->next=mm->mmfree;mm->mmfree=x;}
 
 #define SAVENEARHEAP   0x200           // space to leave in data segment
-#define SAVEFARHEAP            0                       // space to leave in far heap
+#define SAVEFARHEAP    0//x400                 // space to leave in far heap
 
 #define        BUFFERSIZE              0x1000          // miscelanious, allways available buffer
 
-#define MAXBLOCKS              640
+#define MAXBLOCKS              1024
 
 
 
@@ -84,9 +87,6 @@
 #define        XMS_FREEUMB             0x11
 
 //==========================================================================
-//I hope this is correct!
-//__segment                seg;
-typedef void __based(__self) * memptr; //__based(seg) * memptr;
 
 typedef struct
 {
@@ -115,18 +115,17 @@ extern void               (* XMSaddr) (void);             // far pointer to XMS driver
 #define BASEATTRIBUTES 0       // unlocked, non purgable
 
 #define MAXUMBS                12
-#define MAPPAGES               mm->EMSpagesmapped
+#define MAPPAGES               4//mm->EMSpagesmapped
 
 typedef struct mmblockstruct
 {
        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!
+       //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;
 
 
@@ -134,14 +133,21 @@ typedef struct
 {
        memptr bufferseg;
        boolean         mmstarted, bombonerror, mmerror;
-       void huge       *farheap;
-       void            *nearheap;
+       //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;
 
 /*
@@ -171,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);
@@ -182,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);
+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);
 
 //==========================================================================