]> 4ch.mooo.com Git - 16.git/blobdiff - src/lib/16_mm.c
p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...
[16.git] / src / lib / 16_mm.c
index c2a966b8750fbb31e28bc2cb0b23122f79372b28..3e2077e011dacdded060ac6dca8594610a3ddcbe 100755 (executable)
@@ -28,7 +28,7 @@ Primary coder: John Carmack
 
 RELIES ON
 ---------
-Quit (char *error) function
+Quit (global_game_variables_t *gvar, char *error) function
 
 
 WORK TO DO
@@ -48,6 +48,7 @@ Open Watcom port by sparky4
 */
 #include "src/lib/16_mm.h"
 #include "src/lib/16_ca.h"
+#include <malloc.h>
 #pragma hdrstop
 
 #pragma warn -pro
@@ -72,9 +73,9 @@ void          (* XMSaddr) (void);             // far pointer to XMS driver
 
 =============================================================================
 */
-
+#ifndef __16_PM__
 static char *ParmStringsexmm[] = {"noems","noxms",""};
-
+#endif
 /*
 ======================
 =
@@ -87,18 +88,20 @@ static      char *ParmStringsexmm[] = {"noems","noxms",""};
 
 boolean MML_CheckForEMS(void)
 {
-       boolean emmcfems;
+       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
@@ -106,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
@@ -129,7 +142,8 @@ boolean MML_CheckForEMS(void)
                //
                // EMS is bad
                //
-               mov     emmcfems,0
+               mov     err,ah
+               mov     emmcfems,0
 #ifdef __BORLANDC__
        }
 #endif
@@ -137,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);
 }
 
@@ -285,7 +316,7 @@ void MML_ShutdownEMS(global_game_variables_t *gvar)
        }
 #endif
        if(errorflag==true)
-               Quit("MML_ShutdownEMS: Error freeing EMS!\n");  //++++ add something
+               Quit (gvar, "MML_ShutdownEMS: Error freeing EMS!\n");   //++++ add something
 }
 
 /*
@@ -437,10 +468,10 @@ byte MM_MapXEMS(global_game_variables_t *gvar)
 =======================
 */
 
-boolean MML_CheckForXMS(global_game_variables_t *gvar)
+boolean MML_CheckForXMS(void)
 {
+       //numUMBs = 0;
        boolean errorflag=false;
-       gvar->mm.numUMBs = 0;
 
        __asm {
                mov     ax,0x4300
@@ -561,30 +592,7 @@ void MML_ShutdownXMS(global_game_variables_t *gvar)
 ======================
 */
 
-/*void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar)
-{
-       //huge mmblocktype huge *scan,huge *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;
@@ -609,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;
@@ -698,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;
 
 }
 
@@ -716,8 +703,7 @@ void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar)
 
 void MML_ClearBlock(global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *scan,huge *last;
-       mmblocktype far *scan,far *last;
+       mmblocktype far *scan;//,far *last;
 
        scan = gvar->mm.mmhead->next;
 
@@ -753,10 +739,8 @@ void MM_Startup(global_game_variables_t *gvar)
        int i;
        //dword length,seglength;
        dword length; word seglength;
-       //huge void huge        *start;
        void far        *start;
        word    segstart;//,endfree;
-       //memptr *peeonself;
 
        if(gvar->mm.mmstarted)
                MM_Shutdown(gvar);
@@ -770,9 +754,7 @@ void MM_Startup(global_game_variables_t *gvar)
        gvar->mm.mmhead = NULL;
        gvar->mm.mmfree = &(gvar->mm.mmblocks[0]);
        for(i=0;i<MAXBLOCKS-1;i++)
-       {
                gvar->mm.mmblocks[i].next = &(gvar->mm.mmblocks[i+1]);
-       }
        gvar->mm.mmblocks[i].next = NULL;
 
 //
@@ -784,82 +766,64 @@ void MM_Startup(global_game_variables_t *gvar)
        gvar->mm.mmnew->length = 0xffff;
        gvar->mm.mmnew->attributes = LOCKBIT;
        gvar->mm.mmnew->next = NULL;
-       //gvar->mm.mmnew->useptr = peeonself;
        gvar->mm.mmrover = gvar->mm.mmhead;
 
-       //printf("              %x\n", peeonself);
-       //printf("              %x\n", *peeonself);
 //
 // get all available near conventional memory segments
 //
 #ifdef __WATCOMC__
        _nheapgrow();
-       length=(dword)_memavl();//(dword)GetFreeSize();
-       //huge start = (void huge *)(gvar->mm.nearheap = _nmalloc(length));
-       start = (void far *)(gvar->mm.nearheap = _nmalloc(length));
+#endif
+       length=(word)_memavl();//(word)coreleft();
+       //start = gvar->mm.nearheap = _fmalloc(length);
+#ifdef __WATCOMC__
+       start = (void __far *)(gvar->mm.nearheap = _nmalloc(length));
 #endif
 #ifdef __BORLANDC__
-       length=coreleft();
-       //huge start = (void huge *)(gvar->mm.nearheap = malloc(length));
        start = (void far *)(gvar->mm.nearheap = malloc(length));
 #endif
+
        length -= 16-(FP_OFF(start)&15);
        length -= SAVENEARHEAP;
        seglength = length / 16;                        // now in paragraphs
        segstart = FP_SEG(start)+(FP_OFF(start)+15)/16;
        MML_UseSpace(segstart,seglength, gvar);
        gvar->mmi.nearheap = length;
-       //printf("start=%Fp     segstart=%x     seglen=%lu      len=%lu\n", start, segstart, seglength, length);
+       //0000printf("near:     start=%Fp       segstart=%x     seglen=%lu      len=%lu\n", start, segstart, (dword)seglength, length);
 
 //
 // 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__
-       printf("farcoreleft()                           %lu\n", farcoreleft());
-       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
        segstart = FP_SEG(start)+(FP_OFF(start)+15)/16;
        MML_UseSpace(segstart,seglength, gvar);
        gvar->mmi.farheap = length;
-       //printf("start=%Fp     segstart=%x     seglen=%lu      len=%lu\n", start, segstart, seglength, length);
+       //0000printf("far:      start=%Fp       segstart=%x     seglen=%lu      len=%lu\n", start, segstart, (dword)seglength, length);
 
        gvar->mmi.mainmem = gvar->mmi.nearheap + gvar->mmi.farheap;
 
-#ifndef __16_PM__
+#if !defined(__16_PM__)// && defined(__WATCOMC__)
        if(!dbg_debugpm) {
 //
 // detect EMS and allocate up to 64K at page frame
 //
        gvar->mmi.EMSmem = 0;
 //goto emsskip;        //0000
-       for(i = 1;i <
-#ifdef __WATCOMC__
-       __argc
-#endif
-#ifdef __BORLANDC__
-       _argc
-#endif
-       ;i++)
+       for(i = 1;i < _argc;i++)
        {
-               if(US_CheckParm(
-#ifdef __WATCOMC__
-       __argv[i]
-#endif
-#ifdef __BORLANDC__
-       _argv[i]
-#endif
-                       ,ParmStringsexmm) == 0)
+               if(US_CheckParm(_argv[i],ParmStringsexmm) == 0)
                        goto emsskip;                           // param NOEMS
        }
        if(MML_CheckForEMS())
@@ -879,36 +843,22 @@ void MM_Startup(global_game_variables_t *gvar)
 emsskip:
        gvar->mmi.XMSmem = 0;
 goto xmsskip;//0000
-       for(i = 1;i <
-#ifdef __WATCOMC__
-       __argc
-#endif
-#ifdef __BORLANDC__
-       _argc
-#endif
-       ;i++)
+       for(i = 1;i < _argc;i++)
        {
-               if(US_CheckParm(
-#ifdef __WATCOMC__
-       __argv[i]
-#endif
-#ifdef __BORLANDC__
-       _argv[i]
-#endif
-                       ,ParmStringsexmm) == 0)
+               if(US_CheckParm( _argv[i],ParmStringsexmm) == 0)
                        goto xmsskip;                           // param NOXMS
        }
-       if(MML_CheckForXMS(gvar))
+       if(MML_CheckForXMS())
        {
                MML_SetupXMS(gvar);                                     // allocate as many UMBs as possible
        }
 
        }
+xmsskip:
 #endif
 //
 // allocate the misc buffer
 //
-xmsskip:
        gvar->mm.mmrover = gvar->mm.mmhead;             // start looking for space after low block
 
        MM_GetPtr(&(gvar->mm.bufferseg),BUFFERSIZE, gvar);
@@ -938,14 +888,16 @@ void MM_Shutdown(global_game_variables_t *gvar)
 #ifdef __BORLANDC__
        free(gvar->mm.nearheap);//      printf("                near freed\n");
 #endif
+#ifndef __16_PM__
 #ifdef __DEBUG__
        if(!dbg_debugpm) {
 #endif
        if(MML_CheckForEMS()){ MML_ShutdownEMS(gvar); }//printf("               EMS freed\n"); }
-       if(MML_CheckForXMS(gvar)){ MML_ShutdownXMS(gvar); }//printf("           XMS freed\n"); }
+       if(MML_CheckForXMS()){ MML_ShutdownXMS(gvar); }//printf("               XMS freed\n"); }
 #ifdef __DEBUG__
        }
 #endif
+#endif
 }
 
 //==========================================================================
@@ -962,7 +914,6 @@ void MM_Shutdown(global_game_variables_t *gvar)
 
 void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *scan,huge *lastscan,huge *endscan,huge *purge,huge *next;
        mmblocktype far *scan,far *lastscan,far *endscan,far *purge,far *next;
        int                     search;
        unsigned        needed,startseg;
@@ -974,13 +925,15 @@ 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
-       //exit(-5); }
+       //Quit(gvar, "gvar->mm.mmnew->useptr==NULL"); }
        gvar->mm.mmnew->attributes = BASEATTRIBUTES;
 
 //tryagain:
@@ -1059,9 +1012,7 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar)
                //heapdump();
 #endif
                printf(OUT_OF_MEM_MSG,(size-gvar->mmi.nearheap));
-               printf("for stability reasons the program will shut down! wwww\n");
-               MM_Shutdown(gvar);
-               exit(-1);
+               Quit(gvar, "for stability reasons the program will shut down! wwww\n");
        }
        else
                gvar->mm.mmerror = true;
@@ -1081,7 +1032,6 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar)
 
 void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *scan,huge *last;
        mmblocktype far *scan,far *last;
 
        last = gvar->mm.mmhead;
@@ -1098,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;
@@ -1121,7 +1071,6 @@ void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar)
 
 void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *start;
        mmblocktype far *start;
 
        start = gvar->mm.mmrover;
@@ -1137,7 +1086,7 @@ void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar)
                        gvar->mm.mmrover = gvar->mm.mmhead;
                else if(gvar->mm.mmrover == start)
                {
-                       Quit("MM_SetPurge: Block not found!");
+                       Quit (gvar, "MM_SetPurge: Block not found!");
                        //return;
                }
 
@@ -1161,7 +1110,6 @@ void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar)
 
 void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *start;
        mmblocktype far *start;
 
        start = gvar->mm.mmrover;
@@ -1177,7 +1125,7 @@ void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar)
                        gvar->mm.mmrover = gvar->mm.mmhead;
                else if(gvar->mm.mmrover == start)
                {
-                       Quit("MM_SetLock: Block not found!");
+                       Quit (gvar, "MM_SetLock: Block not found!");
                        //return;
                }
 
@@ -1201,10 +1149,9 @@ void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar)
 
 void MM_SortMem(global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *scan,huge *last,huge *next;
        mmblocktype far *scan,far *last,far *next;
        unsigned        start,length,source,dest,oldborder;
-       int                     playing;
+       //++++int                       playing;
 
        //
        // lock down a currently playing sound
@@ -1221,13 +1168,13 @@ void MM_SortMem(global_game_variables_t *gvar)
                        playing += STARTADLIBSOUNDS;
                        break;
                }
-               MM_SetLock(&(memptr)audiosegs[playing],true);
+               MM_SetLock((memptr *)&audiosegs[playing],true);
        }
 
 
        SD_StopSound();*/
-//     oldborder = bordercolor;
-//     VW_ColorBorder (15);
+       oldborder = gvar->video.bordercolor;
+       gvar->video.bordercolor = modexPalOverscan(15);
 
        if(beforesort)
                beforesort();
@@ -1294,10 +1241,10 @@ void MM_SortMem(global_game_variables_t *gvar)
        if(aftersort)
                aftersort();
 
-//     VW_ColorBorder (oldborder);
+       VL_ColorBorder (oldborder, &gvar->video);
 
 /*++++ if(playing)
-               MM_SetLock(&(memptr)audiosegs[playing],false);*/
+               MM_SetLock((memptr *)&audiosegs[playing],false);*/
 }
 
 //==========================================================================
@@ -1310,36 +1257,42 @@ void MM_SortMem(global_game_variables_t *gvar)
 =====================
 */
 
+//#define MMSMSORTNEWTYPE
+#define MMSHOWMEMOFFSET 0//(gvar->video.page[0].dx+(gvar->video.page[0].dy*gvar->video.page[0].stridew))
+
 void MM_ShowMemory(global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *scan;
        mmblocktype far *scan;
-       word temp;
+       unsigned color,temp,x,y         ,w;//,bofstemp;
        sdword  end,owner;
-       //word chx,chy;
-       word w;
-       //dword wwww;
-       byte    scratch[160],scratch0[4096],scratch1[160],str[16];
-       //byte d = '#';
-//**** VW_SetDefaultColors();
-//**** VW_SetLineWidth(40);
-//++++mh       temp = bufferofs;
-//++++mh       bufferofs = 0;
-//**** VW_SetScreen (0,0);
+       byte    scratch[160],scratch0[4096],str[16];
+
+//--   VL_SetLineWidth(40, gvar);
+       //temp = gvar->video.ofs.bufferofs;
+       //gvar->video.ofs.bufferofs = gvar->video.ofs.displayofs;
+       temp = BDOFSCONV gvar->video.BOFS+MMSHOWMEMOFFSET;
+       gvar->video.BOFS = gvar->video.DOFS;
        scan = gvar->mm.mmhead;
-       end = -1;
+
+       end = -1; w = 0;
 
        CA_OpenDebug (gvar);
-       w=0;
-       while(scan)
+       while (scan)
        {
                strcpy(scratch, AARESET);
                if(scan->attributes & PURGEBITS)
+               {
+                       color = 6;              // dark purple = purgable
                        strcpy(scratch0, AAMAGENTA);            // dark purple = purgable
-               else
+               }else{
+                       color = 2;              // medium blue = non purgable
                        strcpy(scratch0, AABLUE);               // medium blue = non purgable
+               }
                if(scan->attributes & LOCKBIT)
+               {
+                       color = 1;              // red = locked
                        strcpy(scratch0, AARED);                // red = locked
+               }
                if(scan->start<=end)
                {
                        printf("\nend==%d\n\n", end);
@@ -1351,50 +1304,48 @@ void MM_ShowMemory(global_game_variables_t *gvar)
                        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");
-                       break;
+                       Quit (gvar, "MM_ShowMemory: Memory block order currupted!");
                }
+#ifdef MMSMSORTNEWTYPE
                end = scan->start+(scan->length)-1;
-//++++         chy = scan->start/320;
-//++++         chx = scan->start%320;
-                               //modexhlin(page, scan->start, (unsigned)end, chy, color);
-                               //for(chx=scan->start;chx+4>=(word)end;chx+=4)
-                               //{
-//++++                                 modexClearRegion(page, chx, chy, 4, 4, color);
-                               //}
-//++++         VW_Hlin(scan->start,(unsigned)end,0,color);
+#else
+               end = scan->length-1;
+#endif
+               if(!gvar->video.page[0].width) gvar->video.page[0].width = 352;
+               y = scan->start/gvar->video.page[0].width;
+               x = scan->start%gvar->video.page[0].width;
+               VW_Hlin(x,x+end,y,color,gvar);
+               VL_Plot(x,y,15,gvar);
                for(w=(scan->start)/80;w<=end/80;w++)
                {
                        //printf("+     %u      %lu\n", w, scan->length);
                        strcat(scratch0, "+");
                }
-               //++==++==optional strcat(scratch0, AARESET); strcat(scratch0, AAGREY); strcat(scratch0,"_");
-//++++         VW_Plot(scan->start,0,15);
-//++++                         modexClearRegion(page, chx, chy, 4, 4, 15);
-//++++                 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);
+               //++==++==optional
+               strcat(scratch0, AARESET); strcat(scratch0, AAGREY); strcat(scratch0,"_");
+#ifdef MMSMSORTNEWTYPE
+               if (scan->next && scan->next->start > end+1)
+#else
                if (scan->next && scan->next->start >= end+1)
+#endif
                {
+                       VW_Hlin(x+end+1,x+(scan->next->start-scan->start),y,3,gvar);    // black = free//now green
                        strcat(scratch0, AARESET);
-                       //++==++==optional strcat(scratch0, "\n");
+//++==++==optional                     strcat(scratch0, "\n");
                        strcat(scratch0,AAGREEN);
                        for(w=(end+1)/80;w<=((scan->next->start-scan->start)/80);w++)
-                       //for(w=(wwww)/80;w<=((end+1)/80);w++)
-                       //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=%u  wwww=%lu        start=%04x      next=%04x       end=%lu\n", w/80, wwww/80, scan->start, (scan->next->start), end+1);
+                       //printf("w=%u  start=%04x      next=%04x       end=%lu\n", w/80, scan->start, (scan->next->start), end+1);
                        //printf("==================\n");
                        strcat(scratch0, "\n");
-                       //getch();
-               }/*else {//if(scan->next->start <= scan->start){
+               }
+#if 0
+               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);
@@ -1404,29 +1355,21 @@ void MM_ShowMemory(global_game_variables_t *gvar)
                                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("w=%x    start=%x        next=%x end=%u\n", w, scan->start, (scan->next->start), end+1);
                        printf("================\n");
                        getch();
-               }*/
+               }
+#endif
                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);
-                       //}
-                                       //modexhlin(page, end+1,scan->next->start, chy, 0);
-/*             y = scan->start/320;
-               x = scan->start%320;
-               VW_Hlin(x,x+end,y,color);
-               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, AABLACK); strcat(scratch,"\t"); strcat(scratch, AARESET);
                strcat (scratch,"\tSize:");
                ultoa ((unsigned)scan->length,str,10);
                strcat (scratch,str);
+//             strcat(scratch, AABLACK); strcat(scratch,"\t"); strcat(scratch, AARESET);
                strcat (scratch,"\tOwner:0x");
                owner = (unsigned)scan->useptr;
                ultoa (owner,str,16);
@@ -1434,35 +1377,23 @@ void MM_ShowMemory(global_game_variables_t *gvar)
                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);
 
                scan = scan->next;
        }
-       /*strcpy(scratch1, AARESET);
-       strcat(scratch1, "========================================\n");
-       strcat(scratch1, "near=  ");
-       ultoa (*(gvar->mm.nearheap),str,10);
-       strcat (scratch1,str);
-       strcat(scratch1, "      far= ");
-       ultoa (*(gvar->mm.farheap),str,10);
-       strcat (scratch1,str);
-       strcat(scratch1, "\n");
-       //strcat(scratch1, "&near=      %Fp ", &(gvar->mm.nearheap));
-       //strcat(scratch1, "&far=       %Fp", &(gvar->mm.farheap));
-       //strcat(scratch1, "\n");
-       strcat(scratch1, "========================================\n");
-       write(gvar->handle.debughandle,scratch1,strlen(scratch1));*/
-
 
        CA_CloseDebug (gvar);
 
-//++++mh       IN_Ack();
-//**** VW_SetLineWidth(64);
-//++++mh       bufferofs = temp;
+       IN_Ack(gvar);
+//--   VW_SetLineWidth(64);
+       //gvar->video.ofs.bufferofs = temp;
+       //bofstemp = BDOFSCONV gvar->video.BOFS;//+MMSHOWMEMOFFSET;
+       //bofstemp = temp;
+       gvar->video.BOFS = (byte __far *)temp;
 }
 
+
+
 //==========================================================================
 
 /*
@@ -1475,14 +1406,18 @@ void MM_ShowMemory(global_game_variables_t *gvar)
 
 void MM_DumpData(global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *scan,huge *best;
        mmblocktype far *scan,far *best;
        long    lowest,oldlowest;
        word    owner;
        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
@@ -1550,7 +1485,6 @@ void MM_DumpData(global_game_variables_t *gvar)
 dword MM_UnusedMemory(global_game_variables_t *gvar)
 {
        dword free;
-       //huge mmblocktype huge *scan;
        mmblocktype far *scan;
 
        free = 0;
@@ -1582,7 +1516,6 @@ dword MM_UnusedMemory(global_game_variables_t *gvar)
 dword MM_TotalFree(global_game_variables_t *gvar)
 {
        dword free;
-       //huge mmblocktype huge *scan;
        mmblocktype far *scan;
 
        free = 0;
@@ -1617,23 +1550,25 @@ void MM_Report_(global_game_variables_t *gvar)
        printf("========================================\n");
        if(MML_CheckForEMS())
        {
-               printf("        LIMEMS\n");
-               printf("                EMM v%x.%x available\n", gvar->pm.emm.EMSVer>>4,gvar->pm.emm.EMSVer&0x0F);
-               printf("                totalEMSpages:  %u      ", gvar->pm.emm.totalEMSpages); printf("freeEMSpages:   %u\n", gvar->pm.emm.freeEMSpages);
-               printf("                EMSPageFrame:   %x\n", gvar->pm.emm.EMSPageFrame);
+               printf("        %cLIMEMS        %u\n", 0xC9, gvar->pm.emm.EMSPresent);
+               printf("        %c%cEMM v%x.%x available\n", 0xC7, 0xC4, gvar->pm.emm.EMSVer>>4,gvar->pm.emm.EMSVer&0x0F);
+               printf("        %c%ctotalEMSpages:      %u      ", 0xC7, 0xC4, gvar->pm.emm.totalEMSpages); printf("freeEMSpages:       %u\n", gvar->pm.emm.freeEMSpages);
+               printf("        %c%cEMSPageFrame:       %04x\n", 0xC7, 0xC4, gvar->pm.emm.EMSPageFrame);
+               printf("        %c%cEMSmem:     %lu or %luk\n", 0xD3, 0xC4, gvar->mmi.EMSmem, gvar->mmi.EMSmem/1204);
        }
-       if(MML_CheckForXMS(gvar))
+       if(MML_CheckForXMS())
        {
-               printf("        XMS\n");
-               printf("                XMSaddr:        %X\n", *XMSaddr);
+               printf("        %cXMS   %u\n", 0xC9, gvar->pm.xmm.XMSPresent);
+               printf("        %c%cXMS v%x.%x available\n", 0xC7, 0xC4, XMSVer>>8,XMSVer&0x0F);
+               printf("        %c%cXMSDriver:  %Fp\n", 0xC7, 0xC4, XMSDriver);
+               printf("        %c%cXMSHandle:  %04x\n", 0xC7, 0xC4, gvar->pm.xmm.XMSHandle);
+               printf("        %c%cXMSmem:     %lu or %lukb\n", 0xD3, 0xC4, gvar->mmi.XMSmem, gvar->mmi.XMSmem/1024);
        }
-       printf("nearheap:       %lu             ", gvar->mmi.nearheap); printf("farheap:        %lu\n", gvar->mmi.farheap);
-       if(MML_CheckForEMS()) printf("EMSmem:           %lu     ", gvar->mmi.EMSmem); if(MML_CheckForXMS(gvar)) printf("XMSmem:         %lu", gvar->mmi.XMSmem); printf("\n");
-       printf("convmem:\n"); DebugMemory_(gvar, 0);
+       printf("        %cConv. %u\n", 0xC9, gvar->pm.mm.MainPresent); DebugMemory_(gvar, 0);
        //printf("mainmem:      %lu\n", gvar->mmi.mainmem);
        //printf("Total convmem:        %lu     ", gvar->mmi.mainmem); printf("TotalFree:       %lu     ", MM_TotalFree(gvar)+gvar->mmi.EMSmem+gvar->mmi.XMSmem+gvar->mmi.XMSmem); printf("TotalUsed:   %lu\n", gvar->mmi.mainmem);
        //printf("                      UnusedMemory:   %lu\n", MM_UnusedMemory(gvar));
-
+       printf("nearheap:       %lu             ", gvar->mmi.nearheap); printf("farheap:        %lu\n", gvar->mmi.farheap);
 }
 
 //==========================================================================
@@ -1782,7 +1717,8 @@ void MM_BombOnError(boolean bomb, global_game_variables_t *gvar)
        gvar->mm.bombonerror = bomb;
 }
 
-/*void MM_GetNewBlock(global_game_variables_t *gvar)
+#if 0
+void MM_GetNewBlock(global_game_variables_t *gvar)
 {
        if(!gvar->mm.mmfree)
                MML_ClearBlock(gvar);
@@ -1801,7 +1737,17 @@ void MM_FreeBlock(mmblocktype *x, global_game_variables_t *gvar)
        x->useptr=NULL;
        x->next=gvar->mm.mmfree;
        gvar->mm.mmfree=x;
-}*/
+}
+#endif
+
+void xms_call(byte v, global_game_variables_t *gvar)
+{
+       dword XMSDriver = gvar->pm.xmm.XMSDriver;
+       __asm {
+               mov     ah,[v]
+               call [DWORD PTR XMSDriver]
+       }
+}
 
 /*void MM_seguin(void)
 {