pusing~

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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 5c658bb79ff58564bfe2dcd30f790cda40a4324d..1800c7d5bde45ba148ad6cf03dcce2460a66a0b9 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -83,10 +83,11 @@ static      char *ParmStringsexmm[] = {"noems","noxms",""};
 boolean MML_CheckForEMS(void)
 {
        boolean emmcfems;
-       char    emmname[] = "EMMXXXX0";
+       static char     emmname[] = "EMMXXXX0"; //fix by andrius4669
 //             mov     dx,OFFSET emmname
        __asm {
-               LEA     DX, emmname     //fix by andrius4669
+               //LEA   DX, emmname     //fix by andrius4669
+               mov     dx,OFFSET emmname       //fix by andrius4669
                mov     ax,0x3d00
                int     0x21            // try to open EMMXXXX0 device
                jc      error
@@ -423,6 +424,7 @@ void MML_ShutdownXMS(mminfo_t *mm)
 void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
 {
        mmblocktype huge *scan,huge *last;
+       word            segm;
        dword   oldend;
        dword           extra;
 
@@ -438,12 +440,13 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
                scan = scan->next;
        }
 
-       //find out how many blocks it span!
-       if(seglength>0xfffflu)
+       //find out how many blocks it spans!
+       if(seglength>0xffffu)
        {
-               scan->segm=seglength/0xfffflu;
+//             segm=seglength/0x4000u;
+               segm=seglength/0xffffu;
        }
-       else scan->segm=1;
+       else segm=1;
 
 //
 // take the given range out of the block
@@ -451,7 +454,7 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
        oldend = scan->start + scan->length;
        extra = oldend - (segstart+seglength);
        //++++emsver stuff!
-       if(extra>0xfffflu)
+       if(segm>1/*extra>0xfffflu*/)
        {
                /*__asm
                {
@@ -460,10 +463,10 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
                        inc             ax
                        mov     ds,ax
                }*/
-printf("segm=%u        ", scan->segm);
+printf("segm=%u        ", segm);
 printf("ex=%lu ", extra);
 printf("len=%u ", scan->length);
-printf("segsta=%u      ", segstart);
+printf("segsta=%x      ", segstart);
 printf("seglen=%lu\n", seglength);
 
 //MML_UseSpace(?segstart?, ?length?, mm);
@@ -549,7 +552,7 @@ void MML_ClearBlock(mminfo_t *mm)
 void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 {
        int i;
-       dword length;//,farlen;
+       dword length;
        void huge       *start;
        unsigned        segstart,seglength,endfree;
 
@@ -575,7 +578,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
        MM_GetNewBlock(mm);
        mm->mmhead = mm->mmnew;                         // this will allways be the first node
        mm->mmnew->start = 0;
-       mm->mmnew->length = 0xffff;                     //todo: mm make it fucking massive as fuck!~
+       mm->mmnew->length = 0xffff;
        mm->mmnew->attributes = LOCKBIT;
        mm->mmnew->next = NULL;
        mm->mmrover = mm->mmhead;
@@ -589,13 +592,13 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
        _nheapgrow();
        length=_memavl();
        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("near heap ok!\n");
 
 //
 // get all available far conventional memory segments
@@ -603,8 +606,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //---- length=farcoreleft();
        _fheapgrow();
        length=_memavl();
-       //length-=farlen;
-       start = mm->farheap = halloc(length, sizeof(dword));
+       start = mm->farheap = halloc(length, sizeof(byte));
        //start = mm->farheap = _fmalloc(length);
        length -= 16-(FP_OFF(start)&15);
        length -= SAVEFARHEAP;
@@ -613,6 +615,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
        MML_UseSpace(segstart,seglength, mm);
        mmi->farheap = length;
        mmi->mainmem = mmi->nearheap + mmi->farheap;
+       //printf("far heap ok!\n");
 
 
 //
@@ -653,7 +656,7 @@ emsskip:
        if(MML_CheckForXMS(mm))
        {
                printf("XMS!\n");
-               MML_SetupXMS(mm, mmi);                                  // allocate as many UMBs as possible
+               //MML_SetupXMS(mm, mmi);                                        // allocate as many UMBs as possible
        }
 
 //
@@ -1034,7 +1037,7 @@ void MM_SortMem(mminfo_t *mm)
 void MM_ShowMemory(mminfo_t *mm)
 {
        mmblocktype huge *scan;
-       unsigned color,temp;//, i;
+       unsigned color,temp;
        long    end,owner;
        char    scratch[160],str[16];