6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 20:32:21 +00:00
Code Issues Projects Releases Wiki Activity

stpcpy is so similar to strcpy, it doesn't deserve a complete copy of the __strcpy_chk -> strcpy code.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98284 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer 2010-03-11 20:45:13 +00:00
parent c6678b0014
commit 7fa30b8e5d
4 changed files with 13 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/llvm/Transforms/Utils/BuildLibCalls.h
View File

@ -37,13 +37,8 @@ namespace llvm {
/// EmitStrCpy - Emit a call to the strcpy function to the builder, for the
/// specified pointer arguments.
Value *EmitStrCpy(Value *Dst, Value *Src, IRBuilder<> &B,
const TargetData *TD);
/// EmitStpCpy - Emit a call to the stpcpy function to the builder, for the
/// specified pointer arguments.
Value *EmitStpCpy(Value *Dst, Value *Src, IRBuilder<> &B,
const TargetData *TD);
const TargetData *TD, StringRef Name = "strcpy");
/// EmitStrNCpy - Emit a call to the strncpy function to the builder, for the
/// specified pointer arguments and length.
Value *EmitStrNCpy(Value *Dst, Value *Src, Value *Len, IRBuilder<> &B,

27
lib/Transforms/InstCombine/InstCombineCalls.cpp
View File

@ -819,36 +819,19 @@ Instruction *InstCombiner::tryOptimizeCall(CallInst *CI, const TargetData *TD) {
return 0;
}
if (Name == "__strcpy_chk") {
if (Name == "__strcpy_chk" || Name == "__stpcpy_chk") {
ConstantInt *SizeCI = dyn_cast<ConstantInt>(CI->getOperand(3));
if (!SizeCI)
return 0;
// If a) we don't have any length information, or b) we know this will
// fit then just lower to a plain strcpy. Otherwise we'll keep our
// strcpy_chk call which may fail at runtime if the size is too long.
// fit then just lower to a plain st[rp]cpy. Otherwise we'll keep our
// st[rp]cpy_chk call which may fail at runtime if the size is too long.
// TODO: It might be nice to get a maximum length out of the possible
// string lengths for varying.
if (SizeCI->isAllOnesValue() ||
SizeCI->getZExtValue() >= GetStringLength(CI->getOperand(2))) {
Value *Ret = EmitStrCpy(CI->getOperand(1), CI->getOperand(2), B, TD);
return ReplaceInstUsesWith(*CI, Ret);
}
return 0;
}
// Should be similar to strcpy.
if (Name == "__stpcpy_chk") {
ConstantInt *SizeCI = dyn_cast<ConstantInt>(CI->getOperand(3));
if (!SizeCI)
return 0;
// If a) we don't have any length information, or b) we know this will
// fit then just lower to a plain stpcpy. Otherwise we'll keep our
// stpcpy_chk call which may fail at runtime if the size is too long.
// TODO: It might be nice to get a maximum length out of the possible
// string lengths for varying.
if (SizeCI->isAllOnesValue() ||
SizeCI->getZExtValue() >= GetStringLength(CI->getOperand(2))) {
Value *Ret = EmitStpCpy(CI->getOperand(1), CI->getOperand(2), B, TD);
Value *Ret = EmitStrCpy(CI->getOperand(1), CI->getOperand(2), B, TD,
Name.substr(2, 6));
return ReplaceInstUsesWith(*CI, Ret);
}
return 0;

18
lib/Transforms/Scalar/CodeGenPrepare.cpp
View File

@ -620,25 +620,13 @@ bool CodeGenPrepare::OptimizeCallInst(CallInst *CI) {
return 0;
}
if (Name == "__strcpy_chk") {
if (Name == "__strcpy_chk" || Name == "__stpcpy_chk") {
ConstantInt *SizeCI = dyn_cast<ConstantInt>(CI->getOperand(3));
if (!SizeCI)
return 0;
if (SizeCI->isAllOnesValue()) {
Value *Ret = EmitStrCpy(CI->getOperand(1), CI->getOperand(2), B, TD);
CI->replaceAllUsesWith(Ret);
CI->eraseFromParent();
return true;
}
return 0;
}
if (Name == "__stpcpy_chk") {
ConstantInt *SizeCI = dyn_cast<ConstantInt>(CI->getOperand(3));
if (!SizeCI)
return 0;
if (SizeCI->isAllOnesValue()) {
Value *Ret = EmitStpCpy(CI->getOperand(1), CI->getOperand(2), B, TD);
Value *Ret = EmitStrCpy(CI->getOperand(1), CI->getOperand(2), B, TD,
Name.substr(2, 6));
CI->replaceAllUsesWith(Ret);
CI->eraseFromParent();
return true;

24
lib/Transforms/Utils/BuildLibCalls.cpp
View File

@ -72,39 +72,21 @@ Value *llvm::EmitStrChr(Value *Ptr, char C, IRBuilder<> &B,
/// EmitStrCpy - Emit a call to the strcpy function to the builder, for the
/// specified pointer arguments.
Value *llvm::EmitStrCpy(Value *Dst, Value *Src, IRBuilder<> &B,
const TargetData *TD) {
const TargetData *TD, StringRef Name) {
Module *M = B.GetInsertBlock()->getParent()->getParent();
AttributeWithIndex AWI[2];
AWI[0] = AttributeWithIndex::get(2, Attribute::NoCapture);
AWI[1] = AttributeWithIndex::get(~0u, Attribute::NoUnwind);
const Type *I8Ptr = B.getInt8PtrTy();
Value *StrCpy = M->getOrInsertFunction("strcpy", AttrListPtr::get(AWI, 2),
Value *StrCpy = M->getOrInsertFunction(Name, AttrListPtr::get(AWI, 2),
I8Ptr, I8Ptr, I8Ptr, NULL);
CallInst *CI = B.CreateCall2(StrCpy, CastToCStr(Dst, B), CastToCStr(Src, B),
"strcpy");
Name);
if (const Function *F = dyn_cast<Function>(StrCpy->stripPointerCasts()))
CI->setCallingConv(F->getCallingConv());
return CI;
}
/// EmitStpCpy - Emit a call to the stpcpy function to the builder, for the
/// specified pointer arguments.
Value *llvm::EmitStpCpy(Value *Dst, Value *Src, IRBuilder<> &B,
const TargetData *TD) {
Module *M = B.GetInsertBlock()->getParent()->getParent();
AttributeWithIndex AWI[2];
AWI[0] = AttributeWithIndex::get(2, Attribute::NoCapture);
AWI[1] = AttributeWithIndex::get(~0u, Attribute::NoUnwind);
const Type *I8Ptr = B.getInt8PtrTy();
Value *StpCpy = M->getOrInsertFunction("stpcpy", AttrListPtr::get(AWI, 2),
I8Ptr, I8Ptr, I8Ptr, NULL);
CallInst *CI = B.CreateCall2(StpCpy, CastToCStr(Dst, B), CastToCStr(Src, B),
"stpcpy");
if (const Function *F = dyn_cast<Function>(StpCpy->stripPointerCasts()))
CI->setCallingConv(F->getCallingConv());
return CI;
}
/// EmitStrNCpy - Emit a call to the strncpy function to the builder, for the
/// specified pointer arguments.
Value *llvm::EmitStrNCpy(Value *Dst, Value *Src, Value *Len,