tyler.durden/kernel
1
0
Fork 0
mirror of https://github.com/FDOS/kernel.git synced 2025-07-22 21:34:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed LoadHigh probllem

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@63 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Jim Tabor 2000-08-07 04:48:50 +00:00
parent 2bc370718d
commit bf28027f7e
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
kernel/memmgr.c
View File

@ -35,6 +35,9 @@ static BYTE *memmgrRcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.6 2000/08/07 04:48:50 jimtabor
* Fixed LoadHigh probllem
*
* Revision 1.5 2000/08/06 05:50:17 jimtabor * Revision 1.5 2000/08/06 05:50:17 jimtabor
* Add new files and update cvs with patches and changes * Add new files and update cvs with patches and changes
* *
@ -192,8 +195,10 @@ COUNT DosMemAlloc(UWORD size, COUNT mode, seg FAR * para, UWORD FAR * asize)
biggestSeg = foundSeg = NULL; biggestSeg = foundSeg = NULL;
if((mode & (FIRST_FIT_UO | FIRST_FIT_U)) && uppermem_link) { if((mode & (FIRST_FIT_UO | FIRST_FIT_U)) && uppermem_link) {
if(uppermem_root) if(uppermem_root) {
printf("Upper Mem Allocate\n");
p = para2far(uppermem_root); p = para2far(uppermem_root);
}
} }
@ -271,8 +276,7 @@ stopIt: /* reached from FIRST_FIT on match */
/* foundSeg := pointer to allocated block /* foundSeg := pointer to allocated block
p := pointer to MCB that will form the rest of the block p := pointer to MCB that will form the rest of the block
*/ */
if ( if ((mode == LAST_FIT)||(mode == LAST_FIT_UO)||(mode == LAST_FIT_U))
(mode == LAST_FIT)||(mode == LAST_FIT_UO)||(mode == LAST_FIT_U))
{ {
/* allocate the block from the end of the found block */ /* allocate the block from the end of the found block */
p = foundSeg; p = foundSeg;
@ -609,24 +613,26 @@ VOID DosUmbLink(BYTE n)
if(uppermem_root){ if(uppermem_root){
q = p = para2far(first_mcb); q = p = para2far(first_mcb);
/* like a xor thing! */
if(uppermem_link){ if((uppermem_link == 1) && (n == 0))
{
while ( p != (mcb FAR *) para2far(0x9fff) ) while ( p != (mcb FAR *) para2far(0x9fff) )
{ {
if (mcbFree(p))
joinMCBs(p);
if (!mcbValid(p)) if (!mcbValid(p))
goto DUL_exit; goto DUL_exit;
q = p; q = p;
p = nxtMCB(p); p = nxtMCB(p);
} }
printf("M end at 0x%04x:0x%04x\n", FP_SEG(q), FP_OFF(q));
if(q->m_type == MCB_NORMAL) if(q->m_type == MCB_NORMAL)
q->m_type = MCB_LAST; q->m_type = MCB_LAST;
uppermem_link = n;
} }
else else
if((uppermem_link == 0) && (n == 1))
{ {
while( q->m_type != MCB_LAST) while( q->m_type != MCB_LAST)
{ {
@ -635,12 +641,10 @@ VOID DosUmbLink(BYTE n)
q = nxtMCB(q); q = nxtMCB(q);
} }
printf("Z end at 0x%04x:0x%04x\n", FP_SEG(q), FP_OFF(q));
if(q->m_type == MCB_LAST) if(q->m_type == MCB_LAST)
q->m_type = MCB_NORMAL; q->m_type = MCB_NORMAL;
uppermem_link = n;
} }
uppermem_link = n;
} }
DUL_exit: DUL_exit:
return; return;