]> 4ch.mooo.com Git - 16.git/blobdiff - src/lib/16_mm.c
ok!
[16.git] / src / lib / 16_mm.c
index b6af09e5bef9328c5ddd1a2e3359501f747c5bcf..fda0a9ddc8aa5eba65ab9f0efb5386426cac163e 100644 (file)
@@ -135,15 +135,14 @@ boolean MML_CheckForEMS(void)
 =======================
 */
 
-unsigned MML_SetupEMS(mminfo_t *mm)
+byte MML_SetupEMS(mminfo_t *mm)
 {
-       char    str[80],str2[10];
-       unsigned        err;
+       char    str[80];//,str2[10];
+       byte    err;
        boolean errorflag=false;
-       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 +151,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
@@ -199,6 +198,7 @@ getpages:
                mov     [EMShandle],dx
                jmp End
 error:
+               mov     err,ah
                mov     errorflag,1
                jmp End
 noEMS:
@@ -206,11 +206,12 @@ End:
        }
        if(errorflag==true)
        {
-               err = CPURegs.h.ah;
+               //err = CPURegs.h.ah;
                strcpy(str,"MML_SetupEMS: EMS error 0x");
-               itoa(err,str2,16);
-               strcpy(str,str2);
-               printf("%s\n",str);
+               //itoa(err,str2,16);
+               //strcat(str,&err);
+               //printf("%s\n",str);
+               printf("%s%x\n",str,err);
                return err;
        }
        mm->totalEMSpages=totalEMSpages;
@@ -219,7 +220,6 @@ End:
        mm->EMSpagesmapped=EMSpagesmapped;
        mm->EMShandle=EMShandle;
        mm->EMSVer=EMSVer;
-       //mm->EMSstatus=EMSstatus;
        return 0;
 }
 
@@ -249,7 +249,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
 }
 
 /*
@@ -264,16 +264,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;
+       char    str[80];
+       unsigned        EMShandle;
+       byte err;
        boolean errorflag=false;
        int     i;
-       union REGS CPURegs;
        EMShandle=mm->EMShandle;
 
-       for (i=0;i<4/*mm->EMSpagesmapped*/;i++)
+       for (i=0;i<4/*MAPPAGES*/;i++)
        {
                __asm
                {
@@ -286,51 +286,92 @@ 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;
+                       //err = CPURegs.h.ah;
                        strcpy(str,"MM_MapEMS: EMS error 0x");
-                       itoa(err,str2,16);
-                       strcpy(str,str2);
+                       //itoa(err,str2,16);
+                       //strcat(str,&err);
                        //printf("%s\n",str);
-                       printf("FACK! %u\n", err);
+                       printf("%s%x\n",str, err);
+                       //printf("FACK! %x\n", err);
                        return err;
                }
        }
+       mmi->EMSmem = (i)*0x4000lu;
        return 0;
 }
 
-/*
-SUB EMS.MapXPages (PhysicalStart, LogicalStart, NumPages, Handle)\r
+byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi)
+{
+
+//SUB EMS.MapXPages (PhysicalStart, LogicalStart, NumPages, Handle)\r
 \r
-  'Maps up to 4 logical EMS pages to physical pages in the page frame, where:\r
-  '\r
-  'PhysicalStart = Physical page first logical page is mapped to\r
-  'LogicalStart  = First logical page to map\r
-  'NumPages      = Number of pages to map (1 to 4)\r
-  'Handle        = EMS handle logical pages are allocated to\r
+       //Maps up to 4 logical EMS pages to physical pages in the page frame, where:\r
+       //PhysicalStart = Physical page first logical page is mapped to\r
+       //LogicalStart  = First logical page to map\r
+       //NumPages      = Number of pages to map (1 to 4)\r
+       //Handle        = EMS handle logical pages are allocated to\r
 \r
-  'Create a buffer containing the page information\r
-  FOR x = 0 TO NumPages - 1\r
-    MapInfo$ = MapInfo$ + MKI$(LogicalStart + x) + MKI$(PhysicalStart + x)\r
-  NEXT\r
+  /*//Create a buffer containing the page information\r
+//  FOR x = 0 TO NumPages - 1\r
+//    MapInfo$ = MapInfo$ + MKI$(LogicalStart + x) + MKI$(PhysicalStart + x)\r
+//  NEXT*/\r
 \r
-  Regs.ax = &H5000                           'Map the pages in the buffer\r
-  Regs.cx = NumPages                         'to the pageframe\r
-  Regs.dx = Handle\r
-  Regs.ds = VARSEG(MapInfo$)\r
-  Regs.si = SADD(MapInfo$)\r
-  InterruptX &H67, Regs, Regs\r
-  EMS.Error = (Regs.ax AND &HFF00&) \ &H100  'Store the status code\r
+//  Regs.ax = &H5000                           //Map the pages in the buffer\r
+//  Regs.cx = NumPages                         //to the pageframe\r
+//  Regs.dx = Handle\r
+//  Regs.ds = VARSEG(MapInfo$)\r
+//  Regs.si = SADD(MapInfo$)\r
+//  InterruptX &H67, Regs, Regs\r
+//     EMS.Error = (Regs.ax AND &HFF00&) \ &H100  //Store the status code\r
 \r
-END SUB
-*/
-void MM_MapXEMS(mminfo_t *mm)
-{
+//END SUB
+       char    str[80];
+       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     ax,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_MapXEMS: EMS error 0x");
+                       //itoa(err,str2,16);
+                       //strcat(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;
 }
 
 //==========================================================================
@@ -659,7 +700,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //
 // 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\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++)
        {
@@ -669,16 +710,17 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
        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");
-               MML_SetupEMS(mm);                                       // allocate space
 printf("EMS2\n");
+               MML_SetupEMS(mm);                                       // allocate space
+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,(MAPPAGES)*0x4000lu, mm);
-printf("EMS3\n");
-               MM_MapEMS(mm);                                  // map in used pages
 printf("EMS4\n");
-               mmi->EMSmem = (MAPPAGES)*0x4000lu;
+               if(mm->EMSVer<0x40)
+                       MM_MapEMS(mm, mmi);                                     // map in used pages
+               else
+                       MM_MapXEMS(mm, mmi);                                    // map in used pages
        }
 
 //
@@ -695,7 +737,6 @@ emsskip:
        if(MML_CheckForXMS(mm))
        {
                printf("XMS!\n");
-               //====needs work!
                //MML_SetupXMS(mm, mmi);                                        // allocate as many UMBs as possible
        }
 
@@ -729,6 +770,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"); }
 }
@@ -900,7 +943,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 +1183,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 +1215,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
-               printf("MM_DumpData: Couldn't open MMDUMP.TXT!");
+//==========================================================================
+
+/*
+=====================
+=
+= 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!\n");
                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.\n");
 }
 
 //==========================================================================
@@ -1315,12 +1357,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);