]> 4ch.mooo.com Git - 16.git/blobdiff - src/lib/16_mm.c
remove endid
[16.git] / src / lib / 16_mm.c
index 17557e692f76d630d7305ca30c2e97ee032a9ff2..3cb6cb757f51667ccca532964c5b84c91a51f39b 100644 (file)
@@ -47,6 +47,7 @@ Open Watcom port by sparky4
 
 */
 #include "src/lib/16_mm.h"
+#include "src/lib/16_ca.h"
 #pragma hdrstop
 
 #pragma warn -pro
@@ -90,7 +91,6 @@ boolean MML_CheckForEMS(void)
        static char     emmname[] = "EMMXXXX0"; //fix by andrius4669
 //             mov     dx,OFFSET emmname
        __asm {
-               //LEA   DX, emmname     //fix by andrius4669
                mov     dx,OFFSET emmname       //fix by andrius4669
                mov     ax,0x3d00
                int     0x21            // try to open EMMXXXX0 device
@@ -241,9 +241,7 @@ End:
 #endif
        if(errorflag==true)
        {
-               //err = CPURegs.h.ah;
                strcpy(str,"MM_SetupEMS: EMS error ");
-               //itoa(err,str2,16);
                MM_EMSerr(str, err);
                printf("%s\n",str);
                return err;
@@ -340,16 +338,14 @@ byte MM_MapEMS(mminfo_t *mm, mminfotype *mmi)
 #endif
                if(errorflag==true)
                {
-                       //err = CPURegs.h.ah;
                        strcpy(str,"MM_MapEMS: EMS error ");
-                       //itoa(err,str2,16);
                        MM_EMSerr(str, err);
                        printf("%s\n",str);
-                       //printf("FACK! %x\n", err);
                        return err;
                }
        }
        mmi->EMSmem = (i)*0x4000lu;
+       //printf("              mmi->EMSmem=%lu\n", mmi->EMSmem);
        return 0;
 }
 
@@ -416,7 +412,6 @@ byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi)
 #endif
                if(errorflag==true)
                {
-                       //err = CPURegs.h.ah;
                        //strcpy(str,"MM_MapXEMS: EMS error 0x");
                        strcpy(str,"MM_MapXEMS: EMS error ");
                        //itoa(err,str2,16);
@@ -478,7 +473,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 +512,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;
@@ -565,11 +560,12 @@ 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)
 {
        mmblocktype huge *scan,huge *last;
-       word            segm;
-       dword   oldend;
+       word            segm=1;
+       word    oldend;
+       dword           segmlen=seglength;
        dword           extra;
 
        scan = last = mm->mmhead;
@@ -582,19 +578,28 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
        {
                last = scan;
                scan = scan->next;
+               //printf("              start=%x",scan->start);
+               //printf("              seglen=%lu\n", scan->length);
        }
 
        //find out how many blocks it spans!
-       if(seglength>0xffffu)
+       //
+       for(;segmlen>0x10000;segmlen-=0x10000)
        {
-//             segm=seglength/0x4000u;
-               segm=(word)seglength/0xffffu;
+               //printf("      seglen=%lu\n", segmlen);
+               segm++;
        }
-       else segm=1;
 
+//
+// take the given range out of the block
+//
+       oldend = scan->start + scan->length;
+       extra = oldend - (segstart+(word)seglength);
        //++++emsver stuff!
-       if(segm>1/*extra>0xfffflu*/)
+       if(segm>1 || extra>=0x10000lu)
+       //if(extra>0xfffflu)
        {
+               scan->blob=segm;
                /*__asm
                {
                        push    ds
@@ -604,31 +609,26 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
                }*/
 
 
-//MML_UseSpace(?segstart?, ?length?, mm);
+               //MML_UseSpace(segstart, seglength, mm);
 
                /*__asm
                {
                        pop ds
                }*/
-               //printf("MML_UseSpace: Segment spans two blocks!\n");
+               printf("MML_UseSpace: Segment spans two blocks!\n");
+       //}
+       printf("========================================\n");
+       printf("segm=%u         ", segm);
+       printf("ex=%lu  ", extra);
+       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("segmlen=%lu\n", segmlen);
+       printf("========================================\n");
        }
-
-//
-// take the given range out of the block
-//
-       oldend = scan->start + scan->length;
-       extra = oldend - (segstart+seglength);
-/*
-printf("segm=%u        ", segm);
-printf("ex=%lu ", extra);
-printf("start+seglen=%lu       ", segstart+seglength);
-printf("len=%u ", scan->length);
-printf("segsta=%x      ", segstart);
-printf("seglen=%lu\n", seglength);
-*/
-//segu:
 //++++todo: linked list of segment!
-//printf("segm=%lu\n", segm);
        if(segstart == scan->start)
        {
                last->next = scan->next;                        // unlink block
@@ -638,12 +638,11 @@ printf("seglen=%lu\n", seglength);
        else
                scan->length = segstart-scan->start;    // shorten block
 
-//     segm--;
-
        if(extra > 0)
        {
-               //MM_GetNewBlock(mm);
                GETNEWBLOCK;
+               mm->mmnew->useptr = NULL;
+
                mm->mmnew->next = scan->next;
                scan->next = mm->mmnew;
                mm->mmnew->start = segstart+seglength;
@@ -706,17 +705,15 @@ 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;
-       mm->endid=0;
 
 //
 // set up the linked list (everything in the free list;
 //
-       //printf("              linked list making!\n");
        mm->mmhead = NULL;
        mm->mmfree = &(mm->mmblocks[0]);
        for(i=0;i<MAXBLOCKS-1;i++)
@@ -728,8 +725,6 @@ 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);
        GETNEWBLOCK;
        mm->mmhead = mm->mmnew;                         // this will allways be the first node
        mm->mmnew->start = 0;
@@ -741,7 +736,6 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //
 // get all available near conventional memory segments
 //
-//     printf("                nearheap making!\n");
 #ifdef __WATCOMC__
        _nheapgrow();
        length=(dword)_memavl();//(dword)GetFreeSize();
@@ -757,43 +751,37 @@ 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=%lu      len=%lu\n", start, segstart, seglength, length);
-       //heapdump();
+       //printf("start=%Fp     segstart=%x     seglen=%lu      len=%lu\n", start, segstart, seglength, length);
 
 //
 // 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("farcoreleft()                           %lu\n", farcoreleft());
+       printf("(farcoreleft()+32)-_FCORELEFT   %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=%lu      len=%lu\n", start, segstart, seglength, length);
-       //heapdump();
+       //printf("start=%Fp     segstart=%x     seglen=%lu      len=%lu\n", start, segstart, seglength, length);
 
        mmi->mainmem = mmi->nearheap + mmi->farheap;
 
-//     getch();
-
-//goto xmsskip;
-
 //
 // detect EMS and allocate up to 64K at page frame
 //
-//printf("             EMS1\n");
-//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!
        mmi->EMSmem = 0;
+//goto emsskip;        //0000
        for(i = 1;i <
 #ifdef __WATCOMC__
        __argc
@@ -813,32 +801,23 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
                        ,ParmStringsexmm) == 0)
                        goto emsskip;                           // param NOEMS
        }
-//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!
        if(MML_CheckForEMS())
        {
-//printf("             EMS2\n");
-//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!
                MML_SetupEMS(mm);                                       // allocate space
-//printf("             EMS3\n");
-//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!
                //TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT!
                MML_UseSpace(mm->EMSpageframe,(MAPPAGES)*0x4000lu, mm);
-//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!
-//printf("             EMS4\n");
                //if(mm->EMSVer<0x40)
                        MM_MapEMS(mm, mmi);                                     // map in used pages
                //else
                        //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;//0000
        for(i = 1;i <
 #ifdef __WATCOMC__
        __argc
@@ -858,11 +837,8 @@ emsskip:
                        ,ParmStringsexmm) == 0)
                        goto xmsskip;                           // param NOXMS
        }
-//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!
        if(MML_CheckForXMS(mm))
        {
-//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!
-//printf("             XMS!\n");
                MML_SetupXMS(mm, mmi);                                  // allocate as many UMBs as possible
        }
 
@@ -892,15 +868,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"); }
 }
 
 //==========================================================================
@@ -923,16 +899,15 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi)
        word    startseg;
 
        needed = (size+15)/16;          // convert size from bytes to paragraphs
-printf(".");   //0000
-       //MM_GetNewBlock(mm);
+//printf("."); //0000
        GETNEWBLOCK;                            // fill in start and next after a spot is found
        mm->mmnew->length = needed;
        mm->mmnew->useptr = baseptr;
        mm->mmnew->attributes = BASEATTRIBUTES;
-printf(".");   //0000
-       for(search = 0; search<mm->endid; search++)
+//printf("."); //0000
+       for(search = 0; search<3; search++)
        {
-printf("       [case]");       //0000
+printf("\n     [case]");       //0000
        //
        // first search:        try to allocate right after the rover, then on up
        // second search:       search from the head pointer up to the rover
@@ -963,11 +938,11 @@ printf("2 ");     //0000
                        break;
                }
 
-               startseg = lastscan->start + (word)lastscan->length;
-
+               startseg = lastscan->start + lastscan->length;
+printf(" %x\n", startseg);
                while(scan != endscan)
                {
-//printf(","); //0000
+printf(",");   //0000
                        if(scan->start - startseg >= needed)
                        {
 printf(".");   //0000
@@ -985,7 +960,6 @@ printf(".");        //0000
 printf("               freeing block~\n");     //0000
                                        next = purge->next;
                                        FREEBLOCK(purge);
-                                       //MM_FreeBlock(purge, mm);
                                        purge = next;           // purge another if not at scan
                                }
                                mm->mmrover = mm->mmnew;
@@ -999,24 +973,31 @@ printf("          freeing block~\n");     //0000
                                || !(scan->attributes & PURGEBITS) )
                        {
 printf("       [lock] ");      //0000
-printf("len=%lu ", scan->length);
                                lastscan = scan;
-                               startseg = lastscan->start + (word)lastscan->length;
+printf("start=%x ", lastscan->start);
+printf("len=%x ", lastscan->length);
+printf("\n");  //0000
+printf("       %x", lastscan->start + lastscan->length);       //0000
+printf("       %x", lastscan->start + (word)lastscan->length); //0000
+printf("       %x", (word)lastscan->start + (word)lastscan->length);   //0000
+printf("\n");  //0000
+                               startseg = (word)lastscan->start + (word)lastscan->length+1;
+printf("startseg =%x   ok", startseg); //0000
                        }
 
-printf("\n");
+printf("       end\n");
                        scan=scan->next;                // look at next line
+printf("boop\n");//0000
                }
        }
 
        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");
-               printf("                endid=%u\n",(mm->endid));
                MM_Shutdown(mm);
                exit(-1);
        }
@@ -1061,7 +1042,6 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm)
        last->next = scan->next;
 
        FREEBLOCK(scan);
-       //MM_FreeBlock(scan, mm);
 }
 //==========================================================================
 
@@ -1253,10 +1233,8 @@ void MM_SortMem(mminfo_t *mm)
                MM_SetLock(&(memptr)audiosegs[playing],false);*/
 }
 
-
 //==========================================================================
 
-//****#if 0
 /*
 =====================
 =
@@ -1265,46 +1243,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;
        word temp;
-       long    end,owner;
-//++++ word chx,chy;
-       byte    scratch[160],str[16];
-
+       sdword  end,owner;
+       //word chx,chy;
+       word w;
+       dword wwww;
+       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("\nend==%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+(scan->length)-1;
 //++++         chy = scan->start/320;
 //++++         chx = scan->start%320;
                                //modexhlin(page, scan->start, (unsigned)end, chy, color);
@@ -1312,59 +1294,87 @@ CA_OpenDebug ();
                                //{
 //++++                                 modexClearRegion(page, chx, chy, 4, 4, color);
                                //}
-
 //++++         VW_Hlin(scan->start,(unsigned)end,0,color);
-
+               for(w=(scan->start)/80;w<=end/80;w++)
+               {
+                       //printf("+     %u      %lu\n", w, scan->length);
+                       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
+
+               wwww=(dword)(scan->next->start)-(dword)scan->start;
+               //wwww=(dword)scan->start+(dword)(scan->next->start);
+               if (scan->next && scan->next->start >= end+1)
+               {
+                       strcat(scratch0, AARESET);
+                       strcat(scratch0, "\n");
+                       strcat(scratch0,AAGREEN);
+                       for(w=(end+1)/80;w<=(wwww/80);w++)
+                       {
+                               //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");
+               }/*else {//if(scan->next->start <= scan->start){
+                       scan->next->start=scan->start+0x1000;
+                       wwww=(dword)(scan->next->start)-(dword)scan->start;
+                       strcat(scratch0, AARESET);
+                       strcat(scratch0, "\n");
+                       strcat(scratch0,AAGREEN);
+                       for(w=(end+1);w<=(0x1000/80);w++)
+                       {
+                               //printf("0     %x      %x      %u\n", scan->start, w);
+                               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");
+//                     getch();
+               }*/
+               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 ((word)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
 
 //==========================================================================
 
@@ -1384,8 +1394,7 @@ void MM_DumpData(mminfo_t *mm)
        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");
@@ -1459,8 +1468,8 @@ dword MM_UnusedMemory(mminfo_t *mm)
                scan = scan->next;
        }
 
-//     return free*16l;
-       return free;
+       return free*16lu;
+//     return free;
 }
 
 //==========================================================================
@@ -1492,8 +1501,8 @@ dword MM_TotalFree(mminfo_t *mm)
                scan = scan->next;
        }
 
-//     return free*16l;
-       return free;
+       return free*16lu;
+//     return free;
 }
 
 //==========================================================================
@@ -1523,11 +1532,7 @@ void MM_Report(/*page_t *page, */mminfo_t *mm, mminfotype *mmi)
        printf("mainmem=%lu\n", mmi->mainmem);
        printf("UnusedMemory=%lu\n", MM_UnusedMemory(mm));
        printf("TotalFree=%lu\n", MM_TotalFree(mm));
-       //mmi->nearheap+mmi->farheap+
-       printf("TotalUsed=%lu\n", mmi->mainmem+mmi->EMSmem+mmi->XMSmem);//+);
-//     printf("\n");
-//     printf("UnusedMemory=%lu kb\n", MM_UnusedMemory()/10248);
-//     printf("TotalFree=%lu kb\n", MM_TotalFree()/10248);
+       printf("TotalUsed=%lu\n", mmi->mainmem+mmi->EMSmem+mmi->XMSmem+mmi->XMSmem);
 }
 
 //==========================================================================
@@ -1688,7 +1693,6 @@ void MM_BombOnError(boolean bomb, mminfo_t *mm)
                return;
        }
        mm->mmfree=mm->mmfree->next;
-       mm->endid++;    //end of list
 }
 
 void MM_FreeBlock(mmblocktype *x, mminfo_t *mm)
@@ -1696,10 +1700,9 @@ void MM_FreeBlock(mmblocktype *x, mminfo_t *mm)
        x->useptr=NULL;
        x->next=mm->mmfree;
        mm->mmfree=x;
-       mm->endid--;    //end of list
 }*/
 
-void MM_seguin(void)
+/*void MM_seguin(void)
 {
        __asm {
                push    ds
@@ -1714,7 +1717,7 @@ void MM_segude(void)
        __asm {
                pop ds
        }
-}
+}*/
 
 /*
 pull data from far and put it into ds var