wwww fixed up the debug dump and still working on improveing the debug memory stuff

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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index d0582540eca7f9a8eb192537618fdadf549282d9..11897608930c4cadff5b1644a402d6ad3a43eb5c 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -89,7 +89,6 @@ boolean MML_CheckForEMS(void)
 {
        boolean emmcfems;
        static char     emmname[] = "EMMXXXX0"; //fix by andrius4669
-//             mov     dx,OFFSET emmname
        __asm {
                mov     dx,OFFSET emmname       //fix by andrius4669
                mov     ax,0x3d00
@@ -475,13 +474,15 @@ void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi)
 {
        word    base,size;
 
-getmemory:
+
        __asm {
                mov     ax,0x4310
                int     0x2f
                mov     [WORD PTR XMSaddr],bx
                mov     [WORD PTR XMSaddr+2],es         // function pointer to XMS driver
-
+       }
+getmemory:
+       __asm {
                mov     ah,XMS_ALLOCUMB
                mov     dx,0xffff                                       // try for largest block possible
                //mov     ax,dx                                         // Set available Kbytes.
@@ -560,7 +561,7 @@ void MML_ShutdownXMS(mminfo_t *mm)
 ======================
 */
 
-void MML_UseSpace(word segstart, dword seglength, mminfo_t *mm)
+/*void MML_UseSpace(word segstart, dword seglength, mminfo_t *mm)
 {
        mmblocktype huge *scan,huge *last;
        word            segm=1;
@@ -578,8 +579,6 @@ void MML_UseSpace(word segstart, dword seglength, mminfo_t *mm)
        {
                last = scan;
                scan = scan->next;
-               //printf("              start=%x",scan->start);
-               //printf("              seglen=%lu\n", scan->length);
        }
 
 //
@@ -589,38 +588,17 @@ void MML_UseSpace(word segstart, dword seglength, mminfo_t *mm)
        extra = oldend - (segstart+seglength);
 
        segmlen=extra;
-//
-// find out how many blocks it spans!
-//
-       for(;segmlen>0x10000;segmlen-=0x10000)
-       {
-               //printf("      seglen=%lu\n", segmlen);
-               segm++;
-       }
 
        //++++emsver stuff!
-       if(segm>1/* || extra>=0x10000lu*/)
+       if(segm>1)/// || extra>=0x10000lu)
        //if(extra>0xfffflu)
        {
                scan->blob=segm;
-               /*__asm
-               {
-                       push    ds
-                       mov     ax,ds
-                       inc             ax
-                       mov     ds,ax
-               }*/
-
 
                //MML_UseSpace(segstart, seglength, mm);
 
-               /*__asm
-               {
-                       pop ds
-               }*/
                printf("MML_UseSpace: Segment spans two blocks!\n");
        //}
-       printf("========================================\n");
        printf("segm=%u         ", segm);
        printf("ex=%lu  ", extra);
        printf("old=%u  ", oldend);
@@ -629,7 +607,6 @@ void MML_UseSpace(word segstart, dword seglength, mminfo_t *mm)
        printf("len=%lu ", scan->length);
        printf("seglen=%lu      ", seglength);
        printf("segmlen=%lu\n", segmlen);
-       printf("========================================\n");
        }
 //++++todo: linked list of segment!
        if(segstart == scan->start)
@@ -653,6 +630,76 @@ void MML_UseSpace(word segstart, dword seglength, mminfo_t *mm)
                mm->mmnew->attributes = LOCKBIT;
        }//else if(segm>0) goto segu;
 
+}*/
+void MML_UseSpace(word segstart, dword seglength, mminfo_t *mm)
+{
+       mmblocktype far *scan,far *last;
+       word    oldend;
+       sdword          extra;
+       word segm=1;
+
+       scan = last = mm->mmhead;
+       mm->mmrover = 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;
+       }
+
+//
+// find out how many blocks it spans!
+//
+       /*for(;seglength>=0x10000;seglength-=0xFFFF)
+       {
+               //printf("      seglen=%lu\n", segmlen);
+               segm++;
+       }*/
+
+//
+// take the given range out of the block
+//
+       oldend = scan->start + scan->length;
+       extra = oldend - (segstart+((word)seglength));
+       if (extra < 0)
+       {
+               printf("========================================\n");
+               printf("start=%x        ", scan->start);
+               printf("old=%u  ", oldend);
+               printf("start+seglen=%lu\n", segstart+seglength);
+               printf("segsta=%x       ", segstart);
+               printf("len=%lu ", scan->length);
+               printf("seglen=%lu      ", seglength);
+               printf("\n");
+               printf("MML_UseSpace: Segment spans two blocks! %d\n", extra);
+               printf("========================================\n");
+               //return;
+       }
+
+       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;
+               mm->mmnew->useptr = NULL;
+
+               mm->mmnew->next = scan->next;
+               scan->next = mm->mmnew;
+               mm->mmnew->start = segstart+seglength;
+               mm->mmnew->length = extra;
+               mm->mmnew->attributes = LOCKBIT;
+       }
+
 }
 
 //==========================================================================
@@ -1304,9 +1351,10 @@ void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm)
                                //printf("0     %x      %u      %lu\n", scan->next->start, w, scan->length);
                                strcat(scratch0,"0");
                        }
-                       //printf("==================\n");
-                       //printf("w=%x  start=%x        next=%x end=%u  %lu\n", w, scan->start, (scan->next->start), end+1, wwww);
-                       //printf("==================\n");
+                       printf("==================\n");
+                       printf("w=%x    start=%x        next=%x end=%u  %lu\n", w, scan->start, (scan->next->start), end+1, wwww);
+                       printf("==================\n");
+                       strcat(scratch0, "\n");
                }/*else {//if(scan->next->start <= scan->start){
                        scan->next->start=scan->start+0x1000;
                        wwww=(dword)(scan->next->start)-(dword)scan->start;
@@ -1324,7 +1372,7 @@ void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm)
 //                     getch();
                }*/
                strcat(scratch0, AARESET);
-               strcat(scratch0,"\n");
+               //strcat(scratch0,"\n");
                        //for(chx=scan->next->start;chx+4>=(word)end+1;chx+=4)
                        //{
 //                             chx+=scan->next->start;