6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-23 17:28:54 +00:00
Code Issues Projects Releases Wiki Activity

Attempt to fix sumant's typesafety issue

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5984 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2003-05-02 19:32:04 +00:00
parent e96fda3002
commit 2d399096cf
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Transforms/LevelRaise.cpp
View File

@@ -107,33 +107,40 @@ static bool HandleCastToPointer(BasicBlock::iterator BI,
CastInst &CI = cast<CastInst>(*BI); CastInst &CI = cast<CastInst>(*BI);
if (CI.use_empty()) return false; if (CI.use_empty()) return false;
// Scan all of the uses, looking for any uses that are not add // Scan all of the uses, looking for any uses that are not add or sub
// instructions. If we have non-adds, do not make this transformation. // instructions. If we have non-adds, do not make this transformation.
// //
bool HasSubUse = false; // Keep track of any subtracts...
for (Value::use_iterator I = CI.use_begin(), E = CI.use_end(); for (Value::use_iterator I = CI.use_begin(), E = CI.use_end();
I != E; ++I) { I != E; ++I)
if (BinaryOperator *BO = dyn_cast<BinaryOperator>(*I)) { if (BinaryOperator *BO = dyn_cast<BinaryOperator>(*I)) {
if (BO->getOpcode() != Instruction::Add || if ((BO->getOpcode() != Instruction::Add &&
BO->getOpcode() != Instruction::Sub) ||
// Avoid add sbyte* %X, %X cases... // Avoid add sbyte* %X, %X cases...
BO->getOperand(0) == BO->getOperand(1)) BO->getOperand(0) == BO->getOperand(1))
return false; return false;
else
HasSubUse |= BO->getOpcode() == Instruction::Sub;
} else { } else {
return false; return false;
} }
}
std::vector<Value*> Indices; std::vector<Value*> Indices;
Value *Src = CI.getOperand(0); Value *Src = CI.getOperand(0);
const Type *Result = ConvertableToGEP(DestPTy, Src, Indices, TD, &BI); const Type *Result = ConvertableToGEP(DestPTy, Src, Indices, TD, &BI);
if (Result == 0) return false; // Not convertable... if (Result == 0) return false; // Not convertable...
// Cannot handle subtracts if there is more than one index required...
if (HasSubUse && Indices.size() != 1) return false;
PRINT_PEEPHOLE2("cast-add-to-gep:in", Src, CI); PRINT_PEEPHOLE2("cast-add-to-gep:in", Src, CI);
// If we have a getelementptr capability... transform all of the // If we have a getelementptr capability... transform all of the
// add instruction uses into getelementptr's. // add instruction uses into getelementptr's.
while (!CI.use_empty()) { while (!CI.use_empty()) {
BinaryOperator *I = cast<BinaryOperator>(*CI.use_begin()); BinaryOperator *I = cast<BinaryOperator>(*CI.use_begin());
assert(I->getOpcode() == Instruction::Add && I->getNumOperands() == 2 && assert((I->getOpcode() == Instruction::Add ||
I->getOpcode() == Instruction::Sub) &&
"Use is not a valid add instruction!"); "Use is not a valid add instruction!");
// Get the value added to the cast result pointer... // Get the value added to the cast result pointer...
@@ -142,6 +149,15 @@ static bool HandleCastToPointer(BasicBlock::iterator BI,
Instruction *GEP = new GetElementPtrInst(OtherPtr, Indices, I->getName()); Instruction *GEP = new GetElementPtrInst(OtherPtr, Indices, I->getName());
PRINT_PEEPHOLE1("cast-add-to-gep:i", I); PRINT_PEEPHOLE1("cast-add-to-gep:i", I);
// If the instruction is actually a subtract, we are guaranteed to only have
// one index (from code above), so we just need to negate the pointer index
// long value.
if (I->getOpcode() == Instruction::Sub) {
Instruction *Neg = BinaryOperator::createNeg(GEP->getOperand(1),
GEP->getOperand(1)->getName()+".neg", I);
GEP->setOperand(1, Neg);
}
if (GEP->getType() == I->getType()) { if (GEP->getType() == I->getType()) {
// Replace the old add instruction with the shiny new GEP inst // Replace the old add instruction with the shiny new GEP inst
ReplaceInstWithInst(I, GEP); ReplaceInstWithInst(I, GEP);