fack!!

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

diff --git a/exmmtest.exe b/exmmtest.exe
index 94072751a86cbaba097e67b1426913cef5cd77d0..2a9c45f43ce3522e95982d40e642add6090b8833 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 3ee4fc5fa70372d5d44b11fba3cdb9f0ad1307f5..87246929f0943cbf3a236eb7a720e9fbfee6a4c8 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -341,7 +341,7 @@ boolean MML_CheckForXMS(mminfo_t *mm)
 
 void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi)
 {
-       word    base,size;
+       unsigned        base,size;
 
 getmemory:
        __asm
@@ -371,9 +371,10 @@ gotone:
                mov     [size],dx
 done:
        }
+       printf("base=%u ", base); printf("size=%u\n", size);
        MML_UseSpace(base,size, mm);
-       mmi->XMSmem += size*16;
-       mm->UMBbase[mm->numUMBs] = base;
+       mmi->XMSmem += ((dword)size)*16;
+       mm->UMBbase[mm->numUMBs] = (dword)base;
        mm->numUMBs++;
        if(mm->numUMBs < MAXUMBS)
                goto getmemory;
@@ -442,16 +443,17 @@ void MML_UseSpace(unsigned segstart, dword seglength, mminfo_t *mm)
 //
 // take the given range out of the block
 //
-       oldend = scan->start + scan->length;
-       extra = oldend - (segstart+seglength);
+       oldend = scan->start + (dword)scan->length;
+       extra = oldend - (dword)(segstart+seglength);
        //++++emsver stuff!
        if(extra>0xfffflu)
        {
-               segm=(extra%(0xfffflu))-1;
+               /*segm=(extra%(0xfffflu))-1;
                fat=segm*(0xfffflu);
-               extra-=fat;
-//printf("extra=%lu    ", extra);
-//printf("segm=%lu\n", segm);
+               extra-=fat;*/
+/*printf("extra=%lu    ", extra);
+printf("oldend=%lu     ", oldend);
+printf("segm=%lu\n", segm);*/
                printf("MML_UseSpace: Segment spans two blocks!\n");
        }
 
@@ -469,7 +471,7 @@ void MML_UseSpace(unsigned segstart, dword seglength, mminfo_t *mm)
 
 //     segm--;
 
-       if(0xfffflu > extra > 0)
+       if(extra > 0)
        {
                MM_GetNewBlock(mm);
                mm->mmnew->next = scan->next;
@@ -598,7 +600,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //
 // detect EMS and allocate up to 64K at page frame
 //
-       printf("EMS\n\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("EMS!\n\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++)
        {
@@ -612,11 +614,11 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
                MML_SetupEMS(mm);                                       // allocate space
                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!
                //TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT!
-               MML_UseSpace(mm->EMSpageframe,((dword)mm->EMSpagesmapped)*0x4000lu, mm);
+               MML_UseSpace(mm->EMSpageframe,(mm->EMSpagesmapped)*0x4000lu, mm);
 //printf("EMS3\n");
                MM_MapEMS(mm);                                  // map in used pages
 //printf("EMS4\n");
-               mmi->EMSmem = ((dword)mm->EMSpagesmapped)*0x4000lu;
+               mmi->EMSmem = (mm->EMSpagesmapped)*0x4000lu;
        }
 
 //
@@ -632,7 +634,7 @@ emsskip:
 //     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!
        if(MML_CheckForXMS(mm))
        {
-//printf("XMS!\n");
+               printf("XMS!\n");
                MML_SetupXMS(mm, mmi);                                  // allocate as many UMBs as possible
        }
 
@@ -1158,7 +1160,7 @@ void MM_Report(mminfo_t *mm, mminfotype *mmi)
                printf("freeEMSpages=%u\n", mm->freeEMSpages);
                printf("EMSpageframe=%x\n", mm->EMSpageframe);
        }
-       if(MML_CheckForXMS(mm)) printf("XMSaddr=%x\n", *XMSaddr);
+       if(MML_CheckForXMS(mm)) printf("XMSaddr=%Fp\n", *XMSaddr);
        printf("near=%lu\n", mmi->nearheap);
        printf("far=%lu\n", mmi->farheap);
        printf("EMSmem=%lu\n", mmi->EMSmem);

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 373af5e35d367e768a4a8a99fa126618660fc16d..38279368a0694aceabf9888ebdaa765248a57850 100644 (file)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -110,12 +110,12 @@ extern void               (* XMSaddr) (void);             // far pointer to XMS driver
 #define PURGEMASK      0xfffc
 #define BASEATTRIBUTES 0       // unlocked, non purgable
 
-#define MAXUMBS                10
+#define MAXUMBS                12
 
 typedef struct mmblockstruct
 {
-       //unsigned      start,length;
-       dword   start,length;
+       unsigned        start,length;
+       //dword start,length;
        unsigned        attributes;
        memptr          *useptr;        // pointer to the segment start
        struct mmblockstruct huge *next;
@@ -131,7 +131,8 @@ typedef struct
        void            *nearheap;
        unsigned        totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
        unsigned int EMSVer;
-       word    numUMBs,UMBbase[MAXUMBS];
+       unsigned        numUMBs,UMBbase[MAXUMBS];
+       //dword numUMBs,UMBbase[MAXUMBS];
        mmblocktype     huge mmblocks[MAXBLOCKS],huge *mmhead,huge *mmfree,huge *mmrover,huge *mmnew;
 } mminfo_t;