From f191b43103113119e60b19b8e78966803a20c655 Mon Sep 17 00:00:00 2001 From: Jakob Stoklund Olesen Date: Tue, 8 May 2012 23:27:30 +0000 Subject: [PATCH 1/1] Use a shared function for a common operation. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@156441 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/TargetRegisterInfo.cpp | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/lib/Target/TargetRegisterInfo.cpp b/lib/Target/TargetRegisterInfo.cpp index 4acbe729d74..50ba91e5b16 100644 --- a/lib/Target/TargetRegisterInfo.cpp +++ b/lib/Target/TargetRegisterInfo.cpp @@ -143,17 +143,7 @@ TargetRegisterInfo::getCommonSubClass(const TargetRegisterClass *A, // Register classes are ordered topologically, so the largest common // sub-class it the common sub-class with the smallest ID. - const unsigned *SubA = A->getSubClassMask(); - const unsigned *SubB = B->getSubClassMask(); - - // We could start the search from max(A.ID, B.ID), but we are only going to - // execute 2-3 iterations anyway. - for (unsigned Base = 0, BaseE = getNumRegClasses(); Base < BaseE; Base += 32) - if (unsigned Common = *SubA++ & *SubB++) - return getRegClass(Base + CountTrailingZeros_32(Common)); - - // No common sub-class exists. - return NULL; + return firstCommonClass(A->getSubClassMask(), B->getSubClassMask(), this); } const TargetRegisterClass * @@ -166,21 +156,10 @@ TargetRegisterInfo::getMatchingSuperRegClass(const TargetRegisterClass *A, // Find Idx in the list of super-register indices. const uint32_t *Mask = 0; for (SuperRegClassIterator RCI(B, this); RCI.isValid(); ++RCI) - if (RCI.getSubReg() == Idx) { - Mask = RCI.getMask(); - break; - } - if (!Mask) - return 0; - - // The bit mask contains all register classes that are projected into B by - // Idx. Find a class that is also a sub-class of A. - const uint32_t *SC = A->getSubClassMask(); - - // Find the first common register class in TV and SC. - for (unsigned Base = 0, BaseE = getNumRegClasses(); Base < BaseE; Base += 32) - if (unsigned Common = *Mask++ & *SC++) - return getRegClass(Base + CountTrailingZeros_32(Common)); + if (RCI.getSubReg() == Idx) + // The bit mask contains all register classes that are projected into B + // by Idx. Find a class that is also a sub-class of A. + return firstCommonClass(RCI.getMask(), A->getSubClassMask(), this); return 0; } -- 2.34.1