[llvm-commits] CVS: llvm/lib/ExecutionEngine/Interpreter/Execution.cpp

[Chris Lattner]

Changes in directory llvm/lib/ExecutionEngine/Interpreter:

Execution.cpp updated: 1.158 -> 1.159
---
Log message:

rename Type::isIntegral to Type::isInteger, eliminating the old Type::isInteger.
rename Type::getIntegralTypeMask to Type::getIntegerTypeMask.

This makes naming much more consistent.  For example, there are now no longer any
instances of IntegerType that are not considered isInteger! :)



---
Diffs of the changes:  (+6 -6)

 Execution.cpp |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


Index: llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
diff -u llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.158 llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.159
--- llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.158	Sun Jan 14 20:03:16 2007
+++ llvm/lib/ExecutionEngine/Interpreter/Execution.cpp	Sun Jan 14 20:27:26 2007
@@ -891,7 +891,7 @@
   ECStack.pop_back();
 
   if (ECStack.empty()) {  // Finished main.  Put result into exit code...
-    if (RetTy && RetTy->isIntegral()) {          // Nonvoid return type?
+    if (RetTy && RetTy->isInteger()) {          // Nonvoid return type?
       ExitValue = Result;   // Capture the exit value of the program
     } else {
       memset(&ExitValue, 0, sizeof(ExitValue));
@@ -1170,7 +1170,7 @@
     // this by zero or sign extending the value as appropriate according to the
     // source type.
     const Type *Ty = V->getType();
-    if (Ty->isIntegral()) {
+    if (Ty->isInteger()) {
       if (Ty->getPrimitiveSizeInBits() == 1)
         ArgVals.back().Int32Val = ArgVals.back().Int1Val;
       else if (Ty->getPrimitiveSizeInBits() <= 8)
@@ -1541,14 +1541,14 @@
   if (isa<PointerType>(DstTy)) {
     assert(isa<PointerType>(SrcTy) && "Invalid BitCast");
     Dest.PointerVal = Src.PointerVal;
-  } else if (DstTy->isIntegral()) {
+  } else if (DstTy->isInteger()) {
     const IntegerType *DITy = cast<IntegerType>(DstTy);
     unsigned DBitWidth = DITy->getBitWidth();
     if (SrcTy == Type::FloatTy) {
       Dest.Int32Val = FloatToBits(Src.FloatVal);
     } else if (SrcTy == Type::DoubleTy) {
       Dest.Int64Val = DoubleToBits(Src.DoubleVal);
-    } else if (SrcTy->isIntegral()) {
+    } else if (SrcTy->isInteger()) {
       const IntegerType *SITy = cast<IntegerType>(SrcTy);
       unsigned SBitWidth = SITy->getBitWidth();
       assert(SBitWidth <= 64  && "Integer types > 64 bits not supported");
@@ -1566,12 +1566,12 @@
     } else 
       assert(0 && "Invalid BitCast");
   } else if (DstTy == Type::FloatTy) {
-    if (SrcTy->isIntegral())
+    if (SrcTy->isInteger())
       Dest.FloatVal = BitsToFloat(Src.Int32Val);
     else
       Dest.FloatVal = Src.FloatVal;
   } else if (DstTy == Type::DoubleTy) {
-    if (SrcTy->isIntegral())
+    if (SrcTy->isInteger())
       Dest.DoubleVal = BitsToDouble(Src.Int64Val);
     else
       Dest.DoubleVal = Src.DoubleVal;