Merge remote-tracking branch 'upstream/master'

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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index c8cb925..42a8744 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -439,6 +439,7 @@ byte MM_MapXEMS(global_game_variables_t *gvar)
 
 boolean MML_CheckForXMS(void)
 {
+       //numUMBs = 0;
        boolean errorflag=false;
 
        __asm {
@@ -842,23 +843,9 @@ void MM_Startup(global_game_variables_t *gvar)
 //
        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())
@@ -878,23 +865,9 @@ 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())
@@ -903,11 +876,11 @@ goto xmsskip;//0000
        }
 
        }
+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);
@@ -937,6 +910,7 @@ 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
@@ -945,6 +919,7 @@ void MM_Shutdown(global_game_variables_t *gvar)
 #ifdef __DEBUG__
        }
 #endif
+#endif
 }
 
 //==========================================================================
@@ -1616,23 +1591,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\n", 0xD3, 0xC4, gvar->mmi.EMSmem);
        }
        if(MML_CheckForXMS())
        {
-               printf("        XMS\n");
-               printf("                XMSDriver:      %X\n", gvar->pm.xmm.XMSDriver);
+               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\n", 0xD3, 0xC4, gvar->mmi.XMSmem);
        }
-       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()) 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);
 }
 
 //==========================================================================