open-dsi
/
clamav
mirror of https://github.com/Cisco-Talos/clamav
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bb#8352 - converted serveral llvm intrinsics functions to 64-bit from 32-bit to correct type mismatch with bytecode compiler

Browse Source
remotes/push_mirror/0.98.2
Kevin Lin 12 years ago
parent 90139dbc7b
commit 51abf545de
1 changed files with 11 additions and 11 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 22
      libclamav/c++/bytecode2llvm.cpp

22
libclamav/c++/bytecode2llvm.cpp
Unescape View File

@ -1620,7 +1620,7 @@ public:
Value *Dst = convertOperand(func, inst, inst->u.three[0]);
Dst = Builder.CreatePointerCast(Dst, PointerType::getUnqual(Type::getInt8Ty(Context)));
Value *Val = convertOperand(func, Type::getInt8Ty(Context), inst->u.three[1]);
Value *Len = convertOperand(func, Type::getInt32Ty(Context), inst->u.three[2]);
Value *Len = convertOperand(func, Type::getInt64Ty(Context), inst->u.three[2]);
#ifdef LLVM30
CallInst *c = Builder.CreateCall5(CF->FMemset, Dst, Val, Len,
ConstantInt::get(Type::getInt32Ty(Context), 1),
@ -1641,7 +1641,7 @@ public:
Dst = Builder.CreatePointerCast(Dst, PointerType::getUnqual(Type::getInt8Ty(Context)));
Value *Src = convertOperand(func, inst, inst->u.three[1]);
Src = Builder.CreatePointerCast(Src, PointerType::getUnqual(Type::getInt8Ty(Context)));
Value *Len = convertOperand(func, Type::getInt32Ty(Context), inst->u.three[2]);
Value *Len = convertOperand(func, Type::getInt64Ty(Context), inst->u.three[2]);
#ifdef LLVM30
CallInst *c = Builder.CreateCall5(CF->FMemcpy, Dst, Src, Len,
ConstantInt::get(Type::getInt32Ty(Context), 1),
@ -1662,7 +1662,7 @@ public:
Dst = Builder.CreatePointerCast(Dst, PointerType::getUnqual(Type::getInt8Ty(Context)));
Value *Src = convertOperand(func, inst, inst->u.three[1]);
Src = Builder.CreatePointerCast(Src, PointerType::getUnqual(Type::getInt8Ty(Context)));
Value *Len = convertOperand(func, Type::getInt32Ty(Context), inst->u.three[2]);
Value *Len = convertOperand(func, Type::getInt64Ty(Context), inst->u.three[2]);
#ifdef LLVM30
CallInst *c = Builder.CreateCall5(CF->FMemmove, Dst, Src, Len,
ConstantInt::get(Type::getInt32Ty(Context), 1),
@ -1896,7 +1896,7 @@ static void addFunctionProtos(struct CommonFunctions *CF, ExecutionEngine *EE, M
std::vector<constType*> args;
args.push_back(PointerType::getUnqual(Type::getInt8Ty(Context)));
args.push_back(Type::getInt8Ty(Context));
args.push_back(Type::getInt32Ty(Context));
args.push_back(Type::getInt64Ty(Context));
args.push_back(Type::getInt32Ty(Context));
#ifdef LLVM30
args.push_back(Type::getInt1Ty(Context));
@ -1905,9 +1905,9 @@ static void addFunctionProtos(struct CommonFunctions *CF, ExecutionEngine *EE, M
args, false);
CF->FMemset = Function::Create(FuncTy_3, GlobalValue::ExternalLinkage,
#ifdef LLVM30
"llvm.memset.p0i8.i32",
"llvm.memset.p0i8.i64",
#else
"llvm.memset.i32",
"llvm.memset.i64",
#endif
M);
CF->FMemset->setDoesNotThrow();
@ -1916,7 +1916,7 @@ static void addFunctionProtos(struct CommonFunctions *CF, ExecutionEngine *EE, M
args.clear();
args.push_back(PointerType::getUnqual(Type::getInt8Ty(Context)));
args.push_back(PointerType::getUnqual(Type::getInt8Ty(Context)));
args.push_back(Type::getInt32Ty(Context));
args.push_back(Type::getInt64Ty(Context));
args.push_back(Type::getInt32Ty(Context));
#ifdef LLVM30
args.push_back(Type::getInt1Ty(Context));
@ -1925,9 +1925,9 @@ static void addFunctionProtos(struct CommonFunctions *CF, ExecutionEngine *EE, M
args, false);
CF->FMemmove = Function::Create(FuncTy_4, GlobalValue::ExternalLinkage,
#ifdef LLVM30
"llvm.memmove.p0i8.i32",
"llvm.memmove.p0i8.i64",
#else
"llvm.memmove.i32",
"llvm.memmove.i64",
#endif
M);
CF->FMemmove->setDoesNotThrow();
@ -1935,9 +1935,9 @@ static void addFunctionProtos(struct CommonFunctions *CF, ExecutionEngine *EE, M
CF->FMemcpy = Function::Create(FuncTy_4, GlobalValue::ExternalLinkage,
#ifdef LLVM30
"llvm.memcpy.p0i8.p0i8.i32",
"llvm.memcpy.p0i8.p0i8.i64",
#else
"llvm.memcpy.i32",
"llvm.memcpy.i64",
#endif
M);
CF->FMemcpy->setDoesNotThrow();

Write Preview
Loading…
Cancel
Save