diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/llvm-upgrade/UpgradeParser.y | 8 | ||||
| -rw-r--r-- | tools/llvm2cpp/CppWriter.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/llvm-upgrade/UpgradeParser.y b/tools/llvm-upgrade/UpgradeParser.y index df472cc21f..e0dfdbdf68 100644 --- a/tools/llvm-upgrade/UpgradeParser.y +++ b/tools/llvm-upgrade/UpgradeParser.y @@ -999,7 +999,7 @@ getBinaryOp(BinaryOps op, const Type *Ty, Signedness Sign) { // types of its operands. bool isFP = Ty->isFloatingPoint(); if (const VectorType* PTy = dyn_cast<VectorType>(Ty)) - // If its a packed type we want to use the element type + // If its a vector type we want to use the element type isFP = PTy->getElementType()->isFloatingPoint(); if (isFP) return Instruction::FDiv; @@ -1015,7 +1015,7 @@ getBinaryOp(BinaryOps op, const Type *Ty, Signedness Sign) { // types of its operands. bool isFP = Ty->isFloatingPoint(); if (const VectorType* PTy = dyn_cast<VectorType>(Ty)) - // If its a packed type we want to use the element type + // If its a vector type we want to use the element type isFP = PTy->getElementType()->isFloatingPoint(); // Select correct opcode if (isFP) @@ -1841,7 +1841,7 @@ UpRTypes $$.S = $4.S; delete $4.PAT; } - | '<' EUINT64VAL 'x' UpRTypes '>' { // Packed array type? + | '<' EUINT64VAL 'x' UpRTypes '>' { // Vector type? const llvm::Type* ElemTy = $4.PAT->get(); if ((unsigned)$2 != $2) error("Unsigned result not equal to signed result"); @@ -3112,7 +3112,7 @@ InstVal error("Arithmetic operator requires integer, FP, or packed operands"); if (isa<VectorType>(Ty) && ($1 == URemOp || $1 == SRemOp || $1 == FRemOp || $1 == RemOp)) - error("Remainder not supported on packed types"); + error("Remainder not supported on vector types"); // Upgrade the opcode from obsolete versions before we do anything with it. Instruction::BinaryOps Opcode = getBinaryOp($1, Ty, $2.S); Value* val1 = getVal(Ty, $3); diff --git a/tools/llvm2cpp/CppWriter.cpp b/tools/llvm2cpp/CppWriter.cpp index 05a85cf806..9dffb63894 100644 --- a/tools/llvm2cpp/CppWriter.cpp +++ b/tools/llvm2cpp/CppWriter.cpp @@ -338,7 +338,7 @@ CppWriter::getCppName(const Type* Ty) case Type::ArrayTyID: prefix = "ArrayTy_"; break; case Type::PointerTyID: prefix = "PointerTy_"; break; case Type::OpaqueTyID: prefix = "OpaqueTy_"; break; - case Type::VectorTyID: prefix = "PackedTy_"; break; + case Type::VectorTyID: prefix = "VectorTy_"; break; default: prefix = "OtherTy_"; break; // prevent breakage } |