untested reversion to older version with updated parts

	modified:   DEBUG.TXT
	modified:   MMDUMP.TXT
	modified:   exmmtest.exe
	modified:   src/lib/16_mm.c
	modified:   src/lib/16_mm.h

diff --git a/DEBUG.TXT b/DEBUG.TXT
index 727d142bf66a17bb37c26789260237989da5ccad..ca05d1aa7701dda6d0aa9e0938a85311c671ff38 100644 (file)
--- a/DEBUG.TXT
+++ b/DEBUG.TXT
@@ -1,5 +1,5 @@
-Seg:0  Size:140000     Owner:0xb80b\r
-Seg:222e       Size:4096       Owner:0xfba0\r
-Seg:3035       Size:1028480    Owner:0x5040\r
-Seg:3974       Size:682176     Owner:0xeb70\r
-Seg:e000       Size:131056     Owner:0x1e8d\r
+Seg:0  Size:177392     Owner:0x7410\r
+Seg:2b4f       Size:4096       Owner:0xfba0\r
+Seg:3956       Size:544        Owner:0x30b8\r
+Seg:479f       Size:624144     Owner:0xbcfe\r
+Seg:e000       Size:131056     Owner:0xadeb\r

diff --git a/MMDUMP.TXT b/MMDUMP.TXT
index 36624a83cacdfa2f36acdbbca88ceb4e2ddc3348..d03b87c78770300e4fb4dcb62664e8011698964b 100644 (file)
Binary files a/MMDUMP.TXT and b/MMDUMP.TXT differ

diff --git a/exmmtest.exe b/exmmtest.exe
index d7feac32cc234493f47ccb84d067db4521579d8c..37842048508d983763778fbc99f62992999515fc 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 12add7c05b15f8a912d4c3216a0d7084fe6041fd..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;
 }
 
@@ -273,7 +272,7 @@ unsigned MM_MapEMS(mminfo_t *mm)
        union REGS CPURegs;
        EMShandle=mm->EMShandle;
 
-       for (i=0;i<mm->EMSpagesmapped;i++)
+       for (i=0;i<4/*mm->EMSpagesmapped*/;i++)
        {
                __asm
                {
@@ -303,33 +302,33 @@ unsigned MM_MapEMS(mminfo_t *mm)
        return 0;
 }
 
-void MM_MapXEMS(mminfo_t *mm)
-{
-       union REGS CPURegs;
-
-//SUB EMS.MapXPages(PhysicalStart, LogicalStart, NumPages, Handle)\r
+/*
+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
+  '\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
+  '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
+END SUB
+*/
+void MM_MapXEMS(mminfo_t *mm)
+{
 
 }
 
@@ -596,7 +595,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 
        if(mm->mmstarted)
                MM_Shutdown(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!
+
        mm->mmstarted = true;
        mm->bombonerror = true;
 //
@@ -609,7 +608,7 @@ 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\
                mm->mmblocks[i].next = &(mm->mmblocks[i+1]);
        }
        mm->mmblocks[i].next = NULL;
-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!
+
 //
 // locked block of all memory until we punch out free space
 //
@@ -620,7 +619,7 @@ 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\
        mm->mmnew->attributes = LOCKBIT;
        mm->mmnew->next = NULL;
        mm->mmrover = mm->mmhead;
-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!
+
 //     farlen=_bios_memsize()*1024;
 
 //
@@ -636,7 +635,7 @@ 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\
        segstart = FP_SEG(start)+(FP_OFF(start)+15)/16;
        MML_UseSpace(segstart,seglength, mm);
        mmi->nearheap = length;
-       printf("near heap ok!\n");
+       //printf("near heap ok!\n");
 
 //
 // get all available far conventional memory segments
@@ -653,7 +652,7 @@ 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\
        MML_UseSpace(segstart,seglength, mm);
        mmi->farheap = length;
        mmi->mainmem = mmi->nearheap + mmi->farheap;
-       printf("far heap ok!\n");
+       //printf("far heap ok!\n");
 
 
 //
@@ -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,14 +1314,12 @@ 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("totalEMSpages=%u        ", mm->totalEMSpages);
+               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("Page frame @0x%04x\n", mm->EMSpageframe);
-               //printf("EMSpageframe=%x\n", );
+               printf("EMSpageframe=%x\n", mm->EMSpageframe);
        }
        if(MML_CheckForXMS(mm)) printf("XMSaddr=%Fp\n", *XMSaddr);
        printf("near=%lu\n", mmi->nearheap);

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index f1634d9e2a8d9605708a747c8d46124b3b6b0ea2..7007528785d1d569eef17d60fe5638253fa5fffb 100644 (file)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -35,7 +35,6 @@
 #define OUT_OF_MEM_MSG "\npee\n"
 #endif
 
-//#define VIDMEMP2                     12800   // size of 2nd video memory blob
 
 #define SAVENEARHEAP   0x200           // space to leave in data segment
 #define SAVEFARHEAP            0                       // space to leave in far heap
@@ -135,7 +134,7 @@ typedef struct
        boolean         mmstarted, bombonerror, mmerror;
        void huge       *farheap;
        void            *nearheap;
-       //byte          EMSstatus;
+       byte            EMS_status;
        unsigned        totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
        unsigned int EMSVer;
        word numUMBs,UMBbase[MAXUMBS];