mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-08-05 13:26:55 +00:00
MemoryBuiltins: add support to determine the size of strdup'ed non-constant strings
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@160742 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -26,6 +26,7 @@
|
||||
#include "llvm/Support/MathExtras.h"
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
#include "llvm/Target/TargetData.h"
|
||||
#include "llvm/Transforms/Utils/BuildLibCalls.h"
|
||||
#include "llvm/Transforms/Utils/Local.h"
|
||||
using namespace llvm;
|
||||
|
||||
@@ -448,11 +449,9 @@ SizeOffsetType ObjectSizeOffsetVisitor::visitCallSite(CallSite CS) {
|
||||
return std::make_pair(Size, Zero);
|
||||
|
||||
// TODO: handle more standard functions (+ wchar cousins):
|
||||
// - strdup / strndup
|
||||
// - strcpy / strncpy
|
||||
// - strcat / strncat
|
||||
// - memcpy / memmove
|
||||
// - strcat / strncat
|
||||
// - memset
|
||||
}
|
||||
|
||||
@@ -524,8 +523,9 @@ SizeOffsetType ObjectSizeOffsetVisitor::visitInstruction(Instruction &I) {
|
||||
|
||||
|
||||
ObjectSizeOffsetEvaluator::ObjectSizeOffsetEvaluator(const TargetData *TD,
|
||||
const TargetLibraryInfo *TLI,
|
||||
LLVMContext &Context)
|
||||
: TD(TD), Context(Context), Builder(Context, TargetFolder(TD)),
|
||||
: TD(TD), TLI(TLI), Context(Context), Builder(Context, TargetFolder(TD)),
|
||||
Visitor(TD, Context) {
|
||||
IntTy = TD->getIntPtrType(Context);
|
||||
Zero = ConstantInt::get(IntTy, 0);
|
||||
@@ -619,8 +619,21 @@ SizeOffsetEvalType ObjectSizeOffsetEvaluator::visitCallSite(CallSite CS) {
|
||||
|
||||
// handle strdup-like functions separately
|
||||
if (FnData->AllocTy == StrDupLike) {
|
||||
// TODO
|
||||
return unknown();
|
||||
IRBuilder<> StdBuilder(Builder.GetInsertPoint());
|
||||
Value *Size;
|
||||
|
||||
// strdup(str): size = strlen(str)+1
|
||||
if (FnData->FstParam < 0)
|
||||
Size = EmitStrLen(CS.getArgument(0), StdBuilder, TD, TLI);
|
||||
else
|
||||
// strndup(str, maxlen): size = strnlen(str, maxlen)+1
|
||||
Size = EmitStrNLen(CS.getArgument(0), CS.getArgument(FnData->FstParam),
|
||||
StdBuilder, TD, TLI);
|
||||
if (!Size)
|
||||
return unknown();
|
||||
Builder.SetInsertPoint(StdBuilder.GetInsertPoint());
|
||||
Size = Builder.CreateNUWAdd(Size, ConstantInt::get(IntTy, 1));
|
||||
return std::make_pair(Size, Zero);
|
||||
}
|
||||
|
||||
Value *FirstArg = CS.getArgument(FnData->FstParam);
|
||||
@@ -634,11 +647,9 @@ SizeOffsetEvalType ObjectSizeOffsetEvaluator::visitCallSite(CallSite CS) {
|
||||
return std::make_pair(Size, Zero);
|
||||
|
||||
// TODO: handle more standard functions (+ wchar cousins):
|
||||
// - strdup / strndup
|
||||
// - strcpy / strncpy
|
||||
// - strcat / strncat
|
||||
// - memcpy / memmove
|
||||
// - strcat / strncat
|
||||
// - memset
|
||||
}
|
||||
|
||||
|
@@ -24,6 +24,7 @@
|
||||
#include "llvm/Support/TargetFolder.h"
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
#include "llvm/Target/TargetData.h"
|
||||
#include "llvm/Target/TargetLibraryInfo.h"
|
||||
#include "llvm/Transforms/Instrumentation.h"
|
||||
using namespace llvm;
|
||||
|
||||
@@ -48,6 +49,7 @@ namespace {
|
||||
|
||||
virtual void getAnalysisUsage(AnalysisUsage &AU) const {
|
||||
AU.addRequired<TargetData>();
|
||||
AU.addRequired<TargetLibraryInfo>();
|
||||
}
|
||||
|
||||
private:
|
||||
@@ -166,11 +168,12 @@ bool BoundsChecking::instrument(Value *Ptr, Value *InstVal) {
|
||||
|
||||
bool BoundsChecking::runOnFunction(Function &F) {
|
||||
TD = &getAnalysis<TargetData>();
|
||||
const TargetLibraryInfo *TLI = &getAnalysis<TargetLibraryInfo>();
|
||||
|
||||
TrapBB = 0;
|
||||
BuilderTy TheBuilder(F.getContext(), TargetFolder(TD));
|
||||
Builder = &TheBuilder;
|
||||
ObjectSizeOffsetEvaluator TheObjSizeEval(TD, F.getContext());
|
||||
ObjectSizeOffsetEvaluator TheObjSizeEval(TD, TLI, F.getContext());
|
||||
ObjSizeEval = &TheObjSizeEval;
|
||||
|
||||
// check HANDLE_MEMORY_INST in include/llvm/Instruction.def for memory
|
||||
|
Reference in New Issue
Block a user