]> 4ch.mooo.com Git - 16.git/blobdiff - src/lib/16_mm.c
those programs are messy! wwww
[16.git] / src / lib / 16_mm.c
index 5c658bb79ff58564bfe2dcd30f790cda40a4324d..701db3e89c3922bdf1c8f789da182afe4caac8c8 100644 (file)
@@ -47,6 +47,10 @@ Open Watcom port by sparky4
 
 */
 #include "src/lib/16_mm.h"
+#pragma hdrstop
+
+#pragma warn -pro
+#pragma warn -use
 
 /*
 =============================================================================
@@ -83,10 +87,11 @@ static      char *ParmStringsexmm[] = {"noems","noxms",""};
 boolean MML_CheckForEMS(void)
 {
        boolean emmcfems;
-       char    emmname[] = "EMMXXXX0";
+       static char     emmname[] = "EMMXXXX0"; //fix by andrius4669
 //             mov     dx,OFFSET emmname
        __asm {
-               LEA     DX, emmname     //fix by andrius4669
+               //LEA   DX, emmname     //fix by andrius4669
+               mov     dx,OFFSET emmname       //fix by andrius4669
                mov     ax,0x3d00
                int     0x21            // try to open EMMXXXX0 device
                jc      error
@@ -134,14 +139,14 @@ boolean MML_CheckForEMS(void)
 =======================
 */
 
-unsigned MML_SetupEMS(mminfo_t *mm)
+byte MML_SetupEMS(mminfo_t *mm)
 {
-       char    str[80],str2[10];
-       unsigned        err;
+       byte    str[160];
+       byte    err;
        boolean errorflag=false;
-       union REGS CPURegs;
 
        unsigned int EMSVer = 0;
+       //byte  EMS_status;
        unsigned        totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
        totalEMSpages = freeEMSpages = EMSpageframe = EMSpagesmapped = 0;
 
@@ -150,6 +155,7 @@ unsigned MML_SetupEMS(mminfo_t *mm)
                mov     ah,EMS_STATUS
                int     EMS_INT                                         // make sure EMS hardware is present
                or      ah,ah
+               //mov   [EMS_status],ah
                jnz     error
 
                mov     ah,EMS_VERSION
@@ -196,6 +202,7 @@ getpages:
                mov     [EMShandle],dx
                jmp End
 error:
+               mov     err,ah
                mov     errorflag,1
                jmp End
 noEMS:
@@ -203,10 +210,10 @@ End:
        }
        if(errorflag==true)
        {
-               err = CPURegs.h.ah;
-               strcpy(str,"MML_SetupEMS: EMS error 0x");
-               itoa(err,str2,16);
-               strcpy(str,str2);
+               //err = CPURegs.h.ah;
+               strcpy(str,"MM_SetupEMS: EMS error ");
+               //itoa(err,str2,16);
+               MM_EMSerr(&str, err);
                printf("%s\n",str);
                return err;
        }
@@ -245,7 +252,7 @@ void MML_ShutdownEMS(mminfo_t *mm)
                mov     errorflag,1
                ok:
        }
-       if(errorflag==true) printf("MML_ShutdownEMS: Error freeing EMS!");      //++++ add something
+       if(errorflag==true) printf("MML_ShutdownEMS: Error freeing EMS!\n");    //++++ add something
 }
 
 /*
@@ -260,16 +267,16 @@ void MML_ShutdownEMS(mminfo_t *mm)
 ====================
 */
 
-unsigned MM_MapEMS(mminfo_t *mm)
+byte MM_MapEMS(mminfo_t *mm, mminfotype *mmi)
 {
-       char    str[80],str2[10];
-       unsigned        err, EMShandle;
+       byte    str[160];
+       unsigned        EMShandle;
+       byte err;
        boolean errorflag=false;
        int     i;
-       union REGS CPURegs;
        EMShandle=mm->EMShandle;
 
-       for (i=0;i<mm->EMSpagesmapped;i++)
+       for (i=0;i<4/*MAPPAGES*/;i++)
        {
                __asm
                {
@@ -282,19 +289,90 @@ unsigned MM_MapEMS(mminfo_t *mm)
                        jnz     error
                        jmp End
                        error:
+                       mov     err,ah
+                       mov     errorflag,1
+                       End:
+               }
+               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;
+       return 0;
+}
+
+byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi)
+{
+//SUB EMS.MapXPages (PhysicalStart, LogicalStart, NumPages, Handle)
+
+       //Maps up to 4 logical EMS pages to physical pages in the page frame, where:
+       //PhysicalStart = Physical page first logical page is mapped to
+       //LogicalStart  = First logical page to map
+       //NumPages      = Number of pages to map (1 to 4)
+       //Handle        = EMS handle logical pages are allocated to
+
+  /*//Create a buffer containing the page information
+//  FOR x = 0 TO NumPages - 1
+//    MapInfo$ = MapInfo$ + MKI$(LogicalStart + x) + MKI$(PhysicalStart + x)
+//  NEXT*/
+
+//  Regs.ax = 0x5000                           //Map the pages in the buffer
+//  Regs.cx = NumPages                         //to the pageframe
+//  Regs.dx = Handle
+//  Regs.ds = VARSEG(MapInfo$)
+//  Regs.si = SADD(MapInfo$)
+//  InterruptX 0x67, Regs, Regs
+//     EMS.Error = (Regs.ax AND 0xFF00&) \ 0x100  //Store the status code
+
+//END SUB
+       byte    str[160];
+       byte err;
+       word    EMShandle;
+       boolean errorflag=false;
+       int     i;
+       EMShandle=mm->EMShandle;
+
+       if(mm->EMSVer<0x40)
+               return 5;
+
+       for (i=0;i<MAPPAGES;i++)
+       {
+               __asm
+               {
+                       mov     ah,EMS_MAPXPAGE
+                       mov     cx,[i]                  // logical page
+                       mov     al,bl                   // physical page
+                       mov     dx,[EMShandle]  // handle
+                       int     EMS_INT
+                       or      ah,ah
+                       jnz     error
+                       jmp End
+                       error:
+                       mov     err,ah
                        mov     errorflag,1
                        End:
                }
                if(errorflag==true)
                {
-                       err = CPURegs.h.ah;
-                       strcpy(str,"MM_MapEMS: EMS error 0x");
-                       itoa(err,str2,16);
-                       strcpy(str,str2);
+                       //err = CPURegs.h.ah;
+                       //strcpy(str,"MM_MapXEMS: EMS error 0x");
+                       strcpy(str,"MM_MapXEMS: EMS error ");
+                       //itoa(err,str2,16);
+                       MM_EMSerr(&str, err);
                        printf("%s\n",str);
+                       //printf("%s%x\n",str, err);
+                       //printf("FACK! %x\n", err);
                        return err;
                }
        }
+       mmi->EMSmem = (i)*0x4000lu;
        return 0;
 }
 
@@ -423,6 +501,7 @@ void MML_ShutdownXMS(mminfo_t *mm)
 void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
 {
        mmblocktype huge *scan,huge *last;
+       word            segm;
        dword   oldend;
        dword           extra;
 
@@ -438,20 +517,16 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
                scan = scan->next;
        }
 
-       //find out how many blocks it span!
-       if(seglength>0xfffflu)
+       //find out how many blocks it spans!
+       if(seglength>0xffffu)
        {
-               scan->segm=seglength/0xfffflu;
+//             segm=seglength/0x4000u;
+               segm=seglength/0xffffu;
        }
-       else scan->segm=1;
+       else segm=1;
 
-//
-// take the given range out of the block
-//
-       oldend = scan->start + scan->length;
-       extra = oldend - (segstart+seglength);
        //++++emsver stuff!
-       if(extra>0xfffflu)
+       if(segm>1/*extra>0xfffflu*/)
        {
                /*__asm
                {
@@ -460,11 +535,7 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
                        inc             ax
                        mov     ds,ax
                }*/
-printf("segm=%u        ", scan->segm);
-printf("ex=%lu ", extra);
-printf("len=%u ", scan->length);
-printf("segsta=%u      ", segstart);
-printf("seglen=%lu\n", seglength);
+
 
 //MML_UseSpace(?segstart?, ?length?, mm);
 
@@ -475,6 +546,19 @@ printf("seglen=%lu\n", seglength);
                //printf("MML_UseSpace: Segment spans two blocks!\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);
@@ -549,18 +633,21 @@ void MML_ClearBlock(mminfo_t *mm)
 void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 {
        int i;
-       dword length;//,farlen;
+       dword length,seglength;
+       //dword length; word seglength;
        void huge       *start;
-       unsigned        segstart,seglength,endfree;
+       word    segstart;//,endfree;
 
        if(mm->mmstarted)
                MM_Shutdown(mm);
 
        mm->mmstarted = true;
        mm->bombonerror = true;
+
 //
 // 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++)
@@ -572,73 +659,88 @@ 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->mmhead = mm->mmnew;                         // this will allways be the first node
        mm->mmnew->start = 0;
-       mm->mmnew->length = 0xffff;                     //todo: mm make it fucking massive as fuck!~
+       mm->mmnew->length = 0xffff;
        mm->mmnew->attributes = LOCKBIT;
        mm->mmnew->next = NULL;
        mm->mmrover = mm->mmhead;
 
-//     farlen=_bios_memsize()*1024;
-
 //
 // get all available near conventional memory segments
 //
 //---- length=coreleft();
+       printf("                nearheap making!\n");
        _nheapgrow();
-       length=_memavl();
-       start = (void huge *)(mm->nearheap = malloc(length));
-
+       length=(dword)_memavl();//(dword)GetFreeSize();
+       start = (void huge *)(mm->nearheap = _nmalloc(length));
        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, mm);
        mmi->nearheap = length;
+       printf("start=%FP       segstart=%X     seglen=%lu      len=%lu\n", start, segstart, seglength, length);
+       //heapdump();
+       //getch();
 
 //
 // get all available far conventional memory segments
 //
 //---- length=farcoreleft();
+       printf("                farheap making!\n");
        _fheapgrow();
-       length=_memavl();
-       //length-=farlen;
-       start = mm->farheap = halloc(length, sizeof(dword));
-       //start = mm->farheap = _fmalloc(length);
+       length=(dword)GetFarFreeSize();//0xffffUL*4UL;
+       //start = mm->farheap = halloc(length, 1);
+       start = mm->farheap = _fmalloc(length);
        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();
+
        mmi->mainmem = mmi->nearheap + mmi->farheap;
 
+       getch();
+
+//goto xmsskip;
 
 //
 // detect EMS and allocate up to 64K at page frame
 //
-       printf("EMS!\n\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("               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;
        for(i = 1;i < __argc;i++)
        {
                if(US_CheckParm(__argv[i],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!
+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("EMS1\n");
+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("\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("               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,(mm->EMSpagesmapped)*0x4000lu, mm);
-//printf("EMS3\n");
-               MM_MapEMS(mm);                                  // map in used pages
-//printf("EMS4\n");
-               mmi->EMSmem = (mm->EMSpagesmapped)*0x4000lu;
+               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
        }
 
+goto xmsskip;
+
 //
 // detect XMS and get upper memory blocks
 //
@@ -649,10 +751,11 @@ emsskip:
                if(US_CheckParm(__argv[i],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!
+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("XMS!\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!
+printf("               XMS!\n");
                MML_SetupXMS(mm, mmi);                                  // allocate as many UMBs as possible
        }
 
@@ -682,14 +785,10 @@ void MM_Shutdown(mminfo_t *mm)
        if(!(mm->mmstarted))
                return;
 
-       _ffree(mm->farheap);
-       printf("far freed\n");
-       free(mm->nearheap);
-       printf("near freed\n");
-       //hfree(mm->hugeheap);
-       //printf("huge freed\n");
-       if(MML_CheckForEMS()){ MML_ShutdownEMS(mm); printf("EMS freed\n"); }
-       if(MML_CheckForXMS(mm)){ MML_ShutdownXMS(mm); printf("XMS freed\n"); }
+       _ffree(mm->farheap);    printf("                far freed\n");
+       _nfree(mm->nearheap);   printf("                near freed\n");
+       if(MML_CheckForEMS()){ MML_ShutdownEMS(mm); printf("            EMS freed\n"); }
+       if(MML_CheckForXMS(mm)){ MML_ShutdownXMS(mm); printf("          XMS freed\n"); }
 }
 
 //==========================================================================
@@ -787,7 +886,12 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi)
        }
 
        if (mm->bombonerror)
+       {
                printf(OUT_OF_MEM_MSG,(size-mmi->nearheap));
+               printf("for stability reasons the program will shut down! wwww\n");
+               MM_Shutdown(mm);
+               exit(-1);
+       }
        else
                mm->mmerror = true;
 }
@@ -822,7 +926,7 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm)
 
        if(!scan)
        {
-               printf("MM_FreePtr: Block not found!");
+               printf("MM_FreePtr: Block not found!\n");
                return;
        }
 
@@ -1031,12 +1135,13 @@ void MM_SortMem(mminfo_t *mm)
 =====================
 */
 
-void MM_ShowMemory(mminfo_t *mm)
+void MM_ShowMemory(/*page_t *page, */mminfo_t *mm)
 {
        mmblocktype huge *scan;
-       unsigned color,temp;//, i;
+       word color,temp;
        long    end,owner;
-       char    scratch[160],str[16];
+       word chx,chy;
+       byte    scratch[160],str[16];
 
 //**** VW_SetDefaultColors();
 //**** VW_SetLineWidth(40);
@@ -1048,7 +1153,10 @@ void MM_ShowMemory(mminfo_t *mm)
 
        end = -1;
 
-//CA_OpenDebug ();
+CA_OpenDebug ();
+
+       chx=0;
+       chy=0;
 
        while(scan)
        {
@@ -1060,36 +1168,66 @@ void MM_ShowMemory(mminfo_t *mm)
                        color = 12;             // red = locked
                if(scan->start<=end)
                {
-                       printf("\nMM_ShowMemory: Memory block order currupted!\n");
+                       //printf(");
+                       write(debughandle,"\nMM_ShowMemory: Memory block order currupted!\n",strlen("\nMM_ShowMemory: Memory block order currupted!\n"));
+                       //modexprint(&page, chx, chy, 1, 0, 24, "\nMM_ShowMemory: Memory block order currupted!\n");
                        return;
                }
                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);
+
 //++++         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
+                       //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);
+
+/*
+               end = scan->length-1;
+               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,"Location:");
+strcpy(scratch,"Seg:");
 ultoa (scan->start,str,16);
 strcat (scratch,str);
 strcat (scratch,"\tSize:");
-ltoa ((dword)scan->length*16,str,10);
+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));
-fprintf(stdout, "%s", scratch);
+write(debughandle,scratch,strlen(scratch));
+//modexprint(page, chx, chy, 1, 0, 24, &scratch);
+//++++chy+=4;
+//fprintf(stdout, "%s", scratch);
 //****#endif
 
                scan = scan->next;
        }
 
-//CA_CloseDebug ();
+CA_CloseDebug ();
 
 //++++mh       IN_Ack();
 //**** VW_SetLineWidth(64);
@@ -1099,6 +1237,72 @@ fprintf(stdout, "%s", scratch);
 
 //==========================================================================
 
+/*
+=====================
+=
+= MM_DumpData
+=
+=====================
+*/
+
+void MM_DumpData(mminfo_t *mm)
+{
+       mmblocktype far *scan,far *best;
+       long    lowest,oldlowest;
+       word    owner;
+       byte    lock,purge;
+       FILE    *dumpfile;
+
+
+       //++++free(mm->nearheap);
+       dumpfile = fopen ("mmdump.16","w");
+       if (!dumpfile){
+               printf("MM_DumpData: Couldn't open MMDUMP.16!\n");
+               return;
+       }
+
+       lowest = -1;
+       do
+       {
+               oldlowest = lowest;
+               lowest = 0xffff;
+
+               scan = mm->mmhead;
+               while (scan)
+               {
+                       owner = (word)scan->useptr;
+
+                       if (owner && owner<lowest && owner > oldlowest)
+                       {
+                               best = scan;
+                               lowest = owner;
+                       }
+
+                       scan = scan->next;
+               }
+
+               if (lowest != 0xffff)
+               {
+                       if (best->attributes & PURGEBITS)
+                               purge = 'P';
+                       else
+                               purge = '-';
+                       if (best->attributes & LOCKBIT)
+                               lock = 'L';
+                       else
+                               lock = '-';
+                       fprintf (dumpfile,"0x%p (%c%c) = %u\n"
+                       ,(word)lowest,lock,purge,best->length);
+               }
+
+       } while (lowest != 0xffff);
+
+       fclose(dumpfile);
+       printf("MMDUMP.16 created.\n");
+}
+
+//==========================================================================
+
 
 /*
 ======================
@@ -1124,8 +1328,8 @@ dword MM_UnusedMemory(mminfo_t *mm)
                scan = scan->next;
        }
 
-       return free*16l;
-//     return free;
+//     return free*16l;
+       return free;
 }
 
 //==========================================================================
@@ -1157,8 +1361,8 @@ dword MM_TotalFree(mminfo_t *mm)
                scan = scan->next;
        }
 
-       return free*16l;
-//     return free;
+//     return free*16l;
+       return free;
 }
 
 //==========================================================================
@@ -1171,16 +1375,16 @@ dword MM_TotalFree(mminfo_t *mm)
 =====================
 */
 
-void MM_Report(mminfo_t *mm, mminfotype *mmi)
+void MM_Report(/*page_t *page, */mminfo_t *mm, mminfotype *mmi)
 {
        if(MML_CheckForEMS())
        {
-               printf("EMM %x available\n", mm->EMSVer);
+               printf("EMM v%x.%x available\n", mm->EMSVer>>4,mm->EMSVer&0x0F);
                printf("totalEMSpages=%u\n", mm->totalEMSpages);
                printf("freeEMSpages=%u\n", mm->freeEMSpages);
                printf("EMSpageframe=%x\n", mm->EMSpageframe);
        }
-       if(MML_CheckForXMS(mm)) printf("XMSaddr=%Fp\n", *XMSaddr);
+       if(MML_CheckForXMS(mm)) printf("XMSaddr=%X\n", *XMSaddr);
        printf("near=%lu\n", mmi->nearheap);
        printf("far=%lu\n", mmi->farheap);
        printf("EMSmem=%lu\n", mmi->EMSmem);
@@ -1188,6 +1392,8 @@ void MM_Report(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);
@@ -1198,22 +1404,131 @@ void MM_Report(mminfo_t *mm, mminfotype *mmi)
 /*
 =====================
 =
-= MM_EMSVer
+= MM_EMSerr
 =
 =====================
+*/
 
-
-int MM_EMSVer(void)
+void MM_EMSerr(byte *stri, byte err)
 {
-       int EMSver;
-       __asm
+       //Returns a text string describing the error code in EMS.Error.
+       switch(err)
        {
-               mov             ah,EMS_VERSION
-               int             EMS_INT
-               mov             EMSver,ax
+               case 0x0:
+                       strcat(stri, "successful");
+               break;
+               case 0x80:
+                       strcat(stri, "internal error");
+               break;
+               case 0x81:
+                       strcat(stri, "hardware malfunction");
+               break;
+               case 0x82:
+                       strcat(stri, "busy .. retry later");
+               break;
+               case 0x83:
+                       strcat(stri, "invalid handle");
+               break;
+               case 0x84:
+                       strcat(stri, "undefined function requested by application");
+               break;
+               case 0x85:
+                       strcat(stri, "no more handles available");
+               break;
+               case 0x86:
+                       strcat(stri, "error in save or restore of mapping context");
+               break;
+               case 0x87:
+                       strcat(stri, "insufficient memory pages in system");
+               break;
+               case 0x88:
+                       strcat(stri, "insufficient memory pages available");
+               break;
+               case 0x89:
+                       strcat(stri, "zero pages requested");
+               break;
+               case 0x8A:
+                       strcat(stri, "invalid logical page number encountered");
+               break;
+               case 0x8B:
+                       strcat(stri, "invalid physical page number encountered");
+               break;
+               case 0x8C:
+                       strcat(stri, "page-mapping hardware state save area is full");
+               break;
+               case 0x8D:
+                       strcat(stri, "save of mapping context failed");
+               break;
+               case 0x8E:
+                       strcat(stri, "restore of mapping context failed");
+               break;
+               case 0x8F:
+                       strcat(stri, "undefined subfunction");
+               break;
+               case 0x90:
+                       strcat(stri, "undefined attribute type");
+               break;
+               case 0x91:
+                       strcat(stri, "feature not supported");
+               break;
+               case 0x92:
+                       strcat(stri, "successful, but a portion of the source region has been overwritten");
+               break;
+               case 0x93:
+                       strcat(stri, "length of source or destination region exceeds length of region allocated to either source or destination handle");
+               break;
+               case 0x94:
+                       strcat(stri, "conventional and expanded memory regions overlap");
+               break;
+               case 0x95:
+                       strcat(stri, "offset within logical page exceeds size of logical page");
+               break;
+               case 0x96:
+                       strcat(stri, "region length exceeds 1 MB");
+               break;
+               case 0x97:
+                       strcat(stri, "source and destination EMS regions have same handle and overlap");
+               break;
+               case 0x98:
+                       strcat(stri, "memory source or destination type undefined");
+               break;
+               case 0x9A:
+                       strcat(stri, "specified alternate map register or DMA register set not supported");
+               break;
+               case 0x9B:
+                       strcat(stri, "all alternate map register or DMA register sets currently allocated");
+               break;
+               case 0x9C:
+                       strcat(stri, "alternate map register or DMA register sets not supported");
+               break;
+               case 0x9D:
+                       strcat(stri, "undefined or unallocated alternate map register or DMA register set");
+               break;
+               case 0x9E:
+                       strcat(stri, "dedicated DMA channels not supported");
+               break;
+               case 0x9F:
+                       strcat(stri, "specified dedicated DMA channel not supported");
+               break;
+               case 0xA0:
+                       strcat(stri, "no such handle name");
+               break;
+               case 0xA1:
+                       strcat(stri, "a handle found had no name, or duplicate handle name");
+               break;
+               case 0xA2:
+                       strcat(stri, "attempted to wrap around 1M conventional address space");
+               break;
+               case 0xA3:
+                       strcat(stri, "source array corrupted");
+               break;
+               case 0xA4:
+                       strcat(stri, "operating system denied access");
+               break;
+               default:
+                       strcat(stri, "undefined error");
        }
-       return(EMSver);
-}*/
+}
 
 //==========================================================================
 
@@ -1253,8 +1568,7 @@ void MM_FreeBlock(mmblocktype *x, mminfo_t *mm)
 
 void MM_seguin(void)
 {
-       __asm
-       {
+       __asm {
                push    ds
                mov     ax,ds
                inc             ax
@@ -1264,8 +1578,7 @@ void MM_seguin(void)
 
 void MM_segude(void)
 {
-       __asm
-       {
+       __asm {
                pop ds
        }
 }