From 784bb5992ac36b693dbca9e9e5b03b76756dcdd9 Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Tue, 24 Jun 2014 00:15:19 +0000 Subject: Support: Extract ScaledNumbers::MinScale and MaxScale git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211558 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/BlockFrequencyInfoImpl.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'lib/Analysis') diff --git a/lib/Analysis/BlockFrequencyInfoImpl.cpp b/lib/Analysis/BlockFrequencyInfoImpl.cpp index fb3f7b9779..37ff0c3cca 100644 --- a/lib/Analysis/BlockFrequencyInfoImpl.cpp +++ b/lib/Analysis/BlockFrequencyInfoImpl.cpp @@ -27,11 +27,6 @@ using namespace llvm::bfi_detail; // ScaledNumber implementation. // //===----------------------------------------------------------------------===// -#ifndef _MSC_VER -const int32_t ScaledNumberBase::MaxScale; -const int32_t ScaledNumberBase::MinScale; -#endif - static void appendDigit(std::string &Str, unsigned D) { assert(D < 10); Str += '0' + D % 10; @@ -58,22 +53,22 @@ static bool doesRoundUp(char Digit) { } static std::string toStringAPFloat(uint64_t D, int E, unsigned Precision) { - assert(E >= ScaledNumberBase::MinScale); - assert(E <= ScaledNumberBase::MaxScale); + assert(E >= ScaledNumbers::MinScale); + assert(E <= ScaledNumbers::MaxScale); // Find a new E, but don't let it increase past MaxScale. int LeadingZeros = ScaledNumberBase::countLeadingZeros64(D); - int NewE = std::min(ScaledNumberBase::MaxScale, E + 63 - LeadingZeros); + int NewE = std::min(ScaledNumbers::MaxScale, E + 63 - LeadingZeros); int Shift = 63 - (NewE - E); assert(Shift <= LeadingZeros); - assert(Shift == LeadingZeros || NewE == ScaledNumberBase::MaxScale); + assert(Shift == LeadingZeros || NewE == ScaledNumbers::MaxScale); D <<= Shift; E = NewE; // Check for a denormal. unsigned AdjustedE = E + 16383; if (!(D >> 63)) { - assert(E == ScaledNumberBase::MaxScale); + assert(E == ScaledNumbers::MaxScale); AdjustedE = 0; } -- cgit v1.2.3