hmmm

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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 1bd9866aa7ac0fe5ba1e6c61930337d1bb6e77bd..aa123376bfe59dd1f3fb128535b038e877665276 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -47,6 +47,10 @@ Open Watcom port by sparky4
 
 */
 #include "src/lib/16_mm.h"
+#pragma hdrstop\r
+\r
+#pragma warn -pro\r
+#pragma warn -use
 
 /*
 =============================================================================
@@ -629,19 +633,21 @@ void MML_ClearBlock(mminfo_t *mm)
 void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 {
        int i;
-       dword length;
+       dword length,seglength;
+       //dword length; word seglength;
        void huge       *start;
-       unsigned        segstart,seglength,endfree;
+       word    segstart;//,endfree;
 
        if(mm->mmstarted)
                MM_Shutdown(mm);
 
        mm->mmstarted = true;
        mm->bombonerror = true;
+
 //
 // set up the linked list (everything in the free list;
 //
-       printf("                linked list making!\n");
+       //printf("              linked list making!\n");
        mm->mmhead = NULL;
        mm->mmfree = &(mm->mmblocks[0]);
        for(i=0;i<MAXBLOCKS-1;i++)
@@ -653,7 +659,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //
 // locked block of all memory until we punch out free space
 //
-       printf("                newblock making!\n");
+       //printf("              newblock making!\n");
        MM_GetNewBlock(mm);
        mm->mmhead = mm->mmnew;                         // this will allways be the first node
        mm->mmnew->start = 0;
@@ -667,15 +673,16 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //
        printf("                nearheap making!\n");
 //---- length=coreleft();
-       //_nheapgrow();
+       _nheapgrow();
        length=_memmax();
-       start = (void huge *)(mm->nearheap = _nmalloc(length));
+       start = (void huge *)(mm->nearheap = malloc(length));
        length -= 16-(FP_OFF(start)&15);
        length -= SAVENEARHEAP;
        seglength = length / 16;                        // now in paragraphs
        segstart = FP_SEG(start)+(FP_OFF(start)+15)/16;
        MML_UseSpace(segstart,seglength, mm);
        mmi->nearheap = length;
+       printf("start=%Fp       segstart=%x     seglen=%lu      len=%lu\n", start, segstart, seglength, length);
        /*switch( _nheapchk() ) {
                case _HEAPOK:
                        printf( "OK - nearheap is good\n" );
@@ -690,7 +697,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
                        printf( "ERROR - bad node in nearheap\n" );
                break;
        }*/
-//     printf("                near heap ok!\n");
+       printf("                near heap ok!\n");
 
 //
 // get all available far conventional memory segments
@@ -698,7 +705,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //---- length=farcoreleft();
        printf("                farheap making!\n");
        _fheapgrow();
-       length=0xffffUL*4UL;//_memavl();
+       length=0xffffUL*4UL;
        start = mm->farheap = halloc(length, sizeof(byte));
        //start = mm->farheap = _fmalloc(length);
        length -= 16-(FP_OFF(start)&15);
@@ -708,6 +715,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
        MML_UseSpace(segstart,seglength, mm);
        mmi->farheap = length;
        mmi->mainmem = mmi->nearheap + mmi->farheap;
+       printf("start=%Fp       segstart=%x     seglen=%lu      len=%lu\n", start, segstart, seglength, length);
        /*switch( _fheapchk() ) {
                case _HEAPOK:
                        printf( "OK - farheap is good\n" );
@@ -722,12 +730,12 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
                        printf( "ERROR - bad node in farheap\n" );
                break;
        }*/
-       //printf("              far heap ok!\n");
+       printf("                far heap ok!\n");
 
 //
 // detect EMS and allocate up to 64K at page frame
 //
-printf("               EMS1\n");
+/*printf("             EMS1\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!
        mmi->EMSmem = 0;
        for(i = 1;i < __argc;i++)
@@ -747,10 +755,10 @@ 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
                MML_UseSpace(mm->EMSpageframe,(MAPPAGES)*0x4000lu, 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!
 printf("               EMS4\n");
-               if(mm->EMSVer<0x40)
+               //if(mm->EMSVer<0x40)
                        MM_MapEMS(mm, mmi);                                     // map in used pages
-               else
-                       MM_MapXEMS(mm, mmi);                                    // map in used pages
+               //else
+                       //MM_MapXEMS(mm, mmi);                                  // map in used pages
        }
 
 //
@@ -774,7 +782,11 @@ printf("           XMS!\n");
 //
 // allocate the misc buffer
 //
-xmsskip:
+xmsskip:*/
+/*mmi->nearheap = 0;
+mmi->farheap = 0;*/
+mmi->EMSmem = 0;
+mmi->XMSmem = 0;
        mm->mmrover = mm->mmhead;               // start looking for space after low block
 
        MM_GetPtr(&(mm->bufferseg),BUFFERSIZE, mm, mmi);
@@ -1146,7 +1158,7 @@ void MM_SortMem(mminfo_t *mm)
 =====================
 */
 
-void MM_ShowMemory(page_t *page, mminfo_t *mm)
+void MM_ShowMemory(/*page_t *page, */mminfo_t *mm)
 {
        mmblocktype huge *scan;
        word color,temp;
@@ -1190,19 +1202,19 @@ CA_OpenDebug ();
                                //modexhlin(page, scan->start, (unsigned)end, chy, color);
                                //for(chx=scan->start;chx+4>=(word)end;chx+=4)
                                //{
-                                       modexClearRegion(page, chx, chy, 4, 4, color);
+//++++                                 modexClearRegion(page, chx, chy, 4, 4, color);
                                //}
 
 //++++         VW_Hlin(scan->start,(unsigned)end,0,color);
 
 //++++         VW_Plot(scan->start,0,15);
-                               modexClearRegion(page, chx, chy, 4, 4, 15);
+//++++                         modexClearRegion(page, chx, chy, 4, 4, 15);
                if(scan->next->start > end+1)
 //++++                 VW_Hlin(end+1,scan->next->start,0,0);   // black = free
                        //for(chx=scan->next->start;chx+4>=(word)end+1;chx+=4)
                        //{
-                               chx+=scan->next->start;
-                               modexClearRegion(page, chx, chy, 4, 4, 2);
+//++++                         chx+=scan->next->start;
+//++++                         modexClearRegion(page, chx, chy, 4, 4, 2);
                        //}
                                        //modexhlin(page, end+1,scan->next->start, chy, 0);
 
@@ -1231,7 +1243,7 @@ strcat (scratch,str);
 strcat (scratch,"\n");
 write(debughandle,scratch,strlen(scratch));
 //modexprint(page, chx, chy, 1, 0, 24, &scratch);
-chy+=4;
+//++++chy+=4;
 //fprintf(stdout, "%s", scratch);
 //****#endif
 
@@ -1265,7 +1277,7 @@ void MM_DumpData(mminfo_t *mm)
        FILE    *dumpfile;
 
 
-       free (mm->nearheap);
+       //++++free(mm->nearheap);
        dumpfile = fopen ("mmdump.txt","w");
        if (!dumpfile){
                printf("MM_DumpData: Couldn't open MMDUMP.TXT!\n");
@@ -1308,7 +1320,7 @@ void MM_DumpData(mminfo_t *mm)
 
        } while (lowest != 0xffff);
 
-       fclose (dumpfile);
+       fclose(dumpfile);
        printf("MMDUMP.TXT created.\n");
 }
 
@@ -1386,7 +1398,7 @@ dword MM_TotalFree(mminfo_t *mm)
 =====================
 */
 
-void MM_Report(page_t *page, mminfo_t *mm, mminfotype *mmi)
+void MM_Report(/*page_t *page, */mminfo_t *mm, mminfotype *mmi)
 {
        if(MML_CheckForEMS())
        {