From a8ce32fb5abeb885f7794a4f34a4d7dc46cccfe8 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Fri, 3 Jul 2015 17:04:00 -0500 Subject: [PATCH] fuck! reverted it back to old! modified: exmmtest.exe modified: src/lib/16_mm.c modified: src/lib/16_mm.h --- exmmtest.exe | Bin 45707 -> 45646 bytes src/lib/16_mm.c | 20 ++++++++++---------- src/lib/16_mm.h | 9 ++++----- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/exmmtest.exe b/exmmtest.exe index 2a9c45f43ce3522e95982d40e642add6090b8833..52d9105ab9025b44b3dc8592dcf920d764787125 100644 GIT binary patch delta 13479 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 diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index 87246929..77466490 100644 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -373,8 +373,8 @@ done: } printf("base=%u ", base); printf("size=%u\n", size); MML_UseSpace(base,size, mm); - mmi->XMSmem += ((dword)size)*16; - mm->UMBbase[mm->numUMBs] = (dword)base; + mmi->XMSmem += size*16; + mm->UMBbase[mm->numUMBs] = base; mm->numUMBs++; if(mm->numUMBs < MAXUMBS) goto getmemory; @@ -420,13 +420,13 @@ void MML_ShutdownXMS(mminfo_t *mm) ====================== */ -void MML_UseSpace(unsigned segstart, dword seglength, mminfo_t *mm) +void MML_UseSpace(/*d*/word segstart, /*d*/word seglength, mminfo_t *mm) { mmblocktype huge *scan,huge *last; - dword oldend; - dword fat=0; + /*d*/word oldend; + /*d*/word fat=0; word segm=0; - dword extra; + /*d*/word extra; scan = last = mm->mmhead; mm->mmrover = mm->mmhead; // reset rover to start of memory @@ -443,8 +443,8 @@ void MML_UseSpace(unsigned segstart, dword seglength, mminfo_t *mm) // // take the given range out of the block // - oldend = scan->start + (dword)scan->length; - extra = oldend - (dword)(segstart+seglength); + oldend = scan->start + scan->length; + extra = oldend - (segstart+seglength); //++++emsver stuff! if(extra>0xfffflu) { @@ -614,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,(mm->EMSpagesmapped)*0x4000lu, mm); + MML_UseSpace(mm->EMSpageframe,(/*mm->EMSpagesmapped*/4)*0x4000lu, mm); //printf("EMS3\n"); MM_MapEMS(mm); // map in used pages //printf("EMS4\n"); - mmi->EMSmem = (mm->EMSpagesmapped)*0x4000lu; + mmi->EMSmem = (/*mm->EMSpagesmapped*/4)*0x4000lu; } // diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h index 38279368..6205d012 100644 --- a/src/lib/16_mm.h +++ b/src/lib/16_mm.h @@ -86,7 +86,7 @@ typedef void __based(__self) * memptr; //__based(seg) * memptr; typedef struct { - dword nearheap,farheap/*,hugeheap*/,EMSmem,XMSmem,mainmem; + dword nearheap,farheap,EMSmem,XMSmem,mainmem; } mminfotype; //========================================================================== @@ -114,7 +114,7 @@ extern void (* XMSaddr) (void); // far pointer to XMS driver typedef struct mmblockstruct { - unsigned start,length; + word start,length; //dword start,length; unsigned attributes; memptr *useptr; // pointer to the segment start @@ -126,12 +126,11 @@ typedef struct { memptr bufferseg; boolean mmstarted, bombonerror, mmerror; - //void huge *hugeheap; void huge *farheap; void *nearheap; unsigned totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle; unsigned int EMSVer; - unsigned numUMBs,UMBbase[MAXUMBS]; + word numUMBs,UMBbase[MAXUMBS]; //dword numUMBs,UMBbase[MAXUMBS]; mmblocktype huge mmblocks[MAXBLOCKS],huge *mmhead,huge *mmfree,huge *mmrover,huge *mmnew; } mminfo_t; @@ -162,7 +161,7 @@ unsigned MM_MapEMS(mminfo_t *mm); boolean MML_CheckForXMS(mminfo_t *mm); void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi); void MML_ShutdownXMS(mminfo_t *mm); -void MML_UseSpace(unsigned segstart, dword seglength, mminfo_t *mm); +void MML_UseSpace(/*d*/word segstart, /*d*/word seglength, mminfo_t *mm); void MML_ClearBlock(mminfo_t *mm); void MM_Startup(mminfo_t *mm, mminfotype *mmi); -- 2.39.5