started to work on mm libery~

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

diff --git a/exmmtest.exe b/exmmtest.exe
index ee5838f32f913686d178711a9387835802243712..3306249c050dceaad65e86f9550e3b3c7c01417a 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 9dbc0eef1ff3be4e25b975607b86cc36571d4543..52fdf8e9d385ddb3fec5c2b110713d1933dac320 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -43,6 +43,48 @@ EMS / XMS unmanaged routines
 */\r
 \r
 #include "src/lib/16_mm.h"\r
+
+/*\r
+=============================================================================\r
+\r
+                                                GLOBAL VARIABLES\r
+\r
+=============================================================================\r
+*/\r
+\r
+mminfotype     mminfo;\r
+memptr         bufferseg;\r
+boolean                mmerror;\r
+\r
+void           (* beforesort) (void);\r
+void           (* aftersort) (void);\r
+\r
+/*\r
+=============================================================================\r
+\r
+                                                LOCAL VARIABLES\r
+\r
+=============================================================================\r
+*/\r
+\r
+boolean                mmstarted;\r
+\r
+void far       *farheap;\r
+void           *nearheap;\r
+\r
+mmblocktype    far mmblocks[MAXBLOCKS]\r
+                       ,far *mmhead,far *mmfree,far *mmrover,far *mmnew;\r
+\r
+boolean                bombonerror;\r
+\r
+unsigned       totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
+unsigned int EMSVer;\r
+\r
+void           (* XMSaddr) (void);             // far pointer to XMS driver\r
+\r
+unsigned       numUMBs,UMBbase[MAXUMBS];
+
+static char *ParmStringsexmm[] = {"noems","noxms",""};
 \r
 /*\r
 ======================\r
@@ -570,7 +612,7 @@ emsskip:
        if (MML_CheckForXMS())\r
        {\r
 //             printf("XMS!\n");\r
-               MML_SetupXMS();                                 // allocate as many UMBs as possible\r
+//++++         MML_SetupXMS();                                 // allocate as many UMBs as possible\r
        }\r
 \r
 //\r
@@ -599,11 +641,16 @@ void MM_Shutdown (void)
   if (!mminfo.mmstarted)\r
        return;\r
 \r
-  _ffree (farheap);\r
-  free (nearheap);\r
-  hfree(hugeheap);\r
-  MML_ShutdownEMS ();\r
-  MML_ShutdownXMS ();\r
+  _ffree (farheap);
+  printf("far freed\n");\r
+  free (nearheap);
+  printf("near freed\n");\r
+  //hfree(hugeheap);
+  printf("huge freed\n");\r
+  MML_ShutdownEMS ();
+  printf("EMS freed\n");\r
+//++++  MML_ShutdownXMS ();
+  printf("XMS freed\n");\r
 }\r
 \r
 //==========================================================================\r
@@ -1175,4 +1222,3 @@ US_CheckParm(char *parm,char **strings)
        }\r
        return(-1);\r
 }\r
-\r

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index fceb1550b97e5a260f916b3211e27999dc32798d..701f002de627324a2dae2d84e5c01e594cbb2294 100644 (file)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -135,11 +135,11 @@ typedef struct mmblockstruct
 =============================================================================
 */
 
-static mminfotype      mminfo;
+/*static mminfotype    mminfo;
 static memptr          bufferseg;
 
 static void            (* beforesort) (void);
-static void            (* aftersort) (void);
+static void            (* aftersort) (void);*/
 
 /*
 =============================================================================
@@ -149,7 +149,7 @@ static void         (* aftersort) (void);
 =============================================================================
 */
 
-static void huge       *hugeheap;
+/*static void huge     *hugeheap;
 static void far        *farheap;
 static void            *nearheap;
 
@@ -162,9 +162,7 @@ static unsigned int EMSVer;
 
 static void            (* XMSaddr) (void);             // far pointer to XMS driver
 
-static unsigned        numUMBs,UMBbase[MAXUMBS];
-
-static char *ParmStringsexmm[] = {"noems","noxms",""};
+static unsigned        numUMBs,UMBbase[MAXUMBS];*/
 
 //==========================================================================