6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-13 04:38:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix a bug in previous bug fix.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2069 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Vikram S. Adve
2002-03-31 18:56:51 +00:00
parent 1a53f03392
commit 1792779edf
2 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp
View File

@ -97,7 +97,7 @@ GetConstantValueAsSignedInt(const Value *V,
if (Val < INT64_MAX) // then safe to cast to signed if (Val < INT64_MAX) // then safe to cast to signed
return (int64_t)Val; return (int64_t)Val;
} }
isValidConstant = false; isValidConstant = false;
return 0; return 0;
} }
@ -120,9 +120,14 @@ FoldGetElemChain(const InstructionNode* getElemInstrNode,
MemAccessInst* getElemInst = (MemAccessInst*) MemAccessInst* getElemInst = (MemAccessInst*)
getElemInstrNode->getInstruction(); getElemInstrNode->getInstruction();
// Initialize return values from the incoming instruction // Return NULL if we don't fold any instructions in.
Value* ptrVal = NULL; Value* ptrVal = NULL;
assert(chainIdxVec.size() == 0);
// The incoming index vector must be for the user of the chain.
// Its leading index must be [0] and we insert indices after that.
assert(chainIdxVec.size() > 0 &&
isa<ConstantUInt>(chainIdxVec.front()) &&
cast<ConstantUInt>(chainIdxVec.front())->getValue() == 0);
// Now chase the chain of getElementInstr instructions, if any. // Now chase the chain of getElementInstr instructions, if any.
// Check for any array indices and stop there. // Check for any array indices and stop there.
@ -152,12 +157,15 @@ FoldGetElemChain(const InstructionNode* getElemInstrNode,
} }
if (allStructureOffsets) if (allStructureOffsets)
{ // Get pointer value out of ptrChild and *prepend* its index vector { // Get pointer value out of ptrChild.
ptrVal = getElemInst->getPointerOperand(); ptrVal = getElemInst->getPointerOperand();
chainIdxVec.insert(chainIdxVec.begin(),
// Insert its index vector at the start, but after the leading [0]
chainIdxVec.insert(chainIdxVec.begin()+1,
idxVec.begin()+1, idxVec.end()); idxVec.begin()+1, idxVec.end());
// Mark the folded node so no code is generated for it.
((InstructionNode*) ptrChild)->markFoldedIntoParent(); ((InstructionNode*) ptrChild)->markFoldedIntoParent();
// mark so no code is generated
} }
else // cannot fold this getElementPtr instr. or any further ones else // cannot fold this getElementPtr instr. or any further ones
break; break;

20
lib/Target/SparcV9/InstrSelection/InstrSelectionSupport.cpp
View File

@ -97,7 +97,7 @@ GetConstantValueAsSignedInt(const Value *V,
if (Val < INT64_MAX) // then safe to cast to signed if (Val < INT64_MAX) // then safe to cast to signed
return (int64_t)Val; return (int64_t)Val;
} }
isValidConstant = false; isValidConstant = false;
return 0; return 0;
} }
@ -120,9 +120,14 @@ FoldGetElemChain(const InstructionNode* getElemInstrNode,
MemAccessInst* getElemInst = (MemAccessInst*) MemAccessInst* getElemInst = (MemAccessInst*)
getElemInstrNode->getInstruction(); getElemInstrNode->getInstruction();
// Initialize return values from the incoming instruction // Return NULL if we don't fold any instructions in.
Value* ptrVal = NULL; Value* ptrVal = NULL;
assert(chainIdxVec.size() == 0);
// The incoming index vector must be for the user of the chain.
// Its leading index must be [0] and we insert indices after that.
assert(chainIdxVec.size() > 0 &&
isa<ConstantUInt>(chainIdxVec.front()) &&
cast<ConstantUInt>(chainIdxVec.front())->getValue() == 0);
// Now chase the chain of getElementInstr instructions, if any. // Now chase the chain of getElementInstr instructions, if any.
// Check for any array indices and stop there. // Check for any array indices and stop there.
@ -152,12 +157,15 @@ FoldGetElemChain(const InstructionNode* getElemInstrNode,
} }
if (allStructureOffsets) if (allStructureOffsets)
{ // Get pointer value out of ptrChild and *prepend* its index vector { // Get pointer value out of ptrChild.
ptrVal = getElemInst->getPointerOperand(); ptrVal = getElemInst->getPointerOperand();
chainIdxVec.insert(chainIdxVec.begin(),
// Insert its index vector at the start, but after the leading [0]
chainIdxVec.insert(chainIdxVec.begin()+1,
idxVec.begin()+1, idxVec.end()); idxVec.begin()+1, idxVec.end());
// Mark the folded node so no code is generated for it.
((InstructionNode*) ptrChild)->markFoldedIntoParent(); ((InstructionNode*) ptrChild)->markFoldedIntoParent();
// mark so no code is generated
} }
else // cannot fold this getElementPtr instr. or any further ones else // cannot fold this getElementPtr instr. or any further ones
break; break;