mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-17 01:34:21 +00:00
Renaming tracescanareamasked to tracescanareatagged
Copied from Perforce Change: 189133 ServerID: perforce.ravenbrook.com
This commit is contained in:
parent
48c5cac4be
commit
c8fed5bb8d
14 changed files with 19 additions and 19 deletions
|
|
@ -474,7 +474,7 @@ extern double TraceWorkFactor;
|
|||
END
|
||||
|
||||
extern Res TraceScanArea(ScanState ss, Word *base, Word *limit);
|
||||
extern Res TraceScanAreaMasked(ScanState ss, Word *base, Word *limit,
|
||||
extern Res TraceScanAreaTagged(ScanState ss, Word *base, Word *limit,
|
||||
Word mask, Word value);
|
||||
extern void TraceScanSingleRef(TraceSet ts, Rank rank, Arena arena,
|
||||
Seg seg, Ref *refIO);
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ Res MutatorFaultContextScan(ScanState ss, MutatorFaultContext mfc,
|
|||
/* This scans the root registers (.context.regroots). It also unnecessarily
|
||||
scans the rest of the context. The optimisation to scan only relevant
|
||||
parts would be machine dependent. */
|
||||
res = TraceScanAreaMasked(
|
||||
res = TraceScanAreaTagged(
|
||||
ss,
|
||||
(Word *)mfc->ucontext,
|
||||
(Word *)((char *)mfc->ucontext + sizeof(*(mfc->ucontext))),
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ Res MutatorFaultContextScan(ScanState ss, MutatorFaultContext mfc,
|
|||
unnecessarily scans the rest of the context. The optimisation
|
||||
to scan only relevant parts would be machine dependent. */
|
||||
mc = &mfc->ucontext->uc_mcontext;
|
||||
res = TraceScanAreaMasked(ss,
|
||||
res = TraceScanAreaTagged(ss,
|
||||
(Word *)mc,
|
||||
(Word *)((char *)mc + sizeof(*mc)),
|
||||
mask, pattern);
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ Res MutatorFaultContextScan(ScanState ss, MutatorFaultContext mfc,
|
|||
unnecessarily scans the rest of the context. The optimisation
|
||||
to scan only relevant parts would be machine dependent. */
|
||||
mc = mfc->threadState;
|
||||
res = TraceScanAreaMasked(ss,
|
||||
res = TraceScanAreaTagged(ss,
|
||||
(Word *)mc,
|
||||
(Word *)((char *)mc + sizeof(*mc)),
|
||||
mask, pattern);
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ Res MutatorFaultContextScan(ScanState ss, MutatorFaultContext mfc,
|
|||
/* This scans the root registers (.context.regroots). It also unnecessarily
|
||||
scans the rest of the context. The optimisation to scan only relevant
|
||||
parts would be machine dependent. */
|
||||
res = TraceScanAreaMasked(
|
||||
res = TraceScanAreaTagged(
|
||||
ss,
|
||||
(Word *)mfc->ucontext,
|
||||
(Word *)((char *)mfc->ucontext + sizeof(*(mfc->ucontext))),
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ Res MutatorFaultContextScan(ScanState ss, MutatorFaultContext mfc,
|
|||
unnecessarily scans the rest of the context. The optimisation
|
||||
to scan only relevant parts would be machine dependent. */
|
||||
mc = &mfc->ucontext->uc_mcontext;
|
||||
res = TraceScanAreaMasked(ss,
|
||||
res = TraceScanAreaTagged(ss,
|
||||
(Word *)mc,
|
||||
(Word *)((char *)mc + sizeof(*mc)),
|
||||
mask, pattern);
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ Res MutatorFaultContextScan(ScanState ss, MutatorFaultContext mfc,
|
|||
unnecessarily scans the rest of the context. The optimisation
|
||||
to scan only relevant parts would be machine dependent. */
|
||||
mc = mfc->threadState;
|
||||
res = TraceScanAreaMasked(ss,
|
||||
res = TraceScanAreaTagged(ss,
|
||||
(Word *)mc,
|
||||
(Word *)((char *)mc + sizeof(*mc)),
|
||||
mask, pattern);
|
||||
|
|
|
|||
|
|
@ -516,7 +516,7 @@ Res RootScan(ScanState ss, Root root)
|
|||
break;
|
||||
|
||||
case RootTABLE_MASKED:
|
||||
res = TraceScanAreaMasked(ss,
|
||||
res = TraceScanAreaTagged(ss,
|
||||
root->the.tableMasked.base,
|
||||
root->the.tableMasked.limit,
|
||||
root->the.tableMasked.mask,
|
||||
|
|
|
|||
|
|
@ -47,16 +47,16 @@ Res StackScanInner(ScanState ss, Word *stackBot, Word *stackTop,
|
|||
if (arena->stackAtArenaEnter != NULL) {
|
||||
AVER(stackTop < arena->stackAtArenaEnter);
|
||||
AVER(arena->stackAtArenaEnter < stackBot);
|
||||
res = TraceScanAreaMasked(ss, stackTop, stackTop + nSavedRegs,
|
||||
res = TraceScanAreaTagged(ss, stackTop, stackTop + nSavedRegs,
|
||||
mask, pattern);
|
||||
if (res != ResOK)
|
||||
return res;
|
||||
res = TraceScanAreaMasked(ss, arena->stackAtArenaEnter, stackBot,
|
||||
res = TraceScanAreaTagged(ss, arena->stackAtArenaEnter, stackBot,
|
||||
mask, pattern);
|
||||
if (res != ResOK)
|
||||
return res;
|
||||
} else {
|
||||
res = TraceScanAreaMasked(ss, stackTop, stackBot, mask, pattern);
|
||||
res = TraceScanAreaTagged(ss, stackTop, stackBot, mask, pattern);
|
||||
if (res != ResOK)
|
||||
return res;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -271,7 +271,7 @@ Res ThreadScan(ScanState ss, Thread thread, Word *stackBot,
|
|||
/* scan stack inclusive of current sp and exclusive of
|
||||
* stackBot (.stack.full-descend)
|
||||
*/
|
||||
res = TraceScanAreaMasked(ss, stackBase, stackLimit, mask, pattern);
|
||||
res = TraceScanAreaTagged(ss, stackBase, stackLimit, mask, pattern);
|
||||
if(res != ResOK)
|
||||
return res;
|
||||
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ Res ThreadScan(ScanState ss, Thread thread, Word *stackBot,
|
|||
/* scan stack inclusive of current sp and exclusive of
|
||||
* stackBot (.stack.full-descend)
|
||||
*/
|
||||
res = TraceScanAreaMasked(ss, stackBase, stackLimit, mask, pattern);
|
||||
res = TraceScanAreaTagged(ss, stackBase, stackLimit, mask, pattern);
|
||||
if(res != ResOK)
|
||||
return res;
|
||||
|
||||
|
|
@ -114,7 +114,7 @@ Res ThreadScan(ScanState ss, Thread thread, Word *stackBot,
|
|||
* unnecessarily scans the rest of the context. The optimisation
|
||||
* to scan only relevant parts would be machine dependent.
|
||||
*/
|
||||
res = TraceScanAreaMasked(ss, (Word *)&context,
|
||||
res = TraceScanAreaTagged(ss, (Word *)&context,
|
||||
(Word *)((char *)&context + sizeof(CONTEXT)),
|
||||
mask, pattern);
|
||||
if(res != ResOK)
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ Res ThreadScan(ScanState ss, Thread thread, Word *stackBot,
|
|||
/* scan stack inclusive of current sp and exclusive of
|
||||
* stackBot (.stack.full-descend)
|
||||
*/
|
||||
res = TraceScanAreaMasked(ss, stackBase, stackLimit, mask, pattern);
|
||||
res = TraceScanAreaTagged(ss, stackBase, stackLimit, mask, pattern);
|
||||
if(res != ResOK)
|
||||
return res;
|
||||
|
||||
|
|
@ -114,7 +114,7 @@ Res ThreadScan(ScanState ss, Thread thread, Word *stackBot,
|
|||
* unnecessarily scans the rest of the context. The optimisation
|
||||
* to scan only relevant parts would be machine dependent.
|
||||
*/
|
||||
res = TraceScanAreaMasked(ss, (Word *)&context,
|
||||
res = TraceScanAreaTagged(ss, (Word *)&context,
|
||||
(Word *)((char *)&context + sizeof(CONTEXT)),
|
||||
mask, pattern);
|
||||
if(res != ResOK)
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ Res ThreadScan(ScanState ss, Thread thread, Word *stackBot,
|
|||
/* scan stack inclusive of current sp and exclusive of
|
||||
* stackBot (.stack.full-descend)
|
||||
*/
|
||||
res = TraceScanAreaMasked(ss, stackBase, stackLimit, mask, pattern);
|
||||
res = TraceScanAreaTagged(ss, stackBase, stackLimit, mask, pattern);
|
||||
if(res != ResOK)
|
||||
return res;
|
||||
|
||||
|
|
|
|||
|
|
@ -1457,7 +1457,7 @@ Res TraceScanArea(ScanState ss, Word *base, Word *limit)
|
|||
}
|
||||
|
||||
|
||||
/* TraceScanAreaMasked -- scan contiguous area of filtered references
|
||||
/* TraceScanAreaTagged -- scan contiguous area of tagged references
|
||||
*
|
||||
* This is as TraceScanArea except words are only fixed if they have
|
||||
* the given value when masked with a mask.
|
||||
|
|
@ -1467,7 +1467,7 @@ Res TraceScanArea(ScanState ss, Word *base, Word *limit)
|
|||
*/
|
||||
|
||||
ATTRIBUTE_NO_SANITIZE_ADDRESS
|
||||
Res TraceScanAreaMasked(ScanState ss, Word *base, Word *limit, Word mask,
|
||||
Res TraceScanAreaTagged(ScanState ss, Word *base, Word *limit, Word mask,
|
||||
Word pattern)
|
||||
{
|
||||
Res res;
|
||||
|
|
|
|||
Loading…
Reference in a new issue