mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 04:30:45 -08:00
Code Issues Projects Releases Wiki Activity

Mps master: poolamc.c amcfix, amcheaderfix: (comment only) tag

Browse source 
with ".exposed.seg" statements that require that "seg" (that is: 
the 'from' seg) has been ShieldExposed.  (Preparatory to fixing 
job001706).

Copied from Perforce
 Change: 163170
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Richard Kistruck 2007-08-23 17:28:16 +01:00
parent ff8ab008ca
commit ffc4f125c9
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
mps/code/poolamc.c
View file

@ -1656,9 +1656,11 @@ Res AMCFix(Pool pool, ScanState ss, Seg seg, Ref *refIO)
AVER_CRITICAL(ref < SegLimit(seg));
arena = pool->arena;
/* .exposed.seg: statements tagged ".exposed.seg" below require */
/* that "seg" (that is: the 'from' seg) has been ShieldExposed. */
ShieldExpose(arena, seg);
newRef = (*format->isMoved)(ref);
ShieldCover(arena, seg);
newRef = (*format->isMoved)(ref); /* .exposed.seg */
ShieldCover(arena, seg); /* .exposed.seg */
if(newRef == (Addr)0) {
/* If object is nailed already then we mustn't copy it: */
@ -1690,7 +1692,7 @@ Res AMCFix(Pool pool, ScanState ss, Seg seg, Ref *refIO)
buffer = gen->forward;
AVER_CRITICAL(buffer != NULL);
length = AddrOffset(ref, (*format->skip)(ref));
length = AddrOffset(ref, (*format->skip)(ref)); /* .exposed.seg */
STATISTIC_STAT(++ss->forwardedCount);
ss->forwardedSize += length;
do {
@ -1716,14 +1718,14 @@ Res AMCFix(Pool pool, ScanState ss, Seg seg, Ref *refIO)
}
/* <design/trace/#fix.copy> */
(void)AddrCopy(newRef, ref, length);
(void)AddrCopy(newRef, ref, length); /* .exposed.seg */
ShieldCover(arena, toSeg);
} while(!BUFFER_COMMIT(buffer, newRef, length));
ss->copiedSize += length;
ShieldExpose(arena, seg);
(*format->move)(ref, newRef);
(*format->move)(ref, newRef); /* .exposed.seg */
ShieldCover(arena, seg);
} else {
/* reference to broken heart (which should be snapped out -- */
@ -1807,9 +1809,11 @@ static Res AMCHeaderFix(Pool pool, ScanState ss, Seg seg, Ref *refIO)
AVER_CRITICAL(ref < SegLimit(seg)); /* see .ref-limit */
arena = pool->arena;
/* .exposed.seg: statements tagged ".exposed.seg" below require */
/* that "seg" (that is: the 'from' seg) has been ShieldExposed. */
ShieldExpose(arena, seg);
newRef = (*format->isMoved)(ref);
ShieldCover(arena, seg);
newRef = (*format->isMoved)(ref); /* .exposed.seg */
ShieldCover(arena, seg); /* .exposed.seg */
if(newRef == (Addr)0) {
/* If object is nailed already then we mustn't copy it: */
@ -1840,7 +1844,7 @@ static Res AMCHeaderFix(Pool pool, ScanState ss, Seg seg, Ref *refIO)
buffer = gen->forward;
AVER_CRITICAL(buffer != NULL);
length = AddrOffset(ref, (*format->skip)(ref));
length = AddrOffset(ref, (*format->skip)(ref)); /* .exposed.seg */
STATISTIC_STAT(++ss->forwardedCount);
ss->forwardedSize += length;
do {
@ -1867,14 +1871,14 @@ static Res AMCHeaderFix(Pool pool, ScanState ss, Seg seg, Ref *refIO)
SegSetSummary(toSeg, RefSetUnion(toSummary, summary));
/* <design/trace/#fix.copy> */
(void)AddrCopy(newBase, AddrSub(ref, headerSize), length);
(void)AddrCopy(newBase, AddrSub(ref, headerSize), length); /* .exposed.seg */
ShieldCover(arena, toSeg);
} while (!BUFFER_COMMIT(buffer, newBase, length));
ss->copiedSize += length;
ShieldExpose(arena, seg);
(*format->move)(ref, newRef);
(*format->move)(ref, newRef); /* .exposed.seg */
ShieldCover(arena, seg);
} else {
/* reference to broken heart (which should be snapped out -- */