From cbb194e786dae622f090290e4b59ed9c76420d9b Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 6 Jul 2015 23:27:08 -0500 Subject: [PATCH] omg so many bugs!!! modified: data/g.pal modified: exmmtest.exe modified: src/lib/16_mm.c modified: src/lib/16_mm.h --- data/g.pal | Bin 768 -> 768 bytes exmmtest.exe | Bin 46242 -> 46054 bytes src/lib/16_mm.c | 22 +++++++++++----------- src/lib/16_mm.h | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/data/g.pal b/data/g.pal index 0ecbac33f44529d9701eae8c9b262c7da0f50416..cf668e3509805fa4ec96876045fe2f979a02ab37 100644 GIT binary patch literal 768 zcmeIuK?=hl5J1ttl3BRXjk*wwga#}O77Pg~#rxkX=P2YI;Q+uYm9l0IVX>2;2#EVN3#hU literal 768 QcmZQz7zLvtFmgix00RI30RR91 diff --git a/exmmtest.exe b/exmmtest.exe index 4a81b1d60a5186264f06eaf6e79a74d42ff1bc03..f5938d31687065be04efadf9cafefe80e557cbcf 100644 GIT binary patch delta 15720 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 bhx*^L3CPShA2@^5;LyVVmXykqxrF>5rnbLf diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index 1f7593ec..398fd082 100644 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -438,12 +438,12 @@ 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/0xffffu; + scan->sega=(word)seglength/0xffffu; } - else scan->segm=1; + else scan->sega=1;*/ // // take the given range out of the block @@ -460,7 +460,7 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm) inc ax mov ds,ax }*/ -printf("segm=%u ", scan->segm); +//++++printf("sega=%u ", scan->sega); printf("ex=%lu ", extra); printf("len=%u ", scan->length); printf("segsta=%x ", segstart); @@ -549,7 +549,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 +575,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 +589,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 +603,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 +612,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"); // @@ -1034,7 +1034,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]; diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h index 8f064ce0..6aac19b7 100644 --- a/src/lib/16_mm.h +++ b/src/lib/16_mm.h @@ -114,11 +114,11 @@ extern void (* XMSaddr) (void); // far pointer to XMS driver typedef struct mmblockstruct { - word start,length,segm; + word start,length; //dword start,length; //word start; //dword length; - ///word segm; //how many 64kb segment blocks it takes up if there is many data! + //++++word sega; //how many 64kb segment blocks it takes up if there is many data! unsigned attributes; memptr *useptr; // pointer to the segment start struct mmblockstruct huge *next; -- 2.39.5