From b9ead1ce7256ab14e50efca36ba32b9d9bf65c1a Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 24 Apr 2017 08:55:05 -0500 Subject: [PATCH] 16_ca needs huge amounts of work and I should remember what needs to be done soon[going to port rest of code to borland c some time so we can use the core components of id engine here ][going to add 16_us.c eventually but the debug system and CA_ PM_ and MM_ usage is priority now]older zcroll renamed to xcroll][zcroll is now the pre menu game loop system with PROPER data usage with CAMMPM] added 1st scroll back [i work on CA] --- src/lib/16_mm.c | 138 ++++++++++++++++++++++++++++++++++------------ src/lib/16_mm.h | 44 +++++++-------- src/lib/16_pm.c | 2 +- src/lib/16_tdef.h | 16 +++--- src/sountest.c | 5 +- src/xcroll.c | 4 +- 6 files changed, 138 insertions(+), 71 deletions(-) diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index 7fe1110d..4aa8b746 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -58,6 +58,37 @@ 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 +97,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 +111,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,10 +694,10 @@ 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 (unsigned segstart, unsigned seglength, global_game_variables_t *gvar) { mmblocktype far *scan,far *last; - word oldend; + unsigned oldend; sdword extra; //word segm=1; @@ -660,8 +726,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 +742,9 @@ void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar) printf("========================================\n"); //return; } +#else + Quit (gvar, "MML_UseSpace: Segment spans two blocks!"); +#endif if (segstart == scan->start) { @@ -711,7 +781,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 +797,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"); } @@ -744,26 +814,24 @@ void MML_ClearBlock(global_game_variables_t *gvar) =================== */ -void MM_Startup(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; + unsigned segstart,seglength;//,endfree; if(gvar->mm.mmstarted) - MM_Shutdown(gvar); + MM_Shutdown (gvar); gvar->mm.mmstarted = true; gvar->mm.bombonerror = true; - // // set up the linked list (everything in the free list; // 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 +846,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 // @@ -797,7 +866,7 @@ void MM_Startup(global_game_variables_t *gvar) length -= SAVENEARHEAP; seglength = length / 16; // now in paragraphs segstart = FP_SEG(start)+(FP_OFF(start)+15)/16; - MML_UseSpace(segstart,seglength, gvar); + MML_UseSpace (segstart,seglength, gvar); gvar->mmi.nearheap = length; //0000printf("near: start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, (dword)seglength, length); @@ -818,7 +887,7 @@ void MM_Startup(global_game_variables_t *gvar) length -= SAVEFARHEAP; seglength = length / 16; // now in paragraphs segstart = FP_SEG(start)+(FP_OFF(start)+15)/16; - MML_UseSpace(segstart,seglength, gvar); + MML_UseSpace (segstart,seglength, gvar); gvar->mmi.farheap = length; //0000printf("far: start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, (dword)seglength, length); @@ -873,7 +942,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); } //========================================================================== @@ -888,7 +957,7 @@ xmsskip: ==================== */ -void MM_Shutdown(global_game_variables_t *gvar) +void MM_Shutdown (global_game_variables_t *gvar) { if(!(gvar->mm.mmstarted)) return; @@ -926,10 +995,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,18 +1007,19 @@ 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"); if(dbg_debugmm>0){ - printf("MM_GetPtr\n"); //%04x printf(" baseptr=%Fp ", baseptr); printf("useptr=%Fp\n", gvar->mm.mmnew->useptr); printf(" *baseptr=%Fp ", *baseptr); printf("*useptr=%Fp\n", *(gvar->mm.mmnew->useptr)); printf(" &baseptr=%Fp ", &baseptr); printf("&useptr=%Fp\n", &(gvar->mm.mmnew->useptr)); } + printf(" size is %lu\n", size); #endif - //Quit(gvar, "gvar->mm.mmnew->useptr==NULL"); } - gvar->mm.mmnew->attributes = BASEATTRIBUTES; + //Quit (gvar, "gvar->mm.mmnew->useptr==NULL"); } //tryagain: for (search = 0; search<3; search++) @@ -1027,7 +1097,7 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar) //heapdump(); #endif printf(OUT_OF_MEM_MSG,(size-gvar->mmi.nearheap)); - Quit(gvar, "for stability reasons the program will shut down! wwww\n"); + Quit (gvar, "for stability reasons the program will shut down! wwww\n"); } else gvar->mm.mmerror = true; @@ -1055,13 +1125,13 @@ void MM_FreePtr (memptr *baseptr, global_game_variables_t *gvar) if (baseptr == gvar->mm.mmrover->useptr) // removed the last allocated block gvar->mm.mmrover = gvar->mm.mmhead; - while(scan->useptr != baseptr && scan) + while (scan->useptr != baseptr && scan) { last = scan; scan = scan->next; } - if(!scan) + if (!scan) Quit (gvar, "MM_FreePtr: Block not found!"); last->next = scan->next; @@ -1098,7 +1168,7 @@ void MM_SetPurge (memptr *baseptr, int purge, global_game_variables_t *gvar) else if (gvar->mm.mmrover == start) Quit (gvar, "MM_SetPurge: Block not found!"); - } while(1); + } while (1); gvar->mm.mmrover->attributes &= ~PURGEBITS; gvar->mm.mmrover->attributes |= purge; @@ -1173,7 +1243,7 @@ void MM_SortMem (global_game_variables_t *gvar) playing += STARTADLIBSOUNDS; break; } - MM_SetLock((memptr *)&audiosegs[playing],true); + MM_SetLock(MEMPTRCONV audiosegs[playing],true); } @@ -1181,16 +1251,16 @@ void MM_SortMem (global_game_variables_t *gvar) oldborder = gvar->video.bordercolor; gvar->video.bordercolor = modexPalOverscan(15); - if(beforesort) + if (beforesort) beforesort(); scan = gvar->mm.mmhead; last = NULL; // shut up compiler warning - while(scan) + while (scan) { - if(scan->attributes & LOCKBIT) + if (scan->attributes & LOCKBIT) { // // block is locked, so try to pile later blocks right after it @@ -1199,7 +1269,7 @@ void MM_SortMem (global_game_variables_t *gvar) } else { - if(scan->attributes & PURGEBITS) + if (scan->attributes & PURGEBITS) { // // throw out the purgable block @@ -1215,12 +1285,12 @@ void MM_SortMem (global_game_variables_t *gvar) // // push the non purgable block on top of the last moved block // - if(scan->start != start) + if (scan->start != start) { length = scan->length; source = scan->start; dest = start; - while(length > 0xf00) + while (length > 0xf00) { movedata(source,0,dest,0,0xf00*16); length -= 0xf00; @@ -1242,7 +1312,7 @@ void MM_SortMem (global_game_variables_t *gvar) gvar->mm.mmrover = gvar->mm.mmhead; - if(aftersort) + if (aftersort) aftersort(); VL_ColorBorder (oldborder, &gvar->video); diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h index 86bcdd57..c003b54b 100755 --- a/src/lib/16_mm.h +++ b/src/lib/16_mm.h @@ -41,8 +41,8 @@ #define FREEBLOCK(x) {*x->useptr=NULL;x->next=gvar->mm.mmfree;gvar->mm.mmfree=x;} -#define SAVENEARHEAP 0x200 // space to leave in data segment -#define SAVEFARHEAP 0x400 // space to leave in far heap +#define SAVENEARHEAP 0x400 // space to leave in data segment +#define SAVEFARHEAP 0 // space to leave in far heap #define BUFFERSIZE 0x1000 // miscelanious, allways available buffer @@ -106,7 +106,7 @@ extern void (* beforesort) (void); extern void (* aftersort) (void); -extern void (* XMSaddr) (void); // far pointer to XMS driver +//extern void (* XMSaddr) (void); // far pointer to XMS driver extern dword XMSDriver; extern word XMSVer; @@ -179,35 +179,35 @@ typedef struct //========================================================================== -boolean MML_CheckForEMS(void); +boolean MML_CheckForEMS (void); //byte MML_SetupEMS(mminfo_t *mm); //void MML_ShutdownEMS(mminfo_t *mm); //byte MM_MapEMS(global_game_variables_t *gvar); //byte MM_MapXEMS(global_game_variables_t *gvar); -boolean MML_CheckForXMS(void); +boolean MML_CheckForXMS (void); //void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi); //void MML_ShutdownXMS(mminfo_t *mm); -void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar); +void MML_UseSpace (unsigned segstart, unsigned seglength, global_game_variables_t *gvar); void MML_ClearBlock (global_game_variables_t *gvar); -void MM_Startup(global_game_variables_t *gvar); -void MM_Shutdown(global_game_variables_t *gvar); - -void MM_GetPtr(memptr *baseptr,dword size, global_game_variables_t *gvar); -void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar); -void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar); -void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar); -void MM_SortMem(global_game_variables_t *gvar); -void MM_ShowMemory(global_game_variables_t *gvar); -void MM_DumpData(global_game_variables_t *gvar); -dword MM_UnusedMemory(global_game_variables_t *gvar); -dword MM_TotalFree(global_game_variables_t *gvar); -void MM_Report_(global_game_variables_t *gvar); -/*static */void MM_EMSerr(byte *stri, byte err); -void MM_BombOnError(boolean bomb, global_game_variables_t *gvar); +void MM_Startup (global_game_variables_t *gvar); +void MM_Shutdown (global_game_variables_t *gvar); + +void MM_GetPtr (memptr *baseptr,dword size, global_game_variables_t *gvar); +void MM_FreePtr (memptr *baseptr, global_game_variables_t *gvar); +void MM_SetPurge (memptr *baseptr, int purge, global_game_variables_t *gvar); +void MM_SetLock (memptr *baseptr, boolean locked, global_game_variables_t *gvar); +void MM_SortMem (global_game_variables_t *gvar); +void MM_ShowMemory (global_game_variables_t *gvar); +void MM_DumpData (global_game_variables_t *gvar); +dword MM_UnusedMemory (global_game_variables_t *gvar); +dword MM_TotalFree (global_game_variables_t *gvar); +void MM_Report_ (global_game_variables_t *gvar); +/*static */void MM_EMSerr (byte *stri, byte err); +void MM_BombOnError (boolean bomb, global_game_variables_t *gvar); //void MM_GetNewBlock(mminfo_t *mm); //void MM_FreeBlock(mmblocktype *x, mminfo_t *mm); -void xms_call(byte v, global_game_variables_t *gvar); +void xms_call (byte v, global_game_variables_t *gvar); //========================================================================== diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c index 858bd4b9..ce81eb4a 100755 --- a/src/lib/16_pm.c +++ b/src/lib/16_pm.c @@ -1420,7 +1420,7 @@ PM_NextFrame(global_game_variables_t *gvar) { char buf[40]; sprintf(buf,"PM_NextFrame: Page %d is locked",i); - Quit(gvar, buf); + Quit (gvar, buf); } } //#endif diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h index f45195d6..3fa1feb3 100755 --- a/src/lib/16_tdef.h +++ b/src/lib/16_tdef.h @@ -468,14 +468,11 @@ typedef struct //from 16_mm //========================================================================== -#define MAXBLOCKS 1024//kd=1300 wolf3d=700 cata=600 -//----#define MAXUMBS 12 +#define MAXBLOCKS 800//kd=1300 wolf3d=700 cata=600 typedef struct mmblockstruct { - word start,length; - //word start; dword length; -//++++ word blob; //for data larger than 64k + unsigned start,length; unsigned attributes; memptr *useptr; // pointer to the segment start struct mmblockstruct far *next; @@ -660,9 +657,10 @@ typedef struct #define NUMMAPS 4//39 #define NUMSNDCHUNKS 4//3 -//#define NUMPICS 132//wolf3d wl6 +//#define NUMPICS 4//132//wolf3d wl6 #define STRUCTPIC 0 +#define CASVT dword //*start var type #define DATADIR "data/" @@ -718,8 +716,8 @@ typedef struct //TODO: USE THIS!!!! byte far grneeded[NUMCHUNKS]; word _seg *audiosegs[NUMSNDCHUNKS];//long - word _seg *grstarts; // array of offsets in egagraph, -1 for sparse//long - word _seg *audiostarts; // array of offsets in audio / audiot//long + CASVT _seg *grstarts; // array of offsets in egagraph, -1 for sparse//long + CASVT _seg *audiostarts; // array of offsets in audio / audiot//long #ifdef GRHEADERLINKED huffnode *grhuffman; @@ -733,7 +731,7 @@ typedef struct //TODO: USE THIS!!!! huffnode audiohuffman[255]; #endif - long chunkcomplen,chunkexplen; + CASVT chunkcomplen,chunkexplen;//long sd_t sd; //TODO: extend! and learn from keen/wolf/catacomb's code wwww diff --git a/src/sountest.c b/src/sountest.c index d15a5462..3ef0114f 100755 --- a/src/sountest.c +++ b/src/sountest.c @@ -65,13 +65,14 @@ void main(int argc, char near *argv[]) //0x36, /* feedback algorithm and strength 0xC0 */ //}; - IN_Startup(&gvar); //FMReset(); //FMSetVoice(0, &testInst); if(!init_adlib()) { - Quit(&gvar, "Cannot init library"); + printf("Cannot init library\n"); + exit(-1); } + IN_Startup(&gvar); if (adlib_fm_voices > 9) printf("OPL3!\n"); diff --git a/src/xcroll.c b/src/xcroll.c index ed02457e..d06850cb 100755 --- a/src/xcroll.c +++ b/src/xcroll.c @@ -121,9 +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