From aa074e927a76160b8a861471713931db2b5968d0 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Sun, 23 Apr 2017 16:03:13 -0500 Subject: [PATCH] broke fuck --- src/lib/16_mm.c | 99 ++++++++++++++++++++++++++++++++++++++++++------- src/xcroll.c | 2 +- 2 files changed, 86 insertions(+), 15 deletions(-) diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index 706aaff1..f2392b6a 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -58,6 +58,38 @@ Open Watcom port by sparky4 #pragma warn -pro #pragma warn -use + +/* +============================================================================= + + LOCAL INFO + +============================================================================= +*/ + +//#define LOCKBIT 0x80 // if set in attributes, block cannot be moved +//#define PURGEBITS 3 // 0-3 level, 0= unpurgable, 3= purge first +//#define PURGEMASK 0xfffc +//#define BASEATTRIBUTES 0 // unlocked, non purgable + +//#define MAXUMBS 10 + +/*typedef struct mmblockstruct +{ + unsigned start,length; + unsigned attributes; + memptr *useptr; // pointer to the segment start + struct mmblockstruct far *next; +} mmblocktype;*/ + + +//#define GETNEWBLOCK {if(!(mmnew=mmfree))Quit("MM_GETNEWBLOCK: No free blocks!") ;mmfree=mmfree->next;} +// + +//#define GETNEWBLOCK {if(!gvar->mm.mmfree)MML_ClearBlock(gvar);gvar->mm.mmnew=gvar->mm.mmfree;gvar->mm.mmfree=gvar->mm.mmfree->next;} + +//#define FREEBLOCK(x) {*x->useptr=NULL;x->next=gvar->mm.mmfree;gvar->mm.mmfree=x;} + /* ============================================================================= @@ -66,9 +98,12 @@ Open Watcom port by sparky4 ============================================================================= */ +/*mminfotype mminfo; +memptr bufferseg; +boolean mmerror;*/ + void (* beforesort) (void); void (* aftersort) (void); -void (* XMSaddr) (void); // far pointer to XMS driver /* ============================================================================= @@ -77,6 +112,38 @@ void (* XMSaddr) (void); // far pointer to XMS driver ============================================================================= */ + +/*boolean mmstarted; + +void far *farheap; +void *nearheap; + +mmblocktype far mmblocks[MAXBLOCKS] + ,far *mmhead,far *mmfree,far *mmrover,far *mmnew; + +boolean bombonerror;*/ + +//unsigned totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle; + +void (* XMSaddr) (void); // far pointer to XMS driver + +/*unsigned numUMBs,UMBbase[MAXUMBS];*/ + +//========================================================================== + +// +// local prototypes +// + +boolean MML_CheckForEMS (void); +void MML_ShutdownEMS (void); +void MM_MapEMS (void); +boolean MML_CheckForXMS (void); +void MML_ShutdownXMS (void); +//void MML_UseSpace (unsigned segstart, unsigned seglength); +//void MML_ClearBlock (void); + +//========================================================================== #ifndef __16_PM__ #if 0 static char *ParmStringsexmm[] = {"noems","noxms",""}; @@ -628,7 +695,7 @@ void MML_ShutdownXMS(global_game_variables_t *gvar) } //++++todo: linked list of segment! */ -void MML_UseSpace (word segstart, dword seglength, global_game_variables_t *gvar) +void MML_UseSpace (word segstart, word seglength, global_game_variables_t *gvar) { mmblocktype far *scan,far *last; word oldend; @@ -660,8 +727,9 @@ void MML_UseSpace (word segstart, dword seglength, global_game_variables_t *gvar // take the given range out of the block // oldend = scan->start + scan->length; - extra = oldend - (segstart+((unsigned)seglength)); + extra = oldend - (segstart+seglength); if (extra < 0) +#ifdef __DEBUG_MM__ { printf("========================================\n"); printf("start=%x ", scan->start); @@ -675,6 +743,9 @@ void MML_UseSpace (word segstart, dword seglength, global_game_variables_t *gvar printf("========================================\n"); //return; } +#else + Quit ("MML_UseSpace: Segment spans two blocks!"); +#endif if (segstart == scan->start) { @@ -711,7 +782,7 @@ void MML_UseSpace (word segstart, dword seglength, global_game_variables_t *gvar ==================== */ -void MML_ClearBlock(global_game_variables_t *gvar) +void MML_ClearBlock (global_game_variables_t *gvar) { mmblocktype far *scan;//,far *last; @@ -727,7 +798,7 @@ void MML_ClearBlock(global_game_variables_t *gvar) scan = scan->next; } - printf("MM_ClearBlock: No purgable blocks!\n"); + Quit (gvar, "MM_ClearBlock: No purgable blocks!\n"); } @@ -747,13 +818,12 @@ void MML_ClearBlock(global_game_variables_t *gvar) void MM_Startup (global_game_variables_t *gvar) { int i; - //dword length,seglength; - dword length; word seglength; + dword length; void far *start; - word segstart;//,endfree; + word segstart,seglength;//,endfree; if(gvar->mm.mmstarted) - MM_Shutdown(gvar); + MM_Shutdown (gvar); gvar->mm.mmstarted = true; gvar->mm.bombonerror = true; @@ -763,7 +833,7 @@ void MM_Startup (global_game_variables_t *gvar) // gvar->mm.mmhead = NULL; gvar->mm.mmfree = &(gvar->mm.mmblocks[0]); - for(i=0;imm.mmblocks[i].next = &(gvar->mm.mmblocks[i+1]); gvar->mm.mmblocks[i].next = NULL; @@ -778,6 +848,7 @@ void MM_Startup (global_game_variables_t *gvar) gvar->mm.mmnew->next = NULL; gvar->mm.mmrover = gvar->mm.mmhead; + // // get all available near conventional memory segments // @@ -873,7 +944,7 @@ xmsskip: // gvar->mm.mmrover = gvar->mm.mmhead; // start looking for space after low block - MM_GetPtr(&(gvar->mm.bufferseg),BUFFERSIZE, gvar); + MM_GetPtr (&(gvar->mm.bufferseg),BUFFERSIZE, gvar); } //========================================================================== @@ -926,10 +997,10 @@ void MM_Shutdown (global_game_variables_t *gvar) ==================== */ -void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar) +void MM_GetPtr (memptr *baseptr,dword size, global_game_variables_t *gvar) { mmblocktype far *scan,far *lastscan,far *endscan - ,far *purge,far *next; + ,far *purge,far *next; int search; unsigned needed,startseg; @@ -938,6 +1009,7 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar) GETNEWBLOCK; // fill in start and next after a spot is found gvar->mm.mmnew->length = needed; gvar->mm.mmnew->useptr = baseptr; + gvar->mm.mmnew->attributes = BASEATTRIBUTES; //if(gvar->mm.mmnew->useptr==NULL){ #ifdef __DEBUG_MM__ printf("MM_GetPtr\n"); @@ -950,7 +1022,6 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar) printf(" size is %lu\n", size); #endif //Quit(gvar, "gvar->mm.mmnew->useptr==NULL"); } - gvar->mm.mmnew->attributes = BASEATTRIBUTES; //tryagain: for (search = 0; search<3; search++) diff --git a/src/xcroll.c b/src/xcroll.c index 9e968ae5..d06850cb 100755 --- a/src/xcroll.c +++ b/src/xcroll.c @@ -121,7 +121,7 @@ void main(int argc, char *argv[]) modexFadeOn(4, &gvar.video.palette); #endif -// IN_StartAck (&gvar); MM_ShowMemory(&gvar); while (!IN_CheckAck (&gvar)){} + IN_StartAck (&gvar); MM_ShowMemory(&gvar); while (!IN_CheckAck (&gvar)){} #ifdef FADE modexPalBlack(); //so player will not see loadings~ #endif -- 2.39.2