]> 4ch.mooo.com Git - 16.git/blobdiff - src/lib/16_mm.c
ok i am working on makin the debug.16 data and tinking abut large amount of data...
[16.git] / src / lib / 16_mm.c
index 90439b1d18f860bc644f0ad33b7da85226d38a56..cc5a894cc3dbfeb8cab2e69ea8b60389e36c2a7a 100644 (file)
@@ -478,7 +478,7 @@ boolean MML_CheckForXMS(mminfo_t *mm)
 
 void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi)
 {
-       unsigned        base,size;
+       word    base,size;
 
 getmemory:
        __asm {
@@ -517,7 +517,7 @@ getmemory:
 #ifdef __WATCOMC__
        }
 #endif
-       printf("base=%u ", base); printf("size=%u\n", size);
+//     printf("base=%u ", base); printf("size=%u\n", size);
        MML_UseSpace(base,size, mm);
        mmi->XMSmem += size*16;
        mm->UMBbase[mm->numUMBs] = base;
@@ -610,7 +610,7 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
                {
                        pop ds
                }*/
-               //printf("MML_UseSpace: Segment spans two blocks!\n");
+               printf("MML_UseSpace: Segment spans two blocks!\n");
        }
 
 //
@@ -632,7 +632,7 @@ printf("seglen=%lu\n", seglength);
        if(segstart == scan->start)
        {
                last->next = scan->next;                        // unlink block
-               MM_FreeBlock(scan, mm);
+               FREEBLOCK(scan);
                scan = last;
        }
        else
@@ -642,7 +642,8 @@ printf("seglen=%lu\n", seglength);
 
        if(extra > 0)
        {
-               MM_GetNewBlock(mm);
+               //MM_GetNewBlock(mm);
+               GETNEWBLOCK;
                mm->mmnew->next = scan->next;
                scan->next = mm->mmnew;
                mm->mmnew->start = segstart+seglength;
@@ -705,8 +706,8 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
        void huge       *start;
        word    segstart;//,endfree;
 
-       if(mm->mmstarted)
-               MM_Shutdown(mm);
+//     if(mm->mmstarted)
+//             MM_Shutdown(mm);
 
        mm->mmstarted = true;
        mm->bombonerror = true;
@@ -728,7 +729,8 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 // locked block of all memory until we punch out free space
 //
        //printf("              newblock making!\n");
-       MM_GetNewBlock(mm);
+       //MM_GetNewBlock(mm);
+       GETNEWBLOCK;
        mm->mmhead = mm->mmnew;                         // this will allways be the first node
        mm->mmnew->start = 0;
        mm->mmnew->length = 0xffff;
@@ -742,7 +744,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //     printf("                nearheap making!\n");
 #ifdef __WATCOMC__
        _nheapgrow();
-       length=(dword)_memmax();//(dword)GetFreeSize();
+       length=(dword)_memavl();//(dword)GetFreeSize();
        start = (void huge *)(mm->nearheap = _nmalloc(length));
 #endif
 #ifdef __BORLANDC__
@@ -755,29 +757,31 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
        segstart = FP_SEG(start)+(FP_OFF(start)+15)/16;
        MML_UseSpace(segstart,seglength, mm);
        mmi->nearheap = length;
-       printf("start=%Fp       segstart=%x     seglen=%l       len=%l\n", start, segstart, seglength, length);
+       printf("start=%Fp       segstart=%x     seglen=%lu      len=%lu\n", start, segstart, seglength, length);
        //heapdump();
 
 //
 // get all available far conventional memory segments
 //
 //     printf("                farheap making!\n");
+       printf("_FARCORELEFT                            %lu\n", _FCORELEFT);
 #ifdef __WATCOMC__
        _fheapgrow();
-       length=(dword)GetFarFreeSize();//0xffffUL*4UL;
 #endif
 #ifdef __BORLANDC__
-       length=farcoreleft();
+       printf("                                %lu\n", farcoreleft());
+       printf("                                %d\n", (sword)((farcoreleft()+32)-_FCORELEFT));
 #endif
-       //start = mm->farheap = halloc(length, 1);
+       length=_FCORELEFT;//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL;
        start = mm->farheap = _fmalloc(length);
+       //start = mm->farheap = halloc(length, 1);
        length -= 16-(FP_OFF(start)&15);
        length -= SAVEFARHEAP;
        seglength = length / 16;                        // now in paragraphs
        segstart = FP_SEG(start)+(FP_OFF(start)+15)/16;
        MML_UseSpace(segstart,seglength, mm);
        mmi->farheap = length;
-       printf("start=%Fp       segstart=%x     seglen=%l       len=%l\n", start, segstart, seglength, length);
+       printf("start=%Fp       segstart=%x     seglen=%lu      len=%lu\n", start, segstart, seglength, length);
        //heapdump();
 
        mmi->mainmem = mmi->nearheap + mmi->farheap;
@@ -829,14 +833,12 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
                        //MM_MapXEMS(mm, mmi);                                  // map in used pages
        }
 
-mmi->XMSmem=0;
-goto xmsskip;
-
 //
 // detect XMS and get upper memory blocks
 //
 emsskip:
        mmi->XMSmem = 0;
+       goto xmsskip;
        for(i = 1;i <
 #ifdef __WATCOMC__
        __argc
@@ -890,15 +892,15 @@ void MM_Shutdown(mminfo_t *mm)
        if(!(mm->mmstarted))
                return;
 
-       _ffree(mm->farheap);    printf("                far freed\n");
+       _ffree(mm->farheap);//  printf("                far freed\n");
 #ifdef __WATCOMC__
-       _nfree(mm->nearheap);   printf("                near freed\n");
+       _nfree(mm->nearheap);// printf("                near freed\n");
 #endif
 #ifdef __BORLANDC__
-       free(mm->nearheap);     printf("                near freed\n");
+       free(mm->nearheap);//   printf("                near freed\n");
 #endif
-       if(MML_CheckForEMS()){ MML_ShutdownEMS(mm); printf("            EMS freed\n"); }
-       if(MML_CheckForXMS(mm)){ MML_ShutdownXMS(mm); printf("          XMS freed\n"); }
+       if(MML_CheckForEMS()){ MML_ShutdownEMS(mm); }//printf("         EMS freed\n"); }
+       if(MML_CheckForXMS(mm)){ MML_ShutdownXMS(mm); }//printf("               XMS freed\n"); }
 }
 
 //==========================================================================
@@ -922,7 +924,8 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi)
 
        needed = (size+15)/16;          // convert size from bytes to paragraphs
 printf(".");   //0000
-       MM_GetNewBlock(mm);                             // fill in start and next after a spot is found
+       //MM_GetNewBlock(mm);
+       GETNEWBLOCK;                            // fill in start and next after a spot is found
        mm->mmnew->length = needed;
        mm->mmnew->useptr = baseptr;
        mm->mmnew->attributes = BASEATTRIBUTES;
@@ -981,7 +984,8 @@ printf(".");        //0000
                                {       // free the purgable block
 printf("               freeing block~\n");     //0000
                                        next = purge->next;
-                                       MM_FreeBlock(purge, mm);
+                                       FREEBLOCK(purge);
+                                       //MM_FreeBlock(purge, mm);
                                        purge = next;           // purge another if not at scan
                                }
                                mm->mmrover = mm->mmnew;
@@ -1008,7 +1012,7 @@ printf("\n");
        if (mm->bombonerror)
        {
 #ifdef __WATCOMC__
-               heapdump();
+               //heapdump();
 #endif
                printf(OUT_OF_MEM_MSG,(size-mmi->nearheap));
                printf("for stability reasons the program will shut down! wwww\n");
@@ -1056,7 +1060,8 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm)
 
        last->next = scan->next;
 
-       MM_FreeBlock(scan, mm);
+       FREEBLOCK(scan);
+       //MM_FreeBlock(scan, mm);
 }
 //==========================================================================
 
@@ -1201,7 +1206,8 @@ void MM_SortMem(mminfo_t *mm)
                        // throw out the purgable block
                        //
                                next = scan->next;
-                               MM_FreeBlock(scan, mm);
+                               FREEBLOCK(scan);
+                               //MM_FreeBlock(scan, mm);
                                last->next = next;
                                scan = next;
                                continue;
@@ -1247,10 +1253,8 @@ void MM_SortMem(mminfo_t *mm)
                MM_SetLock(&(memptr)audiosegs[playing],false);*/
 }
 
-
 //==========================================================================
 
-//****#if 0
 /*
 =====================
 =
@@ -1259,46 +1263,50 @@ 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)
 {
        mmblocktype huge *scan;
-//++++ word color;
+       //byte color;
        word temp;
-       long    end,owner;
-//++++ word chx,chy;
-       byte    scratch[160],str[16];
-
+       sdword  end,owner;
+       //word chx,chy;
+       word w;
+       byte    scratch[160],scratch0[4096],str[16];
+       byte d = '#';
 //**** VW_SetDefaultColors();
 //**** VW_SetLineWidth(40);
 //++++mh       temp = bufferofs;
 //++++mh       bufferofs = 0;
 //**** VW_SetScreen (0,0);
-
        scan = mm->mmhead;
-
        end = -1;
 
-CA_OpenDebug ();
-
-//++++ chx=0;
-//++++ chy=0;
-
+       CA_OpenDebug (gvar);
+       w=0;
        while(scan)
        {
-/*++++         if(scan->attributes & PURGEBITS)
-                       color = 5;              // dark purple = purgable
+               strcpy(scratch, AARESET);
+               if(scan->attributes & PURGEBITS)
+                       strcpy(scratch0, AAMAGENTA);            // dark purple = purgable
                else
-                       color = 9;              // medium blue = non purgable
+                       strcpy(scratch0, AABLUE);               // medium blue = non purgable
                if(scan->attributes & LOCKBIT)
-                       color = 12;             // red = locked*/
+                       strcpy(scratch0, AARED);                // red = locked
                if(scan->start<=end)
                {
-                       //printf(");
-                       write(debughandle,"\nMM_ShowMemory: Memory block order currupted!\n",strlen("\nMM_ShowMemory: Memory block order currupted!\n"));
+                       printf("\n%d\n\n", end);
+                       strcat(scratch, "MM_ShowMemory: Memory block order currupted!\n");
+                       strcat(scratch, "End's Size: ");
+                       ultoa (end,str,10);
+                       strcat (scratch,str);
+                       strcat(scratch, "\nscan->start's Size: ");
+                       ultoa (scan->start,str,10);
+                       strcat (scratch,str);
+                       write(gvar->handle.debughandle,scratch,strlen(scratch));
                        //modexprint(&page, chx, chy, 1, 0, 24, "\nMM_ShowMemory: Memory block order currupted!\n");
-                       return;
+                       break;
                }
-               end = scan->start+scan->length-1;
+               end = scan->start+(word)scan->length-1;
 //++++         chy = scan->start/320;
 //++++         chx = scan->start%320;
                                //modexhlin(page, scan->start, (unsigned)end, chy, color);
@@ -1306,59 +1314,69 @@ CA_OpenDebug ();
                                //{
 //++++                                 modexClearRegion(page, chx, chy, 4, 4, color);
                                //}
-
 //++++         VW_Hlin(scan->start,(unsigned)end,0,color);
-
+//             for(w=0;w>=(word)scan->length/80;w++)
+//             {
+//                     printf("+       %lu\n", w);
+               //ultoa (w,str,10);
+               //strcat (scratch0,str);
+                       strcat(scratch0, "+");
+//             }
+               strcat(scratch0, AARESET); strcat(scratch0, AAGREY); strcat(scratch0,"_");
 //++++         VW_Plot(scan->start,0,15);
 //++++                         modexClearRegion(page, chx, chy, 4, 4, 15);
-               if(scan->next->start > end+1)
 //++++                 VW_Hlin(end+1,scan->next->start,0,0);   // black = free
+               if(scan->next->start > end+1)
+               {
+                       strcat(scratch0, AARESET);
+                       //ultoa (w,str,10);
+                       //strcat (scratch0,str);
+                       strcat(scratch0,AAGREEN);
+//                     for(w=(scan->next->start)/80;w>=(word)((scan->length+1)/80);w++)
+//                     {
+//                             printf("0       %lu\n", w);
+                               strcat(scratch0,"0");
+//                     }
+               }
+               strcat(scratch0, AARESET);
+               strcat(scratch0,"\n");
                        //for(chx=scan->next->start;chx+4>=(word)end+1;chx+=4)
                        //{
-//++++                         chx+=scan->next->start;
-//++++                         modexClearRegion(page, chx, chy, 4, 4, 2);
+//                             chx+=scan->next->start;
+//                             modexClearRegion(page, chx, chy, 4, 4, 2);
                        //}
                                        //modexhlin(page, end+1,scan->next->start, chy, 0);
-
-/*
-               end = scan->length-1;
-               y = scan->start/320;
+/*             y = scan->start/320;
                x = scan->start%320;
                VW_Hlin(x,x+end,y,color);
-               VW_Plot(x,y,15);
-               if (scan->next && scan->next->start > end+1)
-                       VW_Hlin(x+end+1,x+(scan->next->start-scan->start),y,0); // black = free
-*/
-
-//****#if 0
-//printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");  //bug!
-strcpy(scratch,"Seg:");
-ultoa (scan->start,str,16);
-strcat (scratch,str);
-strcat (scratch,"\tSize:");
-ultoa ((dword)scan->length,str,10);
-strcat (scratch,str);
-strcat (scratch,"\tOwner:0x");
-owner = (unsigned)scan->useptr;
-ultoa (owner,str,16);
-strcat (scratch,str);
-strcat (scratch,"\n");
-write(debughandle,scratch,strlen(scratch));
+               VW_Plot(x,y,15);*/
+//++++                 VW_Hlin(x+end+1,x+(scan->next->start-scan->start),y,0); // black = free
+               strcat(scratch,"Seg:");
+               ultoa (scan->start,str,16);
+               strcat (scratch,str);
+               strcat (scratch,"\tSize:");
+               ultoa ((dword)scan->length,str,10);
+               strcat (scratch,str);
+               strcat (scratch,"\tOwner:0x");
+               owner = (unsigned)scan->useptr;
+               ultoa (owner,str,16);
+               strcat (scratch,str);
+               strcat (scratch,"\n");
+               write(gvar->handle.debughandle,scratch,strlen(scratch));
+               write(gvar->handle.debughandle,scratch0,strlen(scratch0));
 //modexprint(page, chx, chy, 1, 0, 24, &scratch);
 //++++chy+=4;
 //fprintf(stdout, "%s", scratch);
-//****#endif
 
                scan = scan->next;
        }
 
-CA_CloseDebug ();
+       CA_CloseDebug (gvar);
 
 //++++mh       IN_Ack();
 //**** VW_SetLineWidth(64);
 //++++mh       bufferofs = temp;
 }
-//****#endif
 
 //==========================================================================
 
@@ -1372,14 +1390,13 @@ CA_CloseDebug ();
 
 void MM_DumpData(mminfo_t *mm)
 {
-       mmblocktype far *scan,far *best;
+       mmblocktype huge *scan,huge *best;
        long    lowest,oldlowest;
        word    owner;
        byte    lock,purge;
        FILE    *dumpfile;
 
-
-       //++++free(mm->nearheap);
+       free(mm->nearheap);
        dumpfile = fopen ("mmdump.16","w");
        if (!dumpfile){
                printf("MM_DumpData: Couldn't open MMDUMP.16!\n");
@@ -1453,8 +1470,8 @@ dword MM_UnusedMemory(mminfo_t *mm)
                scan = scan->next;
        }
 
-//     return free*16l;
-       return free;
+       return free*16lu;
+//     return free;
 }
 
 //==========================================================================
@@ -1486,8 +1503,8 @@ dword MM_TotalFree(mminfo_t *mm)
                scan = scan->next;
        }
 
-//     return free*16l;
-       return free;
+       return free*16lu;
+//     return free;
 }
 
 //==========================================================================
@@ -1670,7 +1687,7 @@ void MM_BombOnError(boolean bomb, mminfo_t *mm)
        mm->bombonerror = bomb;
 }
 
-void MM_GetNewBlock(mminfo_t *mm)
+/*void MM_GetNewBlock(mminfo_t *mm)
 {
        if(!mm->mmfree)
                MML_ClearBlock(mm);
@@ -1691,7 +1708,7 @@ void MM_FreeBlock(mmblocktype *x, mminfo_t *mm)
        x->next=mm->mmfree;
        mm->mmfree=x;
        mm->endid--;    //end of list
-}
+}*/
 
 void MM_seguin(void)
 {