1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00

For PR786:

Minor tweaks in public headers and a few .cpp files so that LLVM can build
successfully with -pedantic and projects using LLVM with -pedantic don't
get warnings from LLVM. There's still more -pedantic warnings to fix.

llvm-svn: 28453
This commit is contained in:
Reid Spencer 2006-05-24 19:21:13 +00:00
parent e39b3b9bf0
commit 574d4e6992
11 changed files with 14 additions and 14 deletions

View File

@ -39,7 +39,7 @@ static inline std::string utohexstr(uint64_t X) {
return std::string(BufPtr); return std::string(BufPtr);
} }
static inline std::string utostr(unsigned long long X, bool isNeg = false) { static inline std::string utostr(uint64_t X, bool isNeg = false) {
char Buffer[40]; char Buffer[40];
char *BufPtr = Buffer+39; char *BufPtr = Buffer+39;
@ -56,7 +56,7 @@ static inline std::string utostr(unsigned long long X, bool isNeg = false) {
} }
static inline std::string utostr(unsigned long X, bool isNeg = false) { static inline std::string utostr(unsigned long X, bool isNeg = false) {
return utostr(static_cast<unsigned long long>(X), isNeg); return utostr(static_cast<uint64_t>(X), isNeg);
} }
static inline std::string utostr(unsigned X, bool isNeg = false) { static inline std::string utostr(unsigned X, bool isNeg = false) {
@ -76,7 +76,7 @@ static inline std::string utostr(unsigned X, bool isNeg = false) {
return std::string(BufPtr); return std::string(BufPtr);
} }
static inline std::string itostr(long long X) { static inline std::string itostr(int64_t X) {
if (X < 0) if (X < 0)
return utostr(static_cast<uint64_t>(-X), true); return utostr(static_cast<uint64_t>(-X), true);
else else

View File

@ -203,13 +203,13 @@ namespace MVT { // MVT = Machine Value Types
/// bits in the specified integer value type. /// bits in the specified integer value type.
static inline uint64_t getIntVTBitMask(ValueType VT) { static inline uint64_t getIntVTBitMask(ValueType VT) {
assert(isInteger(VT) && !isVector(VT) && "Only applies to int scalars!"); assert(isInteger(VT) && !isVector(VT) && "Only applies to int scalars!");
return ~0ULL >> (64-getSizeInBits(VT)); return ~uint64_t(0UL) >> (64-getSizeInBits(VT));
} }
/// MVT::getIntVTSignBit - Return an integer with a 1 in the position of the /// MVT::getIntVTSignBit - Return an integer with a 1 in the position of the
/// sign bit for the specified integer value type. /// sign bit for the specified integer value type.
static inline uint64_t getIntVTSignBit(ValueType VT) { static inline uint64_t getIntVTSignBit(ValueType VT) {
assert(isInteger(VT) && !isVector(VT) && "Only applies to int scalars!"); assert(isInteger(VT) && !isVector(VT) && "Only applies to int scalars!");
return 1ULL << (getSizeInBits(VT)-1); return uint64_t(1UL) << (getSizeInBits(VT)-1);
} }
/// MVT::getValueTypeString - This function returns value type as a string, /// MVT::getValueTypeString - This function returns value type as a string,

View File

@ -58,7 +58,7 @@ public:
/// type. /// type.
inline uint64_t getZExtValue() const { inline uint64_t getZExtValue() const {
unsigned Size = getType()->getPrimitiveSizeInBits(); unsigned Size = getType()->getPrimitiveSizeInBits();
return Val.Unsigned & (~0ULL >> (64-Size)); return Val.Unsigned & (~uint64_t(0UL) >> (64-Size));
} }
/// getSExtValue - Return the constant sign extended as appropriate for this /// getSExtValue - Return the constant sign extended as appropriate for this

View File

@ -76,7 +76,7 @@ inline bool isPowerOf2_32(unsigned Value) {
// isPowerOf2_64 - This function returns true if the argument is a power of two // isPowerOf2_64 - This function returns true if the argument is a power of two
// > 0 (64 bit edition.) // > 0 (64 bit edition.)
inline bool isPowerOf2_64(uint64_t Value) { inline bool isPowerOf2_64(uint64_t Value) {
return Value && !(Value & (Value - 1LL)); return Value && !(Value & (Value - int64_t(1L)));
} }
// ByteSwap_16 - This function returns a byte-swapped representation of the // ByteSwap_16 - This function returns a byte-swapped representation of the

View File

@ -57,7 +57,7 @@ namespace llvm {
void progress(unsigned Current, unsigned Maximum) { void progress(unsigned Current, unsigned Maximum) {
assert(Maximum != 0 && assert(Maximum != 0 &&
"Shouldn't be doing work if there is nothing to do!"); "Shouldn't be doing work if there is nothing to do!");
progress(Current*1000ULL/Maximum); progress(Current*uint64_t(1000UL)/Maximum);
} }
}; };
} // end namespace llvm } // end namespace llvm

View File

@ -512,7 +512,7 @@ protected:
LegalizeAction Action) { LegalizeAction Action) {
assert(VT < 32 && Op < sizeof(OpActions)/sizeof(OpActions[0]) && assert(VT < 32 && Op < sizeof(OpActions)/sizeof(OpActions[0]) &&
"Table isn't big enough!"); "Table isn't big enough!");
OpActions[Op] &= ~(3ULL << VT*2); OpActions[Op] &= ~(uint64_t(3UL) << VT*2);
OpActions[Op] |= (uint64_t)Action << VT*2; OpActions[Op] |= (uint64_t)Action << VT*2;
} }

View File

@ -239,7 +239,7 @@ public:
/// sbyte/ubyte, 0xFFFF for shorts, etc. /// sbyte/ubyte, 0xFFFF for shorts, etc.
uint64_t getIntegralTypeMask() const { uint64_t getIntegralTypeMask() const {
assert(isIntegral() && "This only works for integral types!"); assert(isIntegral() && "This only works for integral types!");
return ~0ULL >> (64-getPrimitiveSizeInBits()); return ~uint64_t(0UL) >> (64-getPrimitiveSizeInBits());
} }
/// getForwaredType - Return the type that this type has been resolved to if /// getForwaredType - Return the type that this type has been resolved to if

View File

@ -313,7 +313,7 @@ GenericValue lle_X_sprintf(FunctionType *M, const vector<GenericValue> &Args) {
if (HowLong >= 1) { if (HowLong >= 1) {
if (HowLong == 1 && if (HowLong == 1 &&
TheInterpreter->getModule().getPointerSize()==Module::Pointer64 && TheInterpreter->getModule().getPointerSize()==Module::Pointer64 &&
sizeof(long) < sizeof(long long)) { sizeof(long) < sizeof(int64_t)) {
// Make sure we use %lld with a 64 bit argument because we might be // Make sure we use %lld with a 64 bit argument because we might be
// compiling LLI on a 32 bit compiler. // compiling LLI on a 32 bit compiler.
unsigned Size = strlen(FmtBuf); unsigned Size = strlen(FmtBuf);

View File

@ -685,7 +685,7 @@ void CWriter::printConstant(Constant *CPV) {
char Buffer[100]; char Buffer[100];
uint64_t ll = DoubleToBits(FPC->getValue()); uint64_t ll = DoubleToBits(FPC->getValue());
sprintf(Buffer, "0x%llx", (unsigned long long)ll); sprintf(Buffer, "0x%llx", uint64_t(ll));
std::string Num(&Buffer[0], &Buffer[6]); std::string Num(&Buffer[0], &Buffer[6]);
unsigned long Val = strtoul(Num.c_str(), 0, 16); unsigned long Val = strtoul(Num.c_str(), 0, 16);

View File

@ -54,7 +54,7 @@ struct llvm_exception {
enum { enum {
ErrorException = 0, ErrorException = 0,
SJLJException = 1, SJLJException = 1,
CXXException = 2, CXXException = 2
}; };
// Language independent exception handling API... // Language independent exception handling API...

View File

@ -139,7 +139,7 @@ int main(int argc, char **argv) {
sort(FunctionCounts.begin(), FunctionCounts.end(), sort(FunctionCounts.begin(), FunctionCounts.end(),
PairSecondSortReverse<Function*>()); PairSecondSortReverse<Function*>());
unsigned long long TotalExecutions = 0; uint64_t TotalExecutions = 0;
for (unsigned i = 0, e = FunctionCounts.size(); i != e; ++i) for (unsigned i = 0, e = FunctionCounts.size(); i != e; ++i)
TotalExecutions += FunctionCounts[i].second; TotalExecutions += FunctionCounts[i].second;