From c8fed5bb8d50f626bd1efa3876baa9c39d7ed9be Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Thu, 11 Feb 2016 20:39:57 +0000 Subject: [PATCH] Renaming tracescanareamasked to tracescanareatagged Copied from Perforce Change: 189133 ServerID: perforce.ravenbrook.com --- mps/code/mpm.h | 2 +- mps/code/prmci3fr.c | 2 +- mps/code/prmci3li.c | 2 +- mps/code/prmci3xc.c | 2 +- mps/code/prmci6fr.c | 2 +- mps/code/prmci6li.c | 2 +- mps/code/prmci6xc.c | 2 +- mps/code/root.c | 2 +- mps/code/ss.c | 6 +++--- mps/code/thix.c | 2 +- mps/code/thw3i3.c | 4 ++-- mps/code/thw3i6.c | 4 ++-- mps/code/thxc.c | 2 +- mps/code/trace.c | 4 ++-- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/mps/code/mpm.h b/mps/code/mpm.h index ddb32ea189a..565641f8cdf 100644 --- a/mps/code/mpm.h +++ b/mps/code/mpm.h @@ -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); diff --git a/mps/code/prmci3fr.c b/mps/code/prmci3fr.c index 2625559564c..10a84bd3621 100644 --- a/mps/code/prmci3fr.c +++ b/mps/code/prmci3fr.c @@ -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))), diff --git a/mps/code/prmci3li.c b/mps/code/prmci3li.c index 7f6400943f1..bac5362cfbe 100644 --- a/mps/code/prmci3li.c +++ b/mps/code/prmci3li.c @@ -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); diff --git a/mps/code/prmci3xc.c b/mps/code/prmci3xc.c index 036550ae3e0..ec9bd88e937 100644 --- a/mps/code/prmci3xc.c +++ b/mps/code/prmci3xc.c @@ -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); diff --git a/mps/code/prmci6fr.c b/mps/code/prmci6fr.c index debc9c760bf..8a36d3156dd 100644 --- a/mps/code/prmci6fr.c +++ b/mps/code/prmci6fr.c @@ -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))), diff --git a/mps/code/prmci6li.c b/mps/code/prmci6li.c index 304cfdc38d3..6a9379209f9 100644 --- a/mps/code/prmci6li.c +++ b/mps/code/prmci6li.c @@ -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); diff --git a/mps/code/prmci6xc.c b/mps/code/prmci6xc.c index 61e57728473..9a67028a6bd 100644 --- a/mps/code/prmci6xc.c +++ b/mps/code/prmci6xc.c @@ -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); diff --git a/mps/code/root.c b/mps/code/root.c index e278eb05d90..8a0f73e1561 100644 --- a/mps/code/root.c +++ b/mps/code/root.c @@ -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, diff --git a/mps/code/ss.c b/mps/code/ss.c index 7078c59d204..f5400f92e90 100644 --- a/mps/code/ss.c +++ b/mps/code/ss.c @@ -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; } diff --git a/mps/code/thix.c b/mps/code/thix.c index c8f3d6ca52a..cb7877223fa 100644 --- a/mps/code/thix.c +++ b/mps/code/thix.c @@ -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; diff --git a/mps/code/thw3i3.c b/mps/code/thw3i3.c index 997ff2986f2..d1b632daced 100644 --- a/mps/code/thw3i3.c +++ b/mps/code/thw3i3.c @@ -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) diff --git a/mps/code/thw3i6.c b/mps/code/thw3i6.c index cc11805eb41..3f5622a0ca0 100644 --- a/mps/code/thw3i6.c +++ b/mps/code/thw3i6.c @@ -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) diff --git a/mps/code/thxc.c b/mps/code/thxc.c index 05d49e0f913..3deac41ff3a 100644 --- a/mps/code/thxc.c +++ b/mps/code/thxc.c @@ -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; diff --git a/mps/code/trace.c b/mps/code/trace.c index 8dcc6a2643b..a396508d086 100644 --- a/mps/code/trace.c +++ b/mps/code/trace.c @@ -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;