[llvm-commits] [llvm] r56192 - in /llvm/branches/ggreif/use-diet: include/llvm/Use.h lib/VMCore/getValue.cpp
Gabor Greif
ggreif at gmail.com
Sat Sep 13 15:06:23 PDT 2008
Author: ggreif
Date: Sat Sep 13 17:06:22 2008
New Revision: 56192
URL: http://llvm.org/viewvc/llvm-project?rev=56192&view=rev
Log:
minor cleanup: use tagMask(N) consistently
Modified:
llvm/branches/ggreif/use-diet/include/llvm/Use.h
llvm/branches/ggreif/use-diet/lib/VMCore/getValue.cpp
Modified: llvm/branches/ggreif/use-diet/include/llvm/Use.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/include/llvm/Use.h?rev=56192&r1=56191&r2=56192&view=diff
==============================================================================
--- llvm/branches/ggreif/use-diet/include/llvm/Use.h (original)
+++ llvm/branches/ggreif/use-diet/include/llvm/Use.h Sat Sep 13 17:06:22 2008
@@ -134,13 +134,15 @@
Value *operator->() { return get(); }
const Value *operator->() const { return get(); }
- Use *getNext() const { return extractTag<NextPtrTag, fullStopTagN>(Next) == fullStopTagN ? 0 : stripTag<fullStopTagN>(Next); }
+ Use *getNext() const { return extractTag<NextPtrTag, tagMaskN>(Next) == fullStopTagN
+ ? 0
+ : stripTag<tagMaskN>(Next); }
private:
Value *Val1;
Use *Next, **Prev;
void setPrev(Use **NewPrev) {
- Prev = transferTag<fullStopTag>(Prev, NewPrev);
+ Prev = transferTag<tagMask>(Prev, NewPrev);
}
void addToList(Use **List) {
Next = *List;
@@ -150,7 +152,7 @@
*List = this;
}
void removeFromList() {
- Use **StrippedPrev = stripTag<fullStopTag>(Prev);
+ Use **StrippedPrev = stripTag<tagMask>(Prev);
*StrippedPrev = Next;
if (Next) Next->setPrev(StrippedPrev);
}
@@ -201,7 +203,7 @@
}
/// atEnd - return true if this iterator is equal to use_end() on the value.
- bool atEnd() const { return !U/*extractTag<Use::NextPtrTag, Use::tagMaskN>(U) == Use::fullStopTagN*/; }
+ bool atEnd() const { return !U; }
// Iterator traversal: forward iteration only
_Self &operator++() { // Preincrement
@@ -231,7 +233,7 @@
Value *Use::getFastValueMaybe() const {
if (fullStopTagN == extractTag<NextPtrTag, tagMaskN>(Next)) {
- return reinterpret_cast<Value*>(stripTag<fullStopTagN>(Next));
+ return reinterpret_cast<Value*>(stripTag<tagMaskN>(Next));
}
return 0;
}
Modified: llvm/branches/ggreif/use-diet/lib/VMCore/getValue.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/VMCore/getValue.cpp?rev=56192&r1=56191&r2=56192&view=diff
==============================================================================
--- llvm/branches/ggreif/use-diet/lib/VMCore/getValue.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/VMCore/getValue.cpp Sat Sep 13 17:06:22 2008
@@ -29,13 +29,13 @@
///
static inline void repaintByCopying(Use *Tagspace, Use *Junk) {
for (int I = requiredSteps; I; --I) {
- Use *Next = stripTag<Use::fullStopTagN>(Junk->Next);
- Junk->Next = transferTag<Use::fullStopTagN>(Tagspace->Next, Next);
- Tagspace = stripTag<Use::fullStopTagN>(Tagspace->Next);
+ Use *Next = stripTag<Use::tagMaskN>(Junk->Next);
+ Junk->Next = transferTag<Use::tagMaskN>(Tagspace->Next, Next);
+ Tagspace = stripTag<Use::tagMaskN>(Tagspace->Next);
Junk = Next;
}
- assert((extractTag<Use::NextPtrTag, Use::fullStopTagN>(Junk->Next) == Use::stopTagN)
+ assert((extractTag<Use::NextPtrTag, Use::tagMaskN>(Junk->Next) == Use::stopTagN)
&& "Why repaint by copying if the next is not Stop?");
}
@@ -48,12 +48,12 @@
for (int I = requiredSteps - 1; I >= 0; --I) {
Use::NextPtrTag Tag(Tags & (1 << I) ? Use::oneDigitTagN : Use::zeroDigitTagN);
- Use *Next = stripTag<Use::fullStopTagN>(Junk->Next);
- Junk->Next = transferTag<Use::fullStopTagN>(reinterpret_cast<Use*>(Tag), Next);
+ Use *Next = stripTag<Use::tagMaskN>(Junk->Next);
+ Junk->Next = transferTag<Use::tagMaskN>(reinterpret_cast<Use*>(Tag), Next);
Junk = Next;
}
- assert((extractTag<Use::NextPtrTag, Use::fullStopTagN>(Junk->Next) == Use::fullStopTagN)
+ assert((extractTag<Use::NextPtrTag, Use::tagMaskN>(Junk->Next) == Use::fullStopTagN)
&& "Why repaint by calculating if the next is not FullStop?");
}
@@ -62,7 +62,7 @@
///
static inline void punchAwayDigits(Use *PrevU) {
if (PrevU)
- PrevU->Next = stripTag<Use::fullStopTagN>(PrevU->Next);
+ PrevU->Next = stripTag<Use::tagMaskN>(PrevU->Next);
}
@@ -79,8 +79,8 @@
Use *Next(U->Next);
// __builtin_prefetch(Next);
- Use::NextPtrTag Tag(extractTag<Use::NextPtrTag, Use::fullStopTagN>(Next));
- Next = stripTag<Use::fullStopTagN>(Next);
+ Use::NextPtrTag Tag(extractTag<Use::NextPtrTag, Use::tagMaskN>(Next));
+ Next = stripTag<Use::tagMaskN>(Next);
// try to pick up exactly requiredSteps digits
// from immediately behind the (precondition) stop
@@ -102,8 +102,8 @@
Next = Next->Next;
// __builtin_prefetch(Next);
--Cushion;
- Tag = extractTag<Use::NextPtrTag, Use::fullStopTagN>(Next);
- Next = stripTag<Use::fullStopTagN>(Next);
+ Tag = extractTag<Use::NextPtrTag, Use::tagMaskN>(Next);
+ Next = stripTag<Use::tagMaskN>(Next);
*/
break;
}
@@ -112,8 +112,8 @@
Next = Next->Next;
// __builtin_prefetch(Next);
--Cushion;
- Tag = extractTag<Use::NextPtrTag, Use::fullStopTagN>(Next);
- Next = stripTag<Use::fullStopTagN>(Next);
+ Tag = extractTag<Use::NextPtrTag, Use::tagMaskN>(Next);
+ Next = stripTag<Use::tagMaskN>(Next);
continue;
}
break;
@@ -142,8 +142,8 @@
Next = Next->Next;
// __builtin_prefetch(Next);
--Cushion;
- Tag = extractTag<Use::NextPtrTag, Use::fullStopTagN>(Next);
- Next = stripTag<Use::fullStopTagN>(Next);
+ Tag = extractTag<Use::NextPtrTag, Use::tagMaskN>(Next);
+ Next = stripTag<Use::tagMaskN>(Next);
switch (Tag) {
case Use::fullStopTagN:
if (Cushion <= 0) {
@@ -154,7 +154,7 @@
case Use::stopTagN: {
if (Cushion <= 0) {
PrevU = U;
- U = stripTag<Use::fullStopTagN>(U->Next);
+ U = stripTag<Use::tagMaskN>(U->Next);
}
break;
}
@@ -171,8 +171,8 @@
Next = Next->Next;
// __builtin_prefetch(Next);
--Cushion;
- Tag = extractTag<Use::NextPtrTag, Use::fullStopTagN>(Next);
- Next = stripTag<Use::fullStopTagN>(Next);
+ Tag = extractTag<Use::NextPtrTag, Use::tagMaskN>(Next);
+ Next = stripTag<Use::tagMaskN>(Next);
} // switch
} // while
@@ -205,11 +205,11 @@
Next = Next->Next;
// __builtin_prefetch(Next);
PrevU = U;
- U = stripTag<Use::fullStopTagN>(U->Next);
- Tag = extractTag<Use::NextPtrTag, Use::fullStopTagN>(Next);
- Next = stripTag<Use::fullStopTagN>(Next);
+ U = stripTag<Use::tagMaskN>(U->Next);
+ Tag = extractTag<Use::NextPtrTag, Use::tagMaskN>(Next);
+ Next = stripTag<Use::tagMaskN>(Next);
switch (Tag) {
- case Use::fullStopTagN:{
+ case Use::fullStopTagN: {
punchAwayDigits(PrevU);
repaintByCalculating(reinterpret_cast<unsigned long>(Next), U);
return reinterpret_cast<Value*>(Next);
@@ -230,9 +230,9 @@
Next = Next->Next;
// __builtin_prefetch(Next);
PrevU = U;
- U = stripTag<Use::fullStopTagN>(U->Next);
- Tag = extractTag<Use::NextPtrTag, Use::fullStopTagN>(Next);
- Next = stripTag<Use::fullStopTagN>(Next);
+ U = stripTag<Use::tagMaskN>(U->Next);
+ Tag = extractTag<Use::NextPtrTag, Use::tagMaskN>(Next);
+ Next = stripTag<Use::tagMaskN>(Next);
} // switch
} // while
}
@@ -251,8 +251,8 @@
Use *Next(U->Next);
// __builtin_prefetch(Next);
- Use::NextPtrTag Tag(extractTag<Use::NextPtrTag, Use::fullStopTagN>(Next));
- Next = stripTag<Use::fullStopTagN>(Next);
+ Use::NextPtrTag Tag(extractTag<Use::NextPtrTag, Use::tagMaskN>(Next));
+ Next = stripTag<Use::tagMaskN>(Next);
switch (Tag) {
case Use::fullStopTagN:
return reinterpret_cast<Value*>(Next);
@@ -270,14 +270,14 @@
Value *Use::getValue() const {
// __builtin_prefetch(Next);
- NextPtrTag Tag(extractTag<NextPtrTag, fullStopTagN>(Next));
+ NextPtrTag Tag(extractTag<NextPtrTag, tagMaskN>(Next));
switch (Tag) {
case fullStopTagN:
- return reinterpret_cast<Value*>(stripTag<fullStopTagN>(Next));
+ return reinterpret_cast<Value*>(stripTag<tagMaskN>(Next));
case stopTagN:
return UseWaymark::gatherAndPotentiallyRepaint(Next);
default:
- return UseWaymark::skipPotentiallyGathering(stripTag<fullStopTagN>(Next),
+ return UseWaymark::skipPotentiallyGathering(stripTag<tagMaskN>(Next),
Tag & 1,
Use::UseWaymark::requiredSteps - 1);
}
More information about the llvm-commits
mailing list