X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=c14632abb93014c2d9ce3057ad480a4f542e5f77;hb=050d28da3358d5c1434fda542ec11adbee182ea5;hp=5f5b6444a7cb70190cf9c367f4ee59c6fa7bd8f5;hpb=4423bda56aab2192f037bec035a3412153b2b3a7;p=16.git
diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 5f5b6444..c14632ab 100755
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1,19 +1,23 @@
-/* Catacomb Apocalypse Source Code
- * Copyright (C) 1993-2014 Flat Rock Software
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
*
- * This program is free software; you can redistribute it and/or modify
+ * This file is part of Project 16.
+ *
+ * Project 16 is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * Project 16 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see , or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
*/
// NEWMM.C
@@ -48,11 +52,43 @@ Open Watcom port by sparky4
*/
#include "src/lib/16_mm.h"
#include "src/lib/16_ca.h"
+#include
#pragma hdrstop
#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;}
+
/*
=============================================================================
@@ -61,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
/*
=============================================================================
@@ -73,6 +112,42 @@ 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",""};
+#endif
+#endif
/*
======================
=
@@ -85,18 +160,20 @@ void (* XMSaddr) (void); // far pointer to XMS driver
boolean MML_CheckForEMS(void)
{
- boolean emmcfems;
+ boolean emmcfems = false;
+ word EMSPageFrame = 0;
+ byte err=0, str[64];
static char emmname[] = "EMMXXXX0"; //fix by andrius4669
__asm {
mov dx,OFFSET emmname //fix by andrius4669
mov ax,0x3d00
- int 0x21 // try to open EMMXXXX0 device
+ int EMM_INT // try to open EMMXXXX0 device
jc error
mov bx,ax
mov ax,0x4400
- int 0x21 // get device info
+ int EMM_INT // get device info
jc error
and dx,0x80
@@ -104,19 +181,29 @@ boolean MML_CheckForEMS(void)
mov ax,0x4407
- int 0x21 // get status
+ int EMM_INT // get status
jc error
or al,al
jz error
mov ah,0x3e
- int 0x21 // close handle
+ int EMM_INT // close handle
jc error
+
+ //
+ // pageframe check
+ //
+ mov ah,EMS_GETFRAME
+ int EMS_INT // find the page frame address
+ or ah,ah
+ jnz error
+ mov [EMSPageFrame],bx
+
//
// EMS is good
//
- mov emmcfems,1
- jmp End
+ mov emmcfems,1
+ jmp End
#ifdef __BORLANDC__
}
#endif
@@ -127,7 +214,8 @@ boolean MML_CheckForEMS(void)
//
// EMS is bad
//
- mov emmcfems,0
+ mov err,ah
+ mov emmcfems,0
#ifdef __BORLANDC__
}
#endif
@@ -135,10 +223,28 @@ boolean MML_CheckForEMS(void)
#ifdef __WATCOMC__
}
#endif
+
+ //
+ // Pageframe switch to determine if there is one!
+ //
+ if(!EMSPageFrame)
+ {
+ emmcfems = false;
+#if defined(__DEBUG_PM__) || defined(__DEBUG_MM__)
+ printf("MML_CheckForEMS: EMS error No Pageframe!\nAddress detected to be %04x\n", EMSPageFrame);
+#endif
+ }else if(!emmcfems)// if there is an error and page frame is not 0000
+ {
+ strcpy(str,"MML_CheckForEMS: EMS error ");
+ MM_EMSerr(str, err);
+ printf("%s\n",str);
+ }
+
return(emmcfems);
}
-
+#ifndef __16_PM__
+#if 0
/*
======================
=
@@ -243,12 +349,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;
}
@@ -264,7 +370,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;
@@ -283,7 +389,7 @@ void MML_ShutdownEMS(global_game_variables_t *gvar)
}
#endif
if(errorflag==true)
- Quit("MML_ShutdownEMS: Error freeing EMS!\n"); //++++ add something
+ Quit ("MML_ShutdownEMS: Error freeing EMS!\n"); //++++ add something
}
/*
@@ -305,7 +411,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++)
{
@@ -343,7 +449,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;
}
@@ -376,9 +481,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
+#endif
//==========================================================================
/*
@@ -436,10 +542,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
@@ -458,7 +564,8 @@ boolean MML_CheckForXMS(global_game_variables_t *gvar)
else return true;
}
-
+#ifndef __16_PM__
+#if 0
/*
======================
=
@@ -545,7 +652,8 @@ void MML_ShutdownXMS(global_game_variables_t *gvar)
}
}
}
-
+#endif
+#endif
//==========================================================================
/*
@@ -560,30 +668,7 @@ void MML_ShutdownXMS(global_game_variables_t *gvar)
======================
*/
-/*void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar)
-{
- //huge mmblocktype huge *scan,huge *last;
- word segm=1;
- word oldend;
- dword segmlen;
- dword extra;
-
- scan = last = gvar->mm.mmhead;
- gvar->mm.mmrover = gvar->mm.mmhead; // reset rover to start of memory
-
-//
-// search for the block that contains the range of segments
-//
- while(scan->start+scan->length < segstart)
- {
- last = scan;
- scan = scan->next;
- }
-
-//
-// take the given range out of the block
-//
- oldend = scan->start + scan->length;
+/*
extra = oldend - (segstart+seglength);
segmlen=extra;
@@ -608,32 +693,11 @@ void MML_ShutdownXMS(global_game_variables_t *gvar)
printf("segmlen=%lu\n", segmlen);
}
//++++todo: linked list of segment!
- if(segstart == scan->start)
- {
- last->next = scan->next; // unlink block
- FREEBLOCK(scan);
- scan = last;
- }
- else
- scan->length = segstart-scan->start; // shorten block
-
- if(extra > 0)
- {
- GETNEWBLOCK;
- gvar->mm.mmnew->useptr = NULL;
-
- gvar->mm.mmnew->next = scan->next;
- scan->next = gvar->mm.mmnew;
- gvar->mm.mmnew->start = segstart+seglength;
- gvar->mm.mmnew->length = extra;
- gvar->mm.mmnew->attributes = LOCKBIT;
- }//else if(segm>0) goto segu;
-
-}*/
-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;
@@ -662,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);
@@ -677,6 +742,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)
{
@@ -697,7 +765,7 @@ void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar)
gvar->mm.mmnew->start = segstart+seglength;
gvar->mm.mmnew->length = extra;
gvar->mm.mmnew->attributes = LOCKBIT;
- }
+ }//else if(segm>0) goto segu;
}
@@ -713,10 +781,9 @@ 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)
{
- //huge mmblocktype huge *scan,huge *last;
- mmblocktype far *scan,far *last;
+ mmblocktype far *scan;//,far *last;
scan = gvar->mm.mmhead->next;
@@ -730,7 +797,7 @@ void MML_ClearBlock(global_game_variables_t *gvar)
scan = scan->next;
}
- printf("MM_ClearBlock: No purgable blocks!\n");
+ Quit ("MM_ClearBlock: No purgable blocks!\n");
}
@@ -747,19 +814,15 @@ 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;
- //huge void huge *start;
void far *start;
- word segstart,seglength,endfree;
- //memptr *peeonself;
+ unsigned segstart,seglength;//,endfree;
if(gvar->mm.mmstarted)
- MM_Shutdown(gvar);
-
+ MM_Shutdown (gvar);
gvar->mm.mmstarted = true;
gvar->mm.bombonerror = true;
@@ -768,10 +831,8 @@ 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;
//
@@ -783,70 +844,73 @@ void MM_Startup(global_game_variables_t *gvar)
gvar->mm.mmnew->length = 0xffff;
gvar->mm.mmnew->attributes = LOCKBIT;
gvar->mm.mmnew->next = NULL;
- //gvar->mm.mmnew->useptr = peeonself;
gvar->mm.mmrover = gvar->mm.mmhead;
- //printf(" %x\n", peeonself);
- //printf(" %x\n", *peeonself);
+
//
// get all available near conventional memory segments
//
#ifdef __WATCOMC__
_nheapgrow();
- length=(dword)_memavl();//(dword)GetFreeSize();
- //huge start = (void huge *)(gvar->mm.nearheap = _nmalloc(length));
- start = (void far *)(gvar->mm.nearheap = _nmalloc(length));
+#endif
+ length=(word)_memavl();//(word)coreleft();
+ //start = gvar->mm.nearheap = _fmalloc(length);
+#ifdef __WATCOMC__
+ start = (void __far *)(gvar->mm.nearheap = _nmalloc(length));
#endif
#ifdef __BORLANDC__
- length=coreleft();
- //huge start = (void huge *)(gvar->mm.nearheap = malloc(length));
start = (void far *)(gvar->mm.nearheap = malloc(length));
- printf("Borland C unique function\n");
- printf(" coreleft() %lu\n", coreleft());
#endif
+
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, gvar);
+ MML_UseSpace (segstart,seglength, gvar);
gvar->mmi.nearheap = length;
- //printf("start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, seglength, length);
+ //0000printf("near: start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, (dword)seglength, length);
//
// get all available far conventional memory segments
//
- //printf("_FARCORELEFT %lu\n", _FCORELEFT);
#ifdef __WATCOMC__
_fheapgrow();
#endif
#ifdef __BORLANDC__
- printf(" farcoreleft() %lu\n", farcoreleft());
- printf(" (farcoreleft()+32)-_FCORELEFT %d\n", (sword)((farcoreleft()+32)-_FCORELEFT));
+// printf("farcoreleft() %lu\n", farcoreleft());
+// printf("(farcoreleft()+32)-_FCORELEFT %d\n", (sword)((farcoreleft()+32)-_FCORELEFT));
#endif
- length=_FCORELEFT;//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL;
- start = gvar->mm.farheap = _fmalloc(length);
- //start = gvar->mm.farheap = halloc(length, 1);
+ length=_FCORELEFT;
+ start = gvar->mm.farheap = _fmalloc(length);//start = gvar->mm.farheap = halloc(length, 1);
+
length -= 16-(FP_OFF(start)&15);
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;
- gvar->mmi.mainmem = gvar->mmi.nearheap + gvar->mmi.farheap;
- //printf("start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, seglength, length);
+ //0000printf("far: start=%Fp segstart=%x seglen=%lu len=%lu\n", start, segstart, (dword)seglength, length);
-goto xmsskip; //INFO: 16_PM dose this job better
+ gvar->mmi.mainmem = gvar->mmi.nearheap + gvar->mmi.farheap;
+#if !defined(__16_PM__)// && defined(__WATCOMC__)
+#if 0
+ if(!dbg_debugpm) {
//
// detect EMS and allocate up to 64K at page frame
//
gvar->mmi.EMSmem = 0;
//goto emsskip; //0000
+ for(i = 1;i < _argc;i++)
+ {
+ 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
@@ -856,21 +920,29 @@ goto xmsskip; //INFO: 16_PM dose this job better
//
// detect XMS and get upper memory blocks
//
-//emsskip:
+emsskip:
gvar->mmi.XMSmem = 0;
-//goto xmsskip;//0000
- if(MML_CheckForXMS(gvar))
+goto xmsskip;//0000
+ for(i = 1;i < _argc;i++)
+ {
+ if(US_CheckParm( _argv[i],ParmStringsexmm) == 0)
+ goto xmsskip; // param NOXMS
+ }
+ if(MML_CheckForXMS())
{
MML_SetupXMS(gvar); // allocate as many UMBs as possible
}
+ }
+xmsskip:
+#endif
+#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);
+ MM_GetPtr (&(gvar->mm.bufferseg),BUFFERSIZE, gvar);
}
//==========================================================================
@@ -885,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;
@@ -896,9 +968,19 @@ void MM_Shutdown(global_game_variables_t *gvar)
#endif
#ifdef __BORLANDC__
free(gvar->mm.nearheap);// printf(" near freed\n");
+#endif
+#ifndef __16_PM__
+#if 0
+#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
+#endif
}
//==========================================================================
@@ -913,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)
{
- //huge mmblocktype huge *scan,huge *lastscan,huge *endscan,huge *purge,huge *next;
- mmblocktype far *scan,far *lastscan,far *endscan,far *purge,far *next;
+ mmblocktype far *scan,far *lastscan,far *endscan
+ ,far *purge,far *next;
int search;
unsigned needed,startseg;
@@ -925,15 +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__
- 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");
+ if(dbg_debugmm>0){
+ //%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
- //exit(-5); }
- gvar->mm.mmnew->attributes = BASEATTRIBUTES;
+ //Quit(gvar, "gvar->mm.mmnew->useptr==NULL"); }
//tryagain:
for (search = 0; search<3; search++)
@@ -1011,9 +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));
- printf("for stability reasons the program will shut down! wwww\n");
- MM_Shutdown(gvar);
- exit(-1);
+ Quit("for stability reasons the program will shut down! wwww\n");
}
else
gvar->mm.mmerror = true;
@@ -1026,33 +1110,29 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar)
=
= MM_FreePtr
=
-= Allocates an unlocked, unpurgable block
+= Deallocates an unlocked, purgable block
=
====================
*/
-void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar)
+void MM_FreePtr (memptr *baseptr, global_game_variables_t *gvar)
{
- //huge mmblocktype huge *scan,huge *last;
mmblocktype far *scan,far *last;
last = gvar->mm.mmhead;
scan = last->next;
- if(baseptr == gvar->mm.mmrover->useptr) // removed the last allocated block
+ 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)
- {
- printf("MM_FreePtr: Block not found!\n");
- return;
- }
+ if (!scan)
+ Quit ("MM_FreePtr: Block not found!");
last->next = scan->next;
@@ -1070,46 +1150,25 @@ void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar)
=====================
*/
-void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar)
+void MM_SetPurge (memptr *baseptr, int purge, global_game_variables_t *gvar)
{
- mmblocktype huge *start;
- //mmblocktype far *start;
+ mmblocktype far *start;
start = gvar->mm.mmrover;
do
{
- if(gvar->mm.mmrover->useptr == baseptr)
+ if (gvar->mm.mmrover->useptr == baseptr)
break;
gvar->mm.mmrover = gvar->mm.mmrover->next;
- if(!gvar->mm.mmrover)
+ if (!gvar->mm.mmrover)
gvar->mm.mmrover = gvar->mm.mmhead;
- else if(gvar->mm.mmrover == start)
- {
-#ifdef __DEBUG_PM__
- printf("\n\nstart->useptr gvar->mm.mmhead->useptr\n");
- printf(" %Fp %Fp\n", start->useptr, gvar->mm.mmhead->useptr);
- printf("& %Fp %Fp\n", &(start->useptr), &(gvar->mm.mmhead->useptr));
- printf("baseptr gvar->mm.mmrover->useptr\n");
- printf(" %Fp %Fp\n", baseptr, gvar->mm.mmrover->useptr);
- printf("& %Fp %Fp\n", &(baseptr), &(gvar->mm.mmrover->useptr));
- printf("* %Fp %Fp\n", *(baseptr), *(gvar->mm.mmrover->useptr));
- printf("start gvar->mm.mmrover gvar->mm.mmrover->next\n");
- printf(" %Fp %Fp %Fp\n", start, gvar->mm.mmrover, gvar->mm.mmrover->next);
- printf("& %Fp %Fp %Fp\n", &start, &gvar->mm.mmrover, gvar->mm.mmrover->next);
- getch();
- MM_ShowMemory(gvar);
- MM_DumpData(gvar);
- MM_Report_(gvar);
- getch();
-#endif
- Quit("MM_SetPurge: Block not found!");
- return;
- }
+ else if (gvar->mm.mmrover == start)
+ Quit ("MM_SetPurge: Block not found!");
- } while(1);
+ } while (1);
gvar->mm.mmrover->attributes &= ~PURGEBITS;
gvar->mm.mmrover->attributes |= purge;
@@ -1127,27 +1186,23 @@ 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_SetLock (memptr *baseptr, boolean locked, global_game_variables_t *gvar)
{
- //huge mmblocktype huge *start;
mmblocktype far *start;
start = gvar->mm.mmrover;
do
{
- if(gvar->mm.mmrover->useptr == baseptr)
+ if (gvar->mm.mmrover->useptr == baseptr)
break;
gvar->mm.mmrover = gvar->mm.mmrover->next;
- if(!gvar->mm.mmrover)
+ if (!gvar->mm.mmrover)
gvar->mm.mmrover = gvar->mm.mmhead;
- else if(gvar->mm.mmrover == start)
- {
- Quit("MM_SetLock: Block not found!");
- //return;
- }
+ else if (gvar->mm.mmrover == start)
+ Quit ("MM_SetLock: Block not found!");
} while(1);
@@ -1167,12 +1222,11 @@ void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar)
=====================
*/
-void MM_SortMem(global_game_variables_t *gvar)
+void MM_SortMem (global_game_variables_t *gvar)
{
- //huge mmblocktype huge *scan,huge *last,huge *next;
mmblocktype far *scan,far *last,far *next;
unsigned start,length,source,dest,oldborder;
- int playing;
+ //++++int playing;
//
// lock down a currently playing sound
@@ -1189,24 +1243,24 @@ void MM_SortMem(global_game_variables_t *gvar)
playing += STARTADLIBSOUNDS;
break;
}
- MM_SetLock(&(memptr)audiosegs[playing],true);
+ MM_SetLock(MEMPTRCONV audiosegs[playing],true);
}
SD_StopSound();*/
-// oldborder = bordercolor;
-// VW_ColorBorder (15);
+ 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
@@ -1215,14 +1269,13 @@ void MM_SortMem(global_game_variables_t *gvar)
}
else
{
- if(scan->attributes & PURGEBITS)
+ if (scan->attributes & PURGEBITS)
{
//
// throw out the purgable block
//
next = scan->next;
- FREEBLOCK(scan);
- //MM_FreeBlock(scan, gvar);
+ FREEBLOCK(scan); //MM_FreeBlock(scan, gvar);
last->next = next;
scan = next;
continue;
@@ -1232,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;
@@ -1259,13 +1312,13 @@ void MM_SortMem(global_game_variables_t *gvar)
gvar->mm.mmrover = gvar->mm.mmhead;
- if(aftersort)
+ if (aftersort)
aftersort();
-// VW_ColorBorder (oldborder);
+ VL_ColorBorder (oldborder, &gvar->video);
/*++++ if(playing)
- MM_SetLock(&(memptr)audiosegs[playing],false);*/
+ MM_SetLock((memptr *)&audiosegs[playing],false);*/
}
//==========================================================================
@@ -1278,37 +1331,50 @@ void MM_SortMem(global_game_variables_t *gvar)
=====================
*/
-void MM_ShowMemory(global_game_variables_t *gvar)
+#ifdef __WATCOMC__
+//#define MMSMPANVID
+#define MMSMSCANINFO
+#endif
+
+void MM_ShowMemory (global_game_variables_t *gvar)
{
- //huge mmblocktype huge *scan;
mmblocktype far *scan;
- word temp;
+ unsigned color,temp,x,y ,w,q,width;
sdword end,owner;
- //word chx,chy;
- word w;
- //dword wwww;
- byte scratch[160],scratch0[4096],scratch1[160],str[16];
- //byte d = '#';
-//**** VW_SetDefaultColors();
-//**** VW_SetLineWidth(40);
-//++++mh temp = bufferofs;
-//++++mh bufferofs = 0;
-//**** VW_SetScreen (0,0);
+ byte scratch[160],scratch0[4096],str[16];
+ mmshowmemoryinfo_t scaninfo[MAXBLOCKS];
+
+ if(!gvar->video.page[0].width) gvar->video.page[0].sw = gvar->video.page[0].width = 320; //to prevent division by 0
+//-- VL_SetLineWidth(40, gvar);
+ //temp = gvar->video.ofs.bufferofs;
+ //gvar->video.ofs.bufferofs = gvar->video.ofs.displayofs;
+ temp = BDOFSCONV gvar->video.BOFS;
+ gvar->video.BOFS = gvar->video.DOFS;
scan = gvar->mm.mmhead;
- end = -1;
+
+ end = -1; w = 0;
+
+ width = gvar->video.page[0].width; q = 0;
CA_OpenDebug (gvar);
- w=0;
- while(scan)
+ while (scan)
{
+ scaninfo[q].scan = scan;
strcpy(scratch, AARESET);
if(scan->attributes & PURGEBITS)
+ {
+ color = 6; // dark purple = purgable
strcpy(scratch0, AAMAGENTA); // dark purple = purgable
- else
+ }else{
+ color = 2; // medium blue = non purgable
strcpy(scratch0, AABLUE); // medium blue = non purgable
+ }
if(scan->attributes & LOCKBIT)
+ {
+ color = 1; // red = locked
strcpy(scratch0, AARED); // red = locked
- if(scan->start<=end)
+ }
+ if (scan->start<=end)
{
printf("\nend==%d\n\n", end);
strcat(scratch, "MM_ShowMemory: Memory block order currupted!\n");
@@ -1319,50 +1385,41 @@ void MM_ShowMemory(global_game_variables_t *gvar)
ultoa (scan->start,str,10);
strcat (scratch,str);
write(gvar->handle.debughandle,scratch,strlen(scratch));
- //modexprint(&page, chx, chy, 1, 0, 24, "\nMM_ShowMemory: Memory block order currupted!\n");
- break;
+ Quit ("MM_ShowMemory: Memory block order currupted!");
}
- end = scan->start+(scan->length)-1;
-//++++ chy = scan->start/320;
-//++++ chx = scan->start%320;
- //modexhlin(page, scan->start, (unsigned)end, chy, color);
- //for(chx=scan->start;chx+4>=(word)end;chx+=4)
- //{
-//++++ modexClearRegion(page, chx, chy, 4, 4, color);
- //}
-//++++ VW_Hlin(scan->start,(unsigned)end,0,color);
+ end = scan->length-1;
+ y = scan->start/width;
+ x = scan->start%width;
+ scaninfo[q].x = x;
+ scaninfo[q].y = y;
+ VW_Hlin(x,x+end,y,color,gvar);
+ VL_Plot(x,y,5,gvar);
+//++==++==optional strcat(scratch0, AARESET); strcat(scratch0, AAGREY); strcat(scratch0,"_");
for(w=(scan->start)/80;w<=end/80;w++)
{
- //printf("+ %u %lu\n", w, scan->length);
+//printf("+ %u %lu\n", w, scan->length);
strcat(scratch0, "+");
}
- //++==++==optional strcat(scratch0, AARESET); strcat(scratch0, AAGREY); strcat(scratch0,"_");
-//++++ VW_Plot(scan->start,0,15);
-//++++ modexClearRegion(page, chx, chy, 4, 4, 15);
-//++++ VW_Hlin(end+1,scan->next->start,0,0); // black = free
-
- //wwww=(dword)(scan->next->start)-(dword)scan->start;
- //wwww=(dword)scan->start+(dword)(scan->next->start);
- if (scan->next && scan->next->start >= end+1)
+
+ if (scan->next && scan->next->start > end+1)
{
+ VW_Hlin(x+end+1,x+(scan->next->start-scan->start),y,3,gvar); // black = free//now green
strcat(scratch0, AARESET);
- //++==++==optional strcat(scratch0, "\n");
+//++==++==optional strcat(scratch0, "\n");
strcat(scratch0,AAGREEN);
for(w=(end+1)/80;w<=((scan->next->start-scan->start)/80);w++)
- //for(w=(wwww)/80;w<=((end+1)/80);w++)
- //for(w=(end+1)/80;w<=((wwww)/80);w++)
{
- //printf("0 %x %u %lu\n", scan->next->start, w, scan->length);
+//printf("0 %x %u %lu\n", scan->next->start, w, scan->length);
strcat(scratch0,"0");
}
//printf("==================\n");
- //printf("w=%u wwww=%lu start=%04x next=%04x end=%lu\n", w/80, wwww/80, scan->start, (scan->next->start), end+1);
+ //printf("w=%u start=%04x next=%04x end=%lu\n", w/80, scan->start, (scan->next->start), end+1);
//printf("==================\n");
strcat(scratch0, "\n");
- //getch();
- }/*else {//if(scan->next->start <= scan->start){
+ }
+#if 0
+ else {//if(scan->next->start <= scan->start){
scan->next->start=scan->start+0x1000;
- wwww=(dword)(scan->next->start)-(dword)scan->start;
strcat(scratch0, AARESET);
strcat(scratch0, "\n");
strcat(scratch0,AAGREEN);
@@ -1372,29 +1429,21 @@ void MM_ShowMemory(global_game_variables_t *gvar)
strcat(scratch0,"0");
}
printf("================\n");
- printf("w=%x start=%x next=%x end=%u %lu\n", w, scan->start, (scan->next->start), end+1, wwww);
+ printf("w=%x start=%x next=%x end=%u\n", w, scan->start, (scan->next->start), end+1);
printf("================\n");
getch();
- }*/
+ }
+#endif
strcat(scratch0, AARESET);
//strcat(scratch0,"\n");
- //for(chx=scan->next->start;chx+4>=(word)end+1;chx+=4)
- //{
-// chx+=scan->next->start;
-// modexClearRegion(page, chx, chy, 4, 4, 2);
- //}
- //modexhlin(page, end+1,scan->next->start, chy, 0);
-/* y = scan->start/320;
- x = scan->start%320;
- VW_Hlin(x,x+end,y,color);
- VW_Plot(x,y,15);*/
-//++++ VW_Hlin(x+end+1,x+(scan->next->start-scan->start),y,0); // black = free
strcat(scratch,"Seg:");
ultoa (scan->start,str,16);
strcat (scratch,str);
+// strcat(scratch, AABLACK); strcat(scratch,"\t"); strcat(scratch, AARESET);
strcat (scratch,"\tSize:");
ultoa ((unsigned)scan->length,str,10);
strcat (scratch,str);
+// strcat(scratch, AABLACK); strcat(scratch,"\t"); strcat(scratch, AARESET);
strcat (scratch,"\tOwner:0x");
owner = (unsigned)scan->useptr;
ultoa (owner,str,16);
@@ -1402,33 +1451,171 @@ void MM_ShowMemory(global_game_variables_t *gvar)
strcat (scratch,"\n");
write(gvar->handle.debughandle,scratch,strlen(scratch));
write(gvar->handle.debughandle,scratch0,strlen(scratch0));
-//modexprint(page, chx, chy, 1, 0, 24, &scratch);
-//++++chy+=4;
//fprintf(stdout, "%s", scratch);
scan = scan->next;
+ q++;
+//if(color!=6) IN_Ack(gvar);
}
- /*strcpy(scratch1, AARESET);
- strcat(scratch1, "========================================\n");
- strcat(scratch1, "near= ");
- ultoa (*(gvar->mm.nearheap),str,10);
- strcat (scratch1,str);
- strcat(scratch1, " far= ");
- ultoa (*(gvar->mm.farheap),str,10);
- strcat (scratch1,str);
- strcat(scratch1, "\n");
- //strcat(scratch1, "&near= %Fp ", &(gvar->mm.nearheap));
- //strcat(scratch1, "&far= %Fp", &(gvar->mm.farheap));
- //strcat(scratch1, "\n");
- strcat(scratch1, "========================================\n");
- write(gvar->handle.debughandle,scratch1,strlen(scratch1));*/
-
CA_CloseDebug (gvar);
-//++++mh IN_Ack();
-//**** VW_SetLineWidth(64);
-//++++mh bufferofs = temp;
+#ifdef MMSMPANVID
+ {
+ int dx,dy,odx,ody;
+ odx = gvar->video.page[0].dx;
+ ody = gvar->video.page[0].dy;
+ dx = dy = 0;
+ while(!gvar->in.inst->Keyboard[sc_Escape])
+ {
+ if(gvar->in.inst->Keyboard[sc_UpArrow])
+ {
+ if(dy>0)
+ dy--;
+ }
+ else if(gvar->in.inst->Keyboard[sc_DownArrow])
+ {
+ if(dyvideo.page[0].height-gvar->video.page[0].sh)
+ dy++;
+ }
+ if(gvar->in.inst->Keyboard[sc_LeftArrow])
+ {
+ if(dx>0)
+ dx--;
+ }
+ else if(gvar->in.inst->Keyboard[sc_RightArrow])
+ {
+ if(dxvideo.page[0].width-gvar->video.page[0].sw)
+ dx++;
+ }
+
+ modexPanPage(&gvar->video.page[0], dx, dy);
+ VL_ShowPage(&gvar->video.page[0], 1, 1);
+ }
+
+ gvar->video.page[0].dx = odx;
+ gvar->video.page[0].dy = ody;
+ }
+#endif
+#ifdef MMSMSCANINFO
+ {
+ byte scratch1[4];
+ unsigned maxq = q;
+ boolean done;
+ ScanCode scancode;
+ int xpos,ypos;
+ word qq, ccolor = 3;
+ IN_Ack(gvar);
+// VL_ClearVideo (8);
+ for (qq = 0,done = false;!done;)
+ {
+ if(scaninfo[qq].scan->attributes & PURGEBITS)
+ {
+ ccolor = 6; // dark purple = purgable
+ strcpy(scratch1, AAMAGENTA); // dark purple = purgable
+ //printf("%s", AAMAGENTA);
+ }else{
+ ccolor = 2; // medium blue = non purgable
+ strcpy(scratch1, AABLUE); // medium blue = non purgable
+ //printf("%s", AABLUE);
+ }
+ if(scaninfo[qq].scan->attributes & LOCKBIT)
+ {
+ ccolor = 1; // red = locked
+ strcpy(scratch1, AARED); // red = locked
+ //printf("%s", AARED);
+ }
+ end = scaninfo[qq].scan->length-1;
+/*typedef struct mmblockstruct{
+ word start,length;
+ unsigned attributes;
+ memptr *useptr; // pointer to the segment start
+ struct mmblockstruct far *next;
+} mmblocktype;*/
+ //modexprint(page, x, y, t, tlsw, color, bgcolor, vidsw, const byte *str);
+#define MMSMPRINTMEMINFO modexprint(&(gvar->video.page[0]), xpos, ypos, 1, 0, ccolor, 8, gvar->video.VL_Started, global_temp_status_text); ypos+=8;
+ if(!gvar->video.VL_Started) clrscr(); else
+ {
+ VL_ShowPage(&gvar->video.page[0], 1, 0);
+ modexClearRegion(&gvar->video.page[0], 0, 0, gvar->video.page[0].width, gvar->video.page[0].height, 8);
+ }
+ sprintf(global_temp_status_text, "block #%04u", qq); MMSMPRINTMEMINFO
+// sprintf(global_temp_status_text, "%Fp", scaninfo[qq].scan->useptr); MMSMPRINTMEMINFO
+ sprintf(global_temp_status_text, "%04x", (unsigned)scaninfo[qq].scan->useptr); MMSMPRINTMEMINFO
+ sprintf(global_temp_status_text, "size: %05u", (unsigned)scaninfo[qq].scan->length); MMSMPRINTMEMINFO
+ if (scaninfo[qq].scan->next && scaninfo[qq].scan->next->start > end+1)
+ {
+ sprintf(global_temp_status_text, "free: %05u", (unsigned)(scaninfo[qq].scan->next->start-scaninfo[qq].scan->start)); MMSMPRINTMEMINFO
+ }
+ if(gvar->video.VL_Started)
+ {
+ y = ypos;//scaninfo[qq].scan->start/width;
+ x = xpos;//scaninfo[qq].scan->start%width;
+ VW_Hlin(x,x+end,y,ccolor,gvar);
+ VL_Plot(x,y,5,gvar);
+ }
+ else
+ {
+ printf("%s", scratch1);
+ printf("%s", AAGREY); printf("_");
+ for(w=(scaninfo[qq].scan->start)/80;w<=end/80;w++)
+ {
+ //strcat(scratch1, "+");
+ printf("+");
+ }
+ }
+
+
+ if (scaninfo[qq].scan->next && scaninfo[qq].scan->next->start > end+1) if(!gvar->video.VL_Started)
+ {
+ //strcat(scratch1, AARESET);
+ printf("%s", AARESET);
+ //strcat(scratch1,AAGREEN);
+ printf("%s", AAGREEN);
+ for(w=(end+1)/80;w<=((scaninfo[qq].scan->next->start-scaninfo[qq].scan->start)/80);w++)
+ {
+ //strcat(scratch1,"0");
+ printf("0");
+ }
+ }else VW_Hlin(x+end+1,x+(scaninfo[qq].scan->next->start-scaninfo[qq].scan->start),y,3,gvar); // black = free//now green
+
+
+ if(gvar->video.VL_Started)
+ {
+ //if (scan->next && scan->next->start > end+1) free
+ xpos = 16;
+ ypos = 16;//(gvar->video.page[0].sh-(32));//8*4
+ }
+ else
+ {
+ //printf("%s\n", scratch1);
+ printf("%s", AARESET);
+ printf("\n");
+ }
+ while (!(scancode = gvar->in.inst->LastScan)){}
+
+ IN_ClearKey(scancode);
+ switch (scancode)
+ {
+ case sc_LeftArrow:
+ if(qq>0) qq--;
+ else qq = maxq;
+ break;
+ case sc_RightArrow:
+ if(qqvideo.VL_Started) IN_Ack(gvar);
+
+ gvar->video.BOFS = (byte __far *)temp;
}
//==========================================================================
@@ -1441,16 +1628,20 @@ void MM_ShowMemory(global_game_variables_t *gvar)
=====================
*/
-void MM_DumpData(global_game_variables_t *gvar)
+void MM_DumpData (global_game_variables_t *gvar)
{
- //huge mmblocktype huge *scan,huge *best;
mmblocktype far *scan,far *best;
long lowest,oldlowest;
- word owner;
- byte lock,purge;
+ unsigned owner;
+ char lock,purge;
FILE *dumpfile;
+#ifdef __WATCOMC__
+ _nfree(gvar->mm.nearheap);
+#endif
+#ifdef __BORLANDC__
free(gvar->mm.nearheap);
+#endif
#ifdef __BORLANDC__
dumpfile = fopen ("mmdump.16b","w");
#endif
@@ -1515,10 +1706,9 @@ void MM_DumpData(global_game_variables_t *gvar)
======================
*/
-dword MM_UnusedMemory(global_game_variables_t *gvar)
+dword MM_UnusedMemory (global_game_variables_t *gvar)
{
- dword free;
- //huge mmblocktype huge *scan;
+ unsigned free;
mmblocktype far *scan;
free = 0;
@@ -1531,7 +1721,6 @@ dword MM_UnusedMemory(global_game_variables_t *gvar)
}
return free*16lu;
-// return free;
}
//==========================================================================
@@ -1547,10 +1736,9 @@ dword MM_UnusedMemory(global_game_variables_t *gvar)
======================
*/
-dword MM_TotalFree(global_game_variables_t *gvar)
+dword MM_TotalFree (global_game_variables_t *gvar)
{
- dword free;
- //huge mmblocktype huge *scan;
+ unsigned free;
mmblocktype far *scan;
free = 0;
@@ -1565,7 +1753,6 @@ dword MM_TotalFree(global_game_variables_t *gvar)
}
return free*16lu;
-// return free;
}
//==========================================================================
@@ -1578,28 +1765,32 @@ dword MM_TotalFree(global_game_variables_t *gvar)
=====================
*/
-void MM_Report_(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);
}
//==========================================================================
@@ -1743,12 +1934,13 @@ void MM_EMSerr(byte *stri, byte err)
=====================
*/
-void MM_BombOnError(boolean bomb, global_game_variables_t *gvar)
+void MM_BombOnError (boolean bomb, global_game_variables_t *gvar)
{
gvar->mm.bombonerror = bomb;
}
-/*void MM_GetNewBlock(global_game_variables_t *gvar)
+#if 0
+void MM_GetNewBlock(global_game_variables_t *gvar)
{
if(!gvar->mm.mmfree)
MML_ClearBlock(gvar);
@@ -1767,15 +1959,15 @@ void MM_FreeBlock(mmblocktype *x, global_game_variables_t *gvar)
x->useptr=NULL;
x->next=gvar->mm.mmfree;
gvar->mm.mmfree=x;
-}*/
+}
+#endif
-void XMS_CALL(byte v, global_game_variables_t *gvar)
+void xms_call(byte v, global_game_variables_t *gvar)
{
- XMSD;
- //XMSDriver=gvar->pm.xmm.XMSDriver;
+ dword XMSDriver = gvar->pm.xmm.XMSDriver;
__asm {
- mov v,ah
- call [WORD PTR XMSDriver]
+ mov ah,[v]
+ call [DWORD PTR XMSDriver]
}
}