hmmm

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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index c85297a83a211608eb65f498b744331fd7013490..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,11 +659,11 @@ 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;
-       mm->mmnew->length = 0x1;
+       mm->mmnew->length = 0xffff;
        mm->mmnew->attributes = LOCKBIT;
        mm->mmnew->next = NULL;
        mm->mmrover = mm->mmhead;
@@ -667,16 +673,16 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //
        printf("                nearheap making!\n");
 //---- length=coreleft();
-       //_nheapgrow();
+       _nheapgrow();
        length=_memmax();
-       //printf("      %Fp\n", mmi->segu);
-       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" );
@@ -699,8 +705,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //---- length=farcoreleft();
        printf("                farheap making!\n");
        _fheapgrow();
-       length=0xffffUL*4UL;//_memavl();
-       //printf("      %Fp\n", mmi->segu);
+       length=0xffffUL*4UL;
        start = mm->farheap = halloc(length, sizeof(byte));
        //start = mm->farheap = _fmalloc(length);
        length -= 16-(FP_OFF(start)&15);
@@ -710,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" );
@@ -729,7 +735,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //
 // 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++)
@@ -770,18 +776,17 @@ 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
        {
 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("               XMS!\n");
-               //++++
-               MML_SetupXMS(mm, mmi);                                  // allocate as many UMBs as possible
+               //++++          MML_SetupXMS(mm, mmi);                                  // allocate as many UMBs as possible
        }
 
 //
 // allocate the misc buffer
 //
-xmsskip:
+xmsskip:*/
 /*mmi->nearheap = 0;
-mmi->farheap = 0;
+mmi->farheap = 0;*/
 mmi->EMSmem = 0;
-mmi->XMSmem = 0;*/
+mmi->XMSmem = 0;
        mm->mmrover = mm->mmhead;               // start looking for space after low block
 
        MM_GetPtr(&(mm->bufferseg),BUFFERSIZE, mm, mmi);