====XMS MOSTLY translated but crashes EXMMTEST.EXE ====

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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 9333d380c0583eca68456bbc7df610217da89a5b..a8c07017fcd00c4d046b87bcca6cead5e407f72f 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -140,7 +140,7 @@ boolean MML_CheckForEMS(void)
        return(emmcfems);
 }
 
-
+#ifndef __16_PM__
 /*
 ======================
 =
@@ -245,12 +245,12 @@ End:
                printf("%s\n",str);
                return err;
        }
-       gvar->pm.emm.totalEMSpages=totalEMSpages;
-       gvar->pm.emm.freeEMSpages=freeEMSpages;
-       gvar->pm.emm.EMSPageFrame=EMSPageFrame;
-       gvar->pm.emm.EMSpagesmapped=EMSpagesmapped;
-       gvar->pm.emm.EMSHandle=EMSHandle;
-       gvar->pm.emm.EMSVer=EMSVer;
+       gvar->mm.totalEMSpages=totalEMSpages;
+       gvar->mm.freeEMSpages=freeEMSpages;
+       gvar->mm.EMSPageFrame=EMSPageFrame;
+       gvar->mm.EMSpagesmapped=EMSpagesmapped;
+       gvar->mm.EMSHandle=EMSHandle;
+       gvar->mm.EMSVer=EMSVer;
        return 0;
 }
 
@@ -266,7 +266,7 @@ End:
 void MML_ShutdownEMS(global_game_variables_t *gvar)
 {
        boolean errorflag=false;
-       unsigned EMSHandle=gvar->pm.emm.EMSHandle;
+       unsigned EMSHandle=gvar->mm.EMSHandle;
 
        if(!EMSHandle)
                return;
@@ -307,7 +307,7 @@ byte MM_MapEMS(global_game_variables_t *gvar)
        byte err;
        boolean errorflag=false;
        int     i;
-       EMSHandle=gvar->pm.emm.EMSHandle;
+       EMSHandle=gvar->mm.EMSHandle;
 
        for (i=0;i<4/*MAPPAGES*/;i++)
        {
@@ -345,7 +345,6 @@ byte MM_MapEMS(global_game_variables_t *gvar)
                }
        }
        gvar->mmi.EMSmem = (i)*0x4000lu;
-       //printf("              gvar->mmi.EMSmem=%lu\n", gvar->mmi.EMSmem);
        return 0;
 }
 
@@ -378,9 +377,9 @@ byte MM_MapXEMS(global_game_variables_t *gvar)
        word    EMSHandle;
        boolean errorflag=false;
        int     i;
-       EMSHandle=gvar->pm.emm.EMSHandle;
+       EMSHandle=gvar->mm.EMSHandle;
 
-       if(gvar->pm.emm.EMSVer<0x40)
+       if(gvar->mm.EMSVer<0x40)
                return 5;
 
        for (i=0;i<MAPPAGES;i++)
@@ -425,7 +424,7 @@ byte MM_MapXEMS(global_game_variables_t *gvar)
        gvar->mmi.EMSmem = (i)*0x4000lu;
        return 0;
 }
-
+#endif
 //==========================================================================
 
 /*
@@ -460,7 +459,7 @@ boolean MML_CheckForXMS(global_game_variables_t *gvar)
        else return true;
 }
 
-
+#ifndef __16_PM__
 /*
 ======================
 =
@@ -547,7 +546,7 @@ void MML_ShutdownXMS(global_game_variables_t *gvar)
                }
        }
 }
-
+#endif
 //==========================================================================
 
 /*
@@ -818,12 +817,13 @@ void MM_Startup(global_game_variables_t *gvar)
        //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;
 #endif
-       length=_FCORELEFT;//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL;
        start = gvar->mm.farheap = _fmalloc(length);
        //start = gvar->mm.farheap = halloc(length, 1);
        length -= 16-(FP_OFF(start)&15);
@@ -836,6 +836,8 @@ void MM_Startup(global_game_variables_t *gvar)
 
        gvar->mmi.mainmem = gvar->mmi.nearheap + gvar->mmi.farheap;
 
+#ifndef __16_PM__
+       if(!dbg_debugpm) {
 //
 // detect EMS and allocate up to 64K at page frame
 //
@@ -863,8 +865,8 @@ void MM_Startup(global_game_variables_t *gvar)
        if(MML_CheckForEMS())
        {
                MML_SetupEMS(gvar);                                     // allocate space
-               //TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT!
-               MML_UseSpace(gvar->pm.emm.EMSPageFrame,(MAPPAGES)*0x4000lu, gvar);
+               //16_PM: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT!
+               MML_UseSpace(gvar->mm.EMSPageFrame,(MAPPAGES)*0x4000lu, gvar);
                //if(gvar->pm.emm.EMSVer<0x40)
                        MM_MapEMS(gvar);                                        // map in used pages
                //else
@@ -901,6 +903,8 @@ goto xmsskip;//0000
                MML_SetupXMS(gvar);                                     // allocate as many UMBs as possible
        }
 
+       }
+#endif
 //
 // allocate the misc buffer
 //
@@ -933,9 +937,15 @@ void MM_Shutdown(global_game_variables_t *gvar)
 #endif
 #ifdef __BORLANDC__
        free(gvar->mm.nearheap);//      printf("                near freed\n");
+#endif
+#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"); }
+#ifdef __DEBUG__
+       }
+#endif
 }
 
 //==========================================================================
@@ -963,11 +973,12 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar)
        gvar->mm.mmnew->length = needed;
        gvar->mm.mmnew->useptr = baseptr;
        //if(gvar->mm.mmnew->useptr==NULL){
-#ifdef __DEBUG__
-               printf("        MM_GetPtr\n");
-               printf("                baseptr=%04x    ", baseptr); printf("useptr=%04x\n", gvar->mm.mmnew->useptr);
-               printf("                *baseptr=%04x   ", *baseptr); printf("*useptr=%04x\n", *(gvar->mm.mmnew->useptr));
-               printf("                *baseptr=%Fp    ", *baseptr); printf("*useptr=%Fp\n", *(gvar->mm.mmnew->useptr));
+#ifdef __DEBUG_MM__
+               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); }
        gvar->mm.mmnew->attributes = BASEATTRIBUTES;
@@ -1107,6 +1118,7 @@ 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;
@@ -1125,11 +1137,8 @@ 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!");
-                       printf("%Fp     %u\n", start->start, start->length);
-                       printf("MM_SetPurge: Block not found!\n");
-                       exit(1);
-                       return;
+                       Quit("MM_SetPurge: Block not found!");
+                       //return;
                }
 
        } while(1);
@@ -1604,7 +1613,7 @@ dword MM_TotalFree(global_game_variables_t *gvar)
 void MM_Report_(global_game_variables_t *gvar)
 {
        printf("========================================\n");
-       printf("                MM_Report\n");
+       printf("                MM_Report_\n");
        printf("========================================\n");
        if(MML_CheckForEMS())
        {
@@ -1616,13 +1625,15 @@ void MM_Report_(global_game_variables_t *gvar)
        if(MML_CheckForXMS(gvar))
        {
                printf("        XMS\n");
-               printf("                XMSaddr:        %X\n", *XMSaddr);
+               printf("                XMSDriver:      %X\n", XMSDriver);
        }
-       printf("near:   %lu     ", gvar->mmi.nearheap); printf("far:    %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("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("mainmem:      %lu\n", gvar->mmi.mainmem);
-       printf("Total convmem:  %lu     ", gvar->mmi.mainmem); printf("TotalFree:       %lu     ", MM_TotalFree(gvar)); printf("TotalUsed:      %lu\n", gvar->mmi.mainmem+gvar->mmi.EMSmem+gvar->mmi.XMSmem+gvar->mmi.XMSmem);
-       printf("                        UnusedMemory:   %lu\n", MM_UnusedMemory(gvar));
+       //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));
+
 }
 
 //==========================================================================