mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-26 08:41:47 -07:00
Code Issues Projects Releases Wiki Activity

Clarify the logic in cbsinsertintotree to match cbsdeletefromtree.

Browse source 
Copied from Perforce
 Change: 182344
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Gareth Rees 2013-05-30 20:09:01 +01:00
parent 467c38a37a
commit fcc50ead4c
1 changed files with 25 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

61
mps/code/cbs.c
View file

@ -432,7 +432,7 @@ static Res cbsInsertIntoTree(Addr *baseReturn, Addr *limitReturn,
rightMerge = FALSE;
} else {
rightCBS = cbsBlockOfSplayNode(rightSplay);
if (rightCBS != NULL && limit > rightCBS->base) {
if (rightCBS != NULL && limit > CBSBlockLimit(rightCBS)) {
res = ResFAIL;
goto fail;
}
@ -442,40 +442,29 @@ static Res cbsInsertIntoTree(Addr *baseReturn, Addr *limitReturn,
newBase = leftMerge ? CBSBlockBase(leftCBS) : base;
newLimit = rightMerge ? CBSBlockLimit(rightCBS) : limit;
if (leftMerge) {
if (rightMerge) {
Size oldLeftSize = CBSBlockSize(leftCBS);
Size oldRightSize = CBSBlockSize(rightCBS);
if (leftMerge && rightMerge) {
Size oldLeftSize = CBSBlockSize(leftCBS);
Addr rightLimit = CBSBlockLimit(rightCBS);
cbsBlockDelete(cbs, rightCBS);
leftCBS->limit = rightLimit;
cbsBlockGrew(cbs, leftCBS, oldLeftSize);
/* must block larger neighbour and destroy smaller neighbour */
if (oldLeftSize >= oldRightSize) {
Addr rightLimit = rightCBS->limit;
cbsBlockDelete(cbs, rightCBS);
leftCBS->limit = rightLimit;
cbsBlockGrew(cbs, leftCBS, oldLeftSize);
} else { /* left block is smaller */
Addr leftBase = leftCBS->base;
cbsBlockDelete(cbs, leftCBS);
rightCBS->base = leftBase;
cbsBlockGrew(cbs, rightCBS, oldRightSize);
}
} else { /* leftMerge, !rightMerge */
oldSize = CBSBlockSize(leftCBS);
leftCBS->limit = limit;
cbsBlockGrew(cbs, leftCBS, oldSize);
}
} else { /* !leftMerge */
if (rightMerge) {
oldSize = CBSBlockSize(rightCBS);
rightCBS->base = base;
cbsBlockGrew(cbs, rightCBS, oldSize);
} else { /* !leftMerge, !rightMerge */
CBSBlock block;
res = cbsBlockAlloc(&block, cbs, base, limit);
if (res != ResOK)
goto fail;
cbsBlockInsert(cbs, block);
}
} else if (leftMerge) {
oldSize = CBSBlockSize(leftCBS);
leftCBS->limit = limit;
cbsBlockGrew(cbs, leftCBS, oldSize);
} else if (rightMerge) {
oldSize = CBSBlockSize(rightCBS);
rightCBS->base = base;
cbsBlockGrew(cbs, rightCBS, oldSize);
} else {
CBSBlock block;
res = cbsBlockAlloc(&block, cbs, base, limit);
if (res != ResOK)
goto fail;
cbsBlockInsert(cbs, block);
}
AVER(newBase <= base);
@ -556,9 +545,7 @@ static Res cbsDeleteFromTree(Addr *baseReturn, Addr *limitReturn,
}
oldBase = cbsBlock->base;
*baseReturn = cbsBlock->base;
oldLimit = cbsBlock->limit;
*limitReturn = cbsBlock->limit;
oldSize = CBSBlockSize(cbsBlock);
if (base == oldBase && limit == oldLimit) {
@ -592,6 +579,8 @@ static Res cbsDeleteFromTree(Addr *baseReturn, Addr *limitReturn,
cbsBlockInsert(cbs, newBlock);
}
*baseReturn = oldBase;
*limitReturn = oldLimit;
return ResOK;
failAlloc: