untested reversion to older version with updated parts

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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index b6af09e5bef9328c5ddd1a2e3359501f747c5bcf..a021f2b6ed479eb17b904c3ae9c5d320185812fa 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -143,7 +143,7 @@ unsigned MML_SetupEMS(mminfo_t *mm)
        union REGS CPURegs;
 
        unsigned int EMSVer = 0;
-       byte    EMSstatus;
+       byte    EMS_status;
        unsigned        totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
        totalEMSpages = freeEMSpages = EMSpageframe = EMSpagesmapped = 0;
 
@@ -152,7 +152,7 @@ unsigned MML_SetupEMS(mminfo_t *mm)
                mov     ah,EMS_STATUS
                int     EMS_INT                                         // make sure EMS hardware is present
                or      ah,ah
-               //mov   [EMSstatus],ah
+               mov     [EMS_status],ah
                jnz     error
 
                mov     ah,EMS_VERSION
@@ -219,7 +219,6 @@ End:
        mm->EMSpagesmapped=EMSpagesmapped;
        mm->EMShandle=EMShandle;
        mm->EMSVer=EMSVer;
-       //mm->EMSstatus=EMSstatus;
        return 0;
 }
 
@@ -695,7 +694,6 @@ emsskip:
        if(MML_CheckForXMS(mm))
        {
                printf("XMS!\n");
-               //====needs work!
                //MML_SetupXMS(mm, mmi);                                        // allocate as many UMBs as possible
        }
 
@@ -729,6 +727,8 @@ void MM_Shutdown(mminfo_t *mm)
        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"); }
 }
@@ -863,7 +863,7 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm)
 
        if(!scan)
        {
-               printf("MM_FreePtr: Block not found!\n");
+               printf("MM_FreePtr: Block not found!");
                return;
        }
 
@@ -900,7 +900,7 @@ void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm)
                        mm->mmrover = mm->mmhead;
                else if(mm->mmrover == start)
                {
-                       printf("MM_SetPurge: Block not found!\n");
+                       printf("MM_SetPurge: Block not found!");
                        return;
                }
 
@@ -1140,7 +1140,6 @@ CA_OpenDebug ();
                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
@@ -1173,70 +1172,70 @@ CA_CloseDebug ();
 }
 //****#endif
 
-//==========================================================================\r
-\r
-/*\r
-=====================\r
-=\r
-= MM_DumpData\r
-=\r
-=====================\r
-*/\r
-\r
-void MM_DumpData(mminfo_t *mm)\r
-{\r
-       mmblocktype far *scan,far *best;\r
-       long    lowest,oldlowest;\r
-       word    owner;\r
-       byte    lock,purge;\r
-       FILE    *dumpfile;\r
-\r
-\r
-       free (mm->nearheap);\r
-       dumpfile = fopen ("mmdump.txt","w");\r
-       if (!dumpfile){\r
+//==========================================================================
+
+/*
+=====================
+=
+= 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.txt","w");
+       if (!dumpfile){
                printf("MM_DumpData: Couldn't open MMDUMP.TXT!");
                return;
-       }\r
-\r
-       lowest = -1;\r
-       do\r
-       {\r
-               oldlowest = lowest;\r
-               lowest = 0xffff;\r
-\r
-               scan = mm->mmhead;\r
-               while (scan)\r
-               {\r
-                       owner = (word)scan->useptr;\r
-\r
-                       if (owner && owner<lowest && owner > oldlowest)\r
-                       {\r
-                               best = scan;\r
-                               lowest = owner;\r
-                       }\r
-\r
-                       scan = scan->next;\r
-               }\r
-\r
-               if (lowest != 0xffff)\r
-               {\r
-                       if (best->attributes & PURGEBITS)\r
-                               purge = 'P';\r
-                       else\r
-                               purge = '-';\r
-                       if (best->attributes & LOCKBIT)\r
-                               lock = 'L';\r
-                       else\r
-                               lock = '-';\r
-                       fprintf (dumpfile,"0x%p (%c%c) = %u\n"\r
-                       ,(word)lowest,lock,purge,best->length);\r
-               }\r
-\r
-       } while (lowest != 0xffff);\r
-\r
-       fclose (dumpfile);\r
-       printf("MMDUMP.TXT created.");\r
+       }
+
+       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.TXT created.");
 }
 
 //==========================================================================
@@ -1315,12 +1314,11 @@ dword MM_TotalFree(mminfo_t *mm)
 
 void MM_Report(page_t *page, mminfo_t *mm, mminfotype *mmi)
 {
-       printf("\n");
        if(MML_CheckForEMS())
        {
-               printf("Expanded memory manager present. EMM v%x.%x available\n", mm->EMSVer>>4,mm->EMSVer&0x0F);
+               printf("EMM v%x.%x available\n", mm->EMSVer>>4,mm->EMSVer&0x0F);
                printf("totalEMSpages=%u\n", mm->totalEMSpages);
-               printf("Page frame @0x%04x\n", mm->freeEMSpages);
+               printf("freeEMSpages=%u\n", mm->freeEMSpages);
                printf("EMSpageframe=%x\n", mm->EMSpageframe);
        }
        if(MML_CheckForXMS(mm)) printf("XMSaddr=%Fp\n", *XMSaddr);