@@ -1721,8 +1721,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]);

+			    Value *Len = convertOperand(func, Type::getInt32Ty(Context), inst->u.three[2]);

 #if LLVM_VERSION < 29

 			    CallInst *c = Builder.CreateCall4(CF->FMemset, Dst, Val, Len,

 								ConstantInt::get(Type::getInt32Ty(Context), 1));

@@ -1743,8 +1742,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]);

+			    Value *Len = convertOperand(func, Type::getInt32Ty(Context), inst->u.three[2]);

 #if LLVM_VERSION < 29

 			    CallInst *c = Builder.CreateCall4(CF->FMemcpy, Dst, Src, Len,

 								ConstantInt::get(Type::getInt32Ty(Context), 1));

@@ -1765,8 +1763,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]);

+			    Value *Len = convertOperand(func, Type::getInt32Ty(Context), inst->u.three[2]);

 #if LLVM_VERSION < 29

 			    CallInst *c = Builder.CreateCall4(CF->FMemmove, Dst, Src, Len,

 								ConstantInt::get(Type::getInt32Ty(Context), 1));

@@ -2031,8 +2028,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));

     args.push_back(Type::getInt32Ty(Context));

 #if LLVM_VERSION >= 29

     args.push_back(Type::getInt1Ty(Context));

@@ -2041,11 +2037,9 @@ static void addFunctionProtos(struct CommonFunctions *CF, ExecutionEngine *EE, M

 					       args, false);

     CF->FMemset = Function::Create(FuncTy_3, GlobalValue::ExternalLinkage,

 #if LLVM_VERSION < 29

-                                   //"llvm.memset.i32",

-                                   "llvm.memset.i64",

+                                   "llvm.memset.i32",

 #else

-                                   //"llvm.memset.p0i8.i32",

-                                   "llvm.memset.p0i8.i64",

+                                   "llvm.memset.p0i8.i32",

 #endif

                                    M);

     CF->FMemset->setDoesNotThrow();

@@ -2058,8 +2052,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));

     args.push_back(Type::getInt32Ty(Context));

 #if LLVM_VERSION >= 29

     args.push_back(Type::getInt1Ty(Context));

@@ -2068,11 +2061,9 @@ static void addFunctionProtos(struct CommonFunctions *CF, ExecutionEngine *EE, M

 					       args, false);

     CF->FMemmove = Function::Create(FuncTy_4, GlobalValue::ExternalLinkage,

 #if LLVM_VERSION < 29

-                                    //"llvm.memmove.i32",

-                                    "llvm.memcpy.i64",

+                                    "llvm.memmove.i32",

 #else

-                                    //"llvm.memmove.p0i8.i32",

-                                    "llvm.memmove.p0i8.i64",

+                                    "llvm.memmove.p0i8.i32",

 #endif

                                     M);

     CF->FMemmove->setDoesNotThrow();

@@ -2084,11 +2075,9 @@ static void addFunctionProtos(struct CommonFunctions *CF, ExecutionEngine *EE, M

     CF->FMemcpy = Function::Create(FuncTy_4, GlobalValue::ExternalLinkage,

 #if LLVM_VERSION < 29

-                                   //"llvm.memcpy.i32",

-                                   "llvm.memcpy.i64",

+                                   "llvm.memcpy.i32",

 #else

-                                   //"llvm.memcpy.p0i8.p0i8.i32",

-                                   "llvm.memcpy.p0i8.p0i8.i64",

+                                   "llvm.memcpy.p0i8.p0i8.i32",

 #endif

                                    M);

     CF->FMemcpy->setDoesNotThrow();