X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=42a87440485b974a3b11baf23fb91f8c5119db73;hb=c8dd189c61a9d0e0ef34224be609f1c8f590be7c;hp=9333d380c0583eca68456bbc7df610217da89a5b;hpb=8cdd69d75d0d1f2b820dc4fa0ebf8892ab70f03d;p=16.git diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index 9333d380..42a87440 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -140,7 +140,7 @@ boolean MML_CheckForEMS(void) return(emmcfems); } - +#ifndef __16_PM__ /* ====================== = @@ -245,12 +245,12 @@ End: printf("%s\n",str); return err; } - gvar->pm.emm.totalEMSpages=totalEMSpages; - gvar->pm.emm.freeEMSpages=freeEMSpages; - gvar->pm.emm.EMSPageFrame=EMSPageFrame; - gvar->pm.emm.EMSpagesmapped=EMSpagesmapped; - gvar->pm.emm.EMSHandle=EMSHandle; - gvar->pm.emm.EMSVer=EMSVer; + gvar->mm.totalEMSpages=totalEMSpages; + gvar->mm.freeEMSpages=freeEMSpages; + gvar->mm.EMSPageFrame=EMSPageFrame; + gvar->mm.EMSpagesmapped=EMSpagesmapped; + gvar->mm.EMSHandle=EMSHandle; + gvar->mm.EMSVer=EMSVer; return 0; } @@ -266,7 +266,7 @@ End: void MML_ShutdownEMS(global_game_variables_t *gvar) { boolean errorflag=false; - unsigned EMSHandle=gvar->pm.emm.EMSHandle; + unsigned EMSHandle=gvar->mm.EMSHandle; if(!EMSHandle) return; @@ -307,7 +307,7 @@ byte MM_MapEMS(global_game_variables_t *gvar) byte err; boolean errorflag=false; int i; - EMSHandle=gvar->pm.emm.EMSHandle; + EMSHandle=gvar->mm.EMSHandle; for (i=0;i<4/*MAPPAGES*/;i++) { @@ -345,7 +345,6 @@ byte MM_MapEMS(global_game_variables_t *gvar) } } gvar->mmi.EMSmem = (i)*0x4000lu; - //printf(" gvar->mmi.EMSmem=%lu\n", gvar->mmi.EMSmem); return 0; } @@ -378,9 +377,9 @@ byte MM_MapXEMS(global_game_variables_t *gvar) word EMSHandle; boolean errorflag=false; int i; - EMSHandle=gvar->pm.emm.EMSHandle; + EMSHandle=gvar->mm.EMSHandle; - if(gvar->pm.emm.EMSVer<0x40) + if(gvar->mm.EMSVer<0x40) return 5; for (i=0;immi.EMSmem = (i)*0x4000lu; return 0; } - +#endif //========================================================================== /* @@ -438,10 +437,10 @@ byte MM_MapXEMS(global_game_variables_t *gvar) ======================= */ -boolean MML_CheckForXMS(global_game_variables_t *gvar) +boolean MML_CheckForXMS(void) { + //numUMBs = 0; boolean errorflag=false; - gvar->mm.numUMBs = 0; __asm { mov ax,0x4300 @@ -460,7 +459,7 @@ boolean MML_CheckForXMS(global_game_variables_t *gvar) else return true; } - +#ifndef __16_PM__ /* ====================== = @@ -547,7 +546,7 @@ void MML_ShutdownXMS(global_game_variables_t *gvar) } } } - +#endif //========================================================================== /* @@ -818,12 +817,13 @@ void MM_Startup(global_game_variables_t *gvar) //printf("_FARCORELEFT %lu\n", _FCORELEFT); #ifdef __WATCOMC__ _fheapgrow(); + length=_FCORELEFT;//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL; #endif #ifdef __BORLANDC__ printf("farcoreleft() %lu\n", farcoreleft()); printf("(farcoreleft()+32)-_FCORELEFT %d\n", (sword)((farcoreleft()+32)-_FCORELEFT)); + length=farcoreleft();//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL; #endif - length=_FCORELEFT;//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL; start = gvar->mm.farheap = _fmalloc(length); //start = gvar->mm.farheap = halloc(length, 1); length -= 16-(FP_OFF(start)&15); @@ -836,35 +836,23 @@ void MM_Startup(global_game_variables_t *gvar) gvar->mmi.mainmem = gvar->mmi.nearheap + gvar->mmi.farheap; +#ifndef __16_PM__ + if(!dbg_debugpm) { // // detect EMS and allocate up to 64K at page frame // gvar->mmi.EMSmem = 0; //goto emsskip; //0000 - for(i = 1;i < -#ifdef __WATCOMC__ - __argc -#endif -#ifdef __BORLANDC__ - _argc -#endif - ;i++) + for(i = 1;i < _argc;i++) { - if(US_CheckParm( -#ifdef __WATCOMC__ - __argv[i] -#endif -#ifdef __BORLANDC__ - _argv[i] -#endif - ,ParmStringsexmm) == 0) + if(US_CheckParm(_argv[i],ParmStringsexmm) == 0) goto emsskip; // param NOEMS } if(MML_CheckForEMS()) { MML_SetupEMS(gvar); // allocate space - //TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT! - MML_UseSpace(gvar->pm.emm.EMSPageFrame,(MAPPAGES)*0x4000lu, gvar); + //16_PM: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT! + MML_UseSpace(gvar->mm.EMSPageFrame,(MAPPAGES)*0x4000lu, gvar); //if(gvar->pm.emm.EMSVer<0x40) MM_MapEMS(gvar); // map in used pages //else @@ -877,34 +865,22 @@ void MM_Startup(global_game_variables_t *gvar) emsskip: gvar->mmi.XMSmem = 0; goto xmsskip;//0000 - for(i = 1;i < -#ifdef __WATCOMC__ - __argc -#endif -#ifdef __BORLANDC__ - _argc -#endif - ;i++) + for(i = 1;i < _argc;i++) { - if(US_CheckParm( -#ifdef __WATCOMC__ - __argv[i] -#endif -#ifdef __BORLANDC__ - _argv[i] -#endif - ,ParmStringsexmm) == 0) + if(US_CheckParm( _argv[i],ParmStringsexmm) == 0) goto xmsskip; // param NOXMS } - if(MML_CheckForXMS(gvar)) + if(MML_CheckForXMS()) { MML_SetupXMS(gvar); // allocate as many UMBs as possible } + } +xmsskip: +#endif // // allocate the misc buffer // -xmsskip: gvar->mm.mmrover = gvar->mm.mmhead; // start looking for space after low block MM_GetPtr(&(gvar->mm.bufferseg),BUFFERSIZE, gvar); @@ -933,9 +909,17 @@ void MM_Shutdown(global_game_variables_t *gvar) #endif #ifdef __BORLANDC__ free(gvar->mm.nearheap);// printf(" near freed\n"); +#endif +#ifndef __16_PM__ +#ifdef __DEBUG__ + if(!dbg_debugpm) { #endif if(MML_CheckForEMS()){ MML_ShutdownEMS(gvar); }//printf(" EMS freed\n"); } - if(MML_CheckForXMS(gvar)){ MML_ShutdownXMS(gvar); }//printf(" XMS freed\n"); } + if(MML_CheckForXMS()){ MML_ShutdownXMS(gvar); }//printf(" XMS freed\n"); } +#ifdef __DEBUG__ + } +#endif +#endif } //========================================================================== @@ -963,11 +947,12 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar) gvar->mm.mmnew->length = needed; gvar->mm.mmnew->useptr = baseptr; //if(gvar->mm.mmnew->useptr==NULL){ -#ifdef __DEBUG__ - printf(" MM_GetPtr\n"); - printf(" baseptr=%04x ", baseptr); printf("useptr=%04x\n", gvar->mm.mmnew->useptr); - printf(" *baseptr=%04x ", *baseptr); printf("*useptr=%04x\n", *(gvar->mm.mmnew->useptr)); - printf(" *baseptr=%Fp ", *baseptr); printf("*useptr=%Fp\n", *(gvar->mm.mmnew->useptr)); +#ifdef __DEBUG_MM__ + 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)); #endif //exit(-5); } gvar->mm.mmnew->attributes = BASEATTRIBUTES; @@ -1107,6 +1092,7 @@ void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar) ===================== */ + void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar) { //huge mmblocktype huge *start; @@ -1125,11 +1111,8 @@ void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar) gvar->mm.mmrover = gvar->mm.mmhead; else if(gvar->mm.mmrover == start) { - //Quit("MM_SetPurge: Block not found!"); - printf("%Fp %u\n", start->start, start->length); - printf("MM_SetPurge: Block not found!\n"); - exit(1); - return; + Quit("MM_SetPurge: Block not found!"); + //return; } } while(1); @@ -1604,25 +1587,29 @@ dword MM_TotalFree(global_game_variables_t *gvar) void MM_Report_(global_game_variables_t *gvar) { printf("========================================\n"); - printf(" MM_Report\n"); + printf(" MM_Report_\n"); printf("========================================\n"); if(MML_CheckForEMS()) { - printf(" LIMEMS\n"); - printf(" EMM v%x.%x available\n", gvar->pm.emm.EMSVer>>4,gvar->pm.emm.EMSVer&0x0F); - printf(" totalEMSpages: %u ", gvar->pm.emm.totalEMSpages); printf("freeEMSpages: %u\n", gvar->pm.emm.freeEMSpages); - printf(" EMSPageFrame: %x\n", gvar->pm.emm.EMSPageFrame); + printf(" %cLIMEMS %u\n", 0xC9, gvar->pm.emm.EMSPresent); + printf(" %c%cEMM v%x.%x available\n", 0xC7, 0xC4, gvar->pm.emm.EMSVer>>4,gvar->pm.emm.EMSVer&0x0F); + printf(" %c%ctotalEMSpages: %u ", 0xC7, 0xC4, gvar->pm.emm.totalEMSpages); printf("freeEMSpages: %u\n", gvar->pm.emm.freeEMSpages); + printf(" %c%cEMSPageFrame: %04x\n", 0xC7, 0xC4, gvar->pm.emm.EMSPageFrame); + printf(" %c%cEMSmem: %lu\n", 0xD3, 0xC4, gvar->mmi.EMSmem); } - if(MML_CheckForXMS(gvar)) + if(MML_CheckForXMS()) { - printf(" XMS\n"); - printf(" XMSaddr: %X\n", *XMSaddr); + printf(" %cXMS %u\n", 0xC9, gvar->pm.xmm.XMSPresent); + printf(" %c%cXMS v%x.%x available\n", 0xC7, 0xC4, XMSVer>>8,XMSVer&0x0F); + printf(" %c%cXMSDriver: %Fp\n", 0xC7, 0xC4, XMSDriver); + printf(" %c%cXMSHandle: %04x\n", 0xC7, 0xC4, gvar->pm.xmm.XMSHandle); + printf(" %c%cXMSmem: %lu\n", 0xD3, 0xC4, gvar->mmi.XMSmem); } - printf("near: %lu ", gvar->mmi.nearheap); printf("far: %lu\n", gvar->mmi.farheap); if(MML_CheckForEMS()) - printf("EMSmem: %lu ", gvar->mmi.EMSmem); if(MML_CheckForXMS(gvar)) printf("XMSmem: %lu", gvar->mmi.XMSmem); printf("\n"); + printf(" %cConv. %u\n", 0xC9, gvar->pm.mm.MainPresent); DebugMemory_(gvar, 0); //printf("mainmem: %lu\n", gvar->mmi.mainmem); - printf("Total convmem: %lu ", gvar->mmi.mainmem); printf("TotalFree: %lu ", MM_TotalFree(gvar)); printf("TotalUsed: %lu\n", gvar->mmi.mainmem+gvar->mmi.EMSmem+gvar->mmi.XMSmem+gvar->mmi.XMSmem); - printf(" UnusedMemory: %lu\n", MM_UnusedMemory(gvar)); + //printf("Total convmem: %lu ", gvar->mmi.mainmem); printf("TotalFree: %lu ", MM_TotalFree(gvar)+gvar->mmi.EMSmem+gvar->mmi.XMSmem+gvar->mmi.XMSmem); printf("TotalUsed: %lu\n", gvar->mmi.mainmem); + //printf(" UnusedMemory: %lu\n", MM_UnusedMemory(gvar)); + printf("nearheap: %lu ", gvar->mmi.nearheap); printf("farheap: %lu\n", gvar->mmi.farheap); } //========================================================================== @@ -1792,6 +1779,15 @@ void MM_FreeBlock(mmblocktype *x, global_game_variables_t *gvar) gvar->mm.mmfree=x; }*/ +void xms_call(byte v, global_game_variables_t *gvar) +{ + dword XMSDriver = gvar->pm.xmm.XMSDriver; + __asm { + mov ah,[v] + call [DWORD PTR XMSDriver] + } +} + /*void MM_seguin(void) { __asm {