6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-23 01:30:19 +00:00
Code Issues Projects Releases Wiki Activity

eliminate some ugly code, using ConstantExpr::getWithOperands instead.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29149 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2006-07-14 22:21:31 +00:00
parent b88a7fbdf6
commit 27d672136a
2 changed files with 8 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/Linker/LinkModules.cpp
View File

@ -295,57 +295,10 @@ static Value *RemapOperand(const Value *In,
Operands[i] = cast<Constant>(RemapOperand(CP->getOperand(i), ValueMap));
Result = ConstantPacked::get(Operands);
} else if (const ConstantExpr *CE = dyn_cast<ConstantExpr>(CPV)) {
if (CE->getOpcode() == Instruction::GetElementPtr) {
Value *Ptr = RemapOperand(CE->getOperand(0), ValueMap);
std::vector<Constant*> Indices;
Indices.reserve(CE->getNumOperands()-1);
for (unsigned i = 1, e = CE->getNumOperands(); i != e; ++i)
Indices.push_back(cast<Constant>(RemapOperand(CE->getOperand(i),
ValueMap)));
Result = ConstantExpr::getGetElementPtr(cast<Constant>(Ptr), Indices);
} else if (CE->getOpcode() == Instruction::ExtractElement) {
Value *Ptr = RemapOperand(CE->getOperand(0), ValueMap);
Value *Idx = RemapOperand(CE->getOperand(1), ValueMap);
Result = ConstantExpr::getExtractElement(cast<Constant>(Ptr),
cast<Constant>(Idx));
} else if (CE->getOpcode() == Instruction::InsertElement) {
Value *Ptr = RemapOperand(CE->getOperand(0), ValueMap);
Value *Elt = RemapOperand(CE->getOperand(1), ValueMap);
Value *Idx = RemapOperand(CE->getOperand(2), ValueMap);
Result = ConstantExpr::getInsertElement(cast<Constant>(Ptr),
cast<Constant>(Elt),
cast<Constant>(Idx));
} else if (CE->getOpcode() == Instruction::ShuffleVector) {
Value *V1 = RemapOperand(CE->getOperand(0), ValueMap);
Value *V2 = RemapOperand(CE->getOperand(1), ValueMap);
Result = ConstantExpr::getShuffleVector(cast<Constant>(V1),
cast<Constant>(V2),
cast<Constant>(CE->getOperand(2)));
} else if (CE->getNumOperands() == 1) {
// Cast instruction
assert(CE->getOpcode() == Instruction::Cast);
Value *V = RemapOperand(CE->getOperand(0), ValueMap);
Result = ConstantExpr::getCast(cast<Constant>(V), CE->getType());
} else if (CE->getNumOperands() == 3) {
// Select instruction
assert(CE->getOpcode() == Instruction::Select);
Value *V1 = RemapOperand(CE->getOperand(0), ValueMap);
Value *V2 = RemapOperand(CE->getOperand(1), ValueMap);
Value *V3 = RemapOperand(CE->getOperand(2), ValueMap);
Result = ConstantExpr::getSelect(cast<Constant>(V1), cast<Constant>(V2),
cast<Constant>(V3));
} else if (CE->getNumOperands() == 2) {
// Binary operator...
Value *V1 = RemapOperand(CE->getOperand(0), ValueMap);
Value *V2 = RemapOperand(CE->getOperand(1), ValueMap);
Result = ConstantExpr::get(CE->getOpcode(), cast<Constant>(V1),
cast<Constant>(V2));
} else {
assert(0 && "Unknown constant expr type!");
}
std::vector<Constant*> Ops;
for (unsigned i = 0, e = CE->getNumOperands(); i != e; ++i)
Ops.push_back(cast<Constant>(RemapOperand(CE->getOperand(i),ValueMap)));
Result = CE->getWithOperands(Ops);
} else {
assert(0 && "Unknown type of derived type constant value!");
}

39
lib/Transforms/Utils/ValueMapper.cpp
View File

@ -71,41 +71,10 @@ Value *llvm::MapValue(const Value *V, std::map<const Value*, Value*> &VM) {
return VMSlot = C;
} else if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C)) {
if (CE->getOpcode() == Instruction::Cast) {
Constant *MV = cast<Constant>(MapValue(CE->getOperand(0), VM));
return VMSlot = ConstantExpr::getCast(MV, CE->getType());
} else if (CE->getOpcode() == Instruction::GetElementPtr) {
std::vector<Constant*> Idx;
Constant *MV = cast<Constant>(MapValue(CE->getOperand(0), VM));
for (unsigned i = 1, e = CE->getNumOperands(); i != e; ++i)
Idx.push_back(cast<Constant>(MapValue(CE->getOperand(i), VM)));
return VMSlot = ConstantExpr::getGetElementPtr(MV, Idx);
} else if (CE->getOpcode() == Instruction::Select) {
Constant *MV1 = cast<Constant>(MapValue(CE->getOperand(0), VM));
Constant *MV2 = cast<Constant>(MapValue(CE->getOperand(1), VM));
Constant *MV3 = cast<Constant>(MapValue(CE->getOperand(2), VM));
return VMSlot = ConstantExpr::getSelect(MV1, MV2, MV3);
} else if (CE->getOpcode() == Instruction::InsertElement) {
Constant *MV1 = cast<Constant>(MapValue(CE->getOperand(0), VM));
Constant *MV2 = cast<Constant>(MapValue(CE->getOperand(1), VM));
Constant *MV3 = cast<Constant>(MapValue(CE->getOperand(2), VM));
return VMSlot = ConstantExpr::getInsertElement(MV1, MV2, MV3);
} else if (CE->getOpcode() == Instruction::ExtractElement) {
Constant *MV1 = cast<Constant>(MapValue(CE->getOperand(0), VM));
Constant *MV2 = cast<Constant>(MapValue(CE->getOperand(1), VM));
return VMSlot = ConstantExpr::getExtractElement(MV1, MV2);
} else if (CE->getOpcode() == Instruction::ShuffleVector) {
Constant *MV1 = cast<Constant>(MapValue(CE->getOperand(0), VM));
Constant *MV2 = cast<Constant>(MapValue(CE->getOperand(1), VM));
Constant *MV3 = cast<Constant>(CE->getOperand(2));
return VMSlot = ConstantExpr::getShuffleVector(MV1, MV2, MV3);
} else {
assert(CE->getNumOperands() == 2 && "Must be binary operator?");
Constant *MV1 = cast<Constant>(MapValue(CE->getOperand(0), VM));
Constant *MV2 = cast<Constant>(MapValue(CE->getOperand(1), VM));
return VMSlot = ConstantExpr::get(CE->getOpcode(), MV1, MV2);
}
std::vector<Constant*> Ops;
for (unsigned i = 0, e = CE->getNumOperands(); i != e; ++i)
Ops.push_back(cast<Constant>(MapValue(CE->getOperand(i), VM)));
return VMSlot = CE->getWithOperands(Ops);
} else if (ConstantPacked *CP = dyn_cast<ConstantPacked>(C)) {
for (unsigned i = 0, e = CP->getNumOperands(); i != e; ++i) {
Value *MV = MapValue(CP->getOperand(i), VM);