]> 4ch.mooo.com Git - 16.git/blobdiff - src/lib/16_mm.c
NULL pageframe detection added for EMM386 memory manager failing to assign one and...
[16.git] / src / lib / 16_mm.c
index 72ab5ae002c90b0cb50d42a4c3c7191be0b412e0..6453354917350979d831df3a1c270be777390027 100755 (executable)
@@ -88,18 +88,20 @@ static      char *ParmStringsexmm[] = {"noems","noxms",""};
 
 boolean MML_CheckForEMS(void)
 {
-       boolean emmcfems=0;
+       boolean emmcfems = false;
+       word            EMSPageFrame = 0;
+       byte    err=0, str[64];
        static char     emmname[] = "EMMXXXX0"; //fix by andrius4669
        __asm {
                mov     dx,OFFSET emmname       //fix by andrius4669
                mov     ax,0x3d00
-               int     0x21            // try to open EMMXXXX0 device
+               int     EMM_INT         // try to open EMMXXXX0 device
                jc      error
 
                mov     bx,ax
                mov     ax,0x4400
 
-               int     0x21            // get device info
+               int     EMM_INT         // get device info
                jc      error
 
                and     dx,0x80
@@ -107,19 +109,29 @@ boolean MML_CheckForEMS(void)
 
                mov     ax,0x4407
 
-               int     0x21            // get status
+               int     EMM_INT         // get status
                jc      error
                or      al,al
                jz      error
 
                mov     ah,0x3e
-               int     0x21            // close handle
+               int     EMM_INT         // close handle
                jc      error
+
+               //
+               // pageframe check
+               //
+               mov     ah,EMS_GETFRAME
+               int     EMS_INT                 // find the page frame address
+               or      ah,ah
+               jnz     error
+               mov     [EMSPageFrame],bx
+
                //
                // EMS is good
                //
-               mov     emmcfems,1
-               jmp End
+               mov     emmcfems,1
+               jmp     End
 #ifdef __BORLANDC__
        }
 #endif
@@ -130,7 +142,8 @@ boolean MML_CheckForEMS(void)
                //
                // EMS is bad
                //
-               mov     emmcfems,0
+               mov     err,ah
+               mov     emmcfems,0
 #ifdef __BORLANDC__
        }
 #endif
@@ -138,6 +151,23 @@ boolean MML_CheckForEMS(void)
 #ifdef __WATCOMC__
        }
 #endif
+
+       //
+       // Pageframe switch to determine if there is one!
+       //
+       if(!EMSPageFrame)
+       {
+               emmcfems = false;
+#if defined(__DEBUG_PM__) || defined(__DEBUG_MM__)
+               printf("MML_CheckForEMS: EMS error No Pageframe!\nAddress detected to be %04x\n", EMSPageFrame);
+#endif
+       }else   if(!emmcfems)// if there is an error and page frame is not 0000
+       {
+               strcpy(str,"MML_CheckForEMS: EMS error ");
+               MM_EMSerr(str, err);
+               printf("%s\n",str);
+       }
+
        return(emmcfems);
 }
 
@@ -562,30 +592,7 @@ void MML_ShutdownXMS(global_game_variables_t *gvar)
 ======================
 */
 
-/*void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar)
-{
-       mmblocktype far *scan,far *last;
-       word            segm=1;
-       word    oldend;
-       dword           segmlen;
-       dword           extra;
-
-       scan = last = gvar->mm.mmhead;
-       gvar->mm.mmrover = gvar->mm.mmhead;             // reset rover to start of memory
-
-//
-// search for the block that contains the range of segments
-//
-       while(scan->start+scan->length < segstart)
-       {
-               last = scan;
-               scan = scan->next;
-       }
-
-//
-// take the given range out of the block
-//
-       oldend = scan->start + scan->length;
+/*
        extra = oldend - (segstart+seglength);
 
        segmlen=extra;
@@ -610,28 +617,7 @@ void MML_ShutdownXMS(global_game_variables_t *gvar)
        printf("segmlen=%lu\n", segmlen);
        }
 //++++todo: linked list of segment!
-       if(segstart == scan->start)
-       {
-               last->next = scan->next;                        // unlink block
-               FREEBLOCK(scan);
-               scan = last;
-       }
-       else
-               scan->length = segstart-scan->start;    // shorten block
-
-       if(extra > 0)
-       {
-               GETNEWBLOCK;
-               gvar->mm.mmnew->useptr = NULL;
-
-               gvar->mm.mmnew->next = scan->next;
-               scan->next = gvar->mm.mmnew;
-               gvar->mm.mmnew->start = segstart+seglength;
-               gvar->mm.mmnew->length = extra;
-               gvar->mm.mmnew->attributes = LOCKBIT;
-       }//else if(segm>0) goto segu;
-
-}*/
+*/
 void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar)
 {
        mmblocktype far *scan,far *last;
@@ -699,7 +685,7 @@ void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar)
                gvar->mm.mmnew->start = segstart+seglength;
                gvar->mm.mmnew->length = extra;
                gvar->mm.mmnew->attributes = LOCKBIT;
-       }
+       }//else if(segm>0) goto segu;
 
 }
 
@@ -788,15 +774,15 @@ void MM_Startup(global_game_variables_t *gvar)
 #ifdef __WATCOMC__
        _nheapgrow();
 #endif
-
-       length=(word)_memavl();//(word)coreleft();//(dword)GetFreeSize();
-
+       length=(word)_memavl();//(word)coreleft();
+       //start = gvar->mm.nearheap = _fmalloc(length);
 #ifdef __WATCOMC__
        start = (void __far *)(gvar->mm.nearheap = _nmalloc(length));
 #endif
 #ifdef __BORLANDC__
        start = (void far *)(gvar->mm.nearheap = malloc(length));
 #endif
+
        length -= 16-(FP_OFF(start)&15);
        length -= SAVENEARHEAP;
        seglength = length / 16;                        // now in paragraphs
@@ -808,18 +794,16 @@ void MM_Startup(global_game_variables_t *gvar)
 //
 // get all available far conventional memory segments
 //
-       //printf("_FARCORELEFT                          %lu\n", _FCORELEFT);
 #ifdef __WATCOMC__
        _fheapgrow();
-       length=_FCORELEFT;//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL;
 #endif
 #ifdef __BORLANDC__
-//0000 printf("farcoreleft()                           %lu\n", farcoreleft());
-//0000 printf("(farcoreleft()+32)-_FCORELEFT   %d\n", (sword)((farcoreleft()+32)-_FCORELEFT));
-       length=farcoreleft();//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL;
+//     printf("farcoreleft()                           %lu\n", farcoreleft());
+//     printf("(farcoreleft()+32)-_FCORELEFT   %d\n", (sword)((farcoreleft()+32)-_FCORELEFT));
 #endif
-       start = gvar->mm.farheap = _fmalloc(length);
-       //start = gvar->mm.farheap = halloc(length, 1);
+       length=_FCORELEFT;
+       start = gvar->mm.farheap = _fmalloc(length);//start = gvar->mm.farheap = halloc(length, 1);
+
        length -= 16-(FP_OFF(start)&15);
        length -= SAVEFARHEAP;
        seglength = length / 16;                        // now in paragraphs
@@ -941,11 +925,13 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar)
        gvar->mm.mmnew->useptr = baseptr;
        //if(gvar->mm.mmnew->useptr==NULL){
 #ifdef __DEBUG_MM__
+       if(dbg_debugmm>0){
                printf("MM_GetPtr\n");
                //%04x
                printf("        baseptr=%Fp     ", baseptr); printf("useptr=%Fp\n", gvar->mm.mmnew->useptr);
                printf("        *baseptr=%Fp    ", *baseptr); printf("*useptr=%Fp\n", *(gvar->mm.mmnew->useptr));
                printf("        &baseptr=%Fp    ", &baseptr); printf("&useptr=%Fp\n", &(gvar->mm.mmnew->useptr));
+       }
 #endif
        //Quit(gvar, "gvar->mm.mmnew->useptr==NULL"); }
        gvar->mm.mmnew->attributes = BASEATTRIBUTES;
@@ -1062,8 +1048,8 @@ void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar)
 
        if(!scan)
        {
-               printf("MM_FreePtr: Block not found!\n");
-               return;
+               Quit(gvar, "MM_FreePtr: Block not found!\n");
+               //printf("MM_FreePtr: Block not found!\n"); return;
        }
 
        last->next = scan->next;
@@ -1441,7 +1427,12 @@ void MM_DumpData(global_game_variables_t *gvar)
        byte    lock,purge;
        FILE    *dumpfile;
 
+#ifdef __WATCOMC__
+       _nfree(gvar->mm.nearheap);
+#endif
+#ifdef __BORLANDC__
        free(gvar->mm.nearheap);
+#endif
 #ifdef __BORLANDC__
                dumpfile = fopen ("mmdump.16b","w");
 #endif