i do not know why it messes up so much on far heap

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

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index fb8b79c41faa15e0ce514224bbad9b34b48d83a1..7949cce4598964d0b36693c40541523de9fb4836 100644 (file)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -30,18 +30,18 @@
 //++++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"
 #else
 #define OUT_OF_MEM_MSG "\npee\n"
 #endif
 
 
 #define SAVENEARHEAP   0x200           // space to leave in data segment
-#define SAVEFARHEAP            0                       // space to leave in far heap
+#define SAVEFARHEAP    0//x2000                        // space to leave in far heap
 
-#define        BUFFERSIZE              0x2000          // miscelanious, allways available buffer
+#define        BUFFERSIZE              0x1000          // miscelanious, allways available buffer
 
-#define MAXBLOCKS              600
+#define MAXBLOCKS              720
 
 
 
@@ -54,7 +54,7 @@
 #define        EMS_GETPAGES    0x42
 #define        EMS_ALLOCPAGES  0x43
 #define        EMS_MAPPAGE             0x44
-#define        EMS_MAPXPAGE            0x5000
+#define        EMS_MAPXPAGE            0x50
 #define        EMS_FREEPAGES   0x45
 #define        EMS_VERSION             0x46
 
@@ -91,6 +91,9 @@ typedef void __based(__self) * memptr; //__based(seg) * memptr;
 typedef struct
 {
        dword   nearheap,farheap,EMSmem,XMSmem,mainmem;
+       //__segment segu;
+       //word segu;
+//
 } mminfotype;
 
 //==========================================================================
@@ -115,14 +118,14 @@ 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;
+       word    start;//,length;
        //dword start,length;
        //word  start;
-       //dword length;
+       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
@@ -135,7 +138,7 @@ typedef struct
        memptr bufferseg;
        boolean         mmstarted, bombonerror, mmerror;
        void huge       *farheap;
-       void            *nearheap;
+       void    *nearheap;
        //byte          EMS_status;
        unsigned        totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
        unsigned int EMSVer;
@@ -182,11 +185,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(page_t *page, mminfo_t *mm);
+void MM_ShowMemory(/*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);