WIP: disable intercept memove

Author: ser-mk

src/InlineInstrumentation.cpp

@@ -25,7 +25,7 @@ static const size_t kShadowScale = 4;
 
 static Function *MemStoreFn;
 static Function *MemLoadFn;
-static Function *MemMemmoveFn;
+//static Function *MemMemmoveFn;
 static Function *MemMemcpyFn;
 static Function *MemMemsetFn;
 
@@ -42,12 +42,12 @@ void initMemFn(Module &M, const std::string NameStore,  const std::string NameLo
     MemLoadFn = cast<Function>(M.getOrInsertFunction(NameLoad, IRB.getInt64Ty(), IRB.getInt8PtrTy(),
                                       IRB.getInt32Ty(), IRB.getInt32Ty())
                                );
-
+#if 0
     MemMemmoveFn = checkSanitizerInterfaceFunction( M.getOrInsertFunction(NameMemmove,
                                               IRB.getVoidTy(), IRB.getInt8PtrTy(),
                                               IRB.getInt8PtrTy(), IRB.getInt32Ty()
                                                                              ));
-
+#endif
     MemMemcpyFn = checkSanitizerInterfaceFunction((M.getOrInsertFunction(NameMemcpy,
                                               IRB.getVoidTy(), IRB.getInt8PtrTy(),
                                                      IRB.getInt8PtrTy(), IRB.getInt32Ty())
@@ -61,9 +61,10 @@ void initMemFn(Module &M, const std::string NameStore,  const std::string NameLo
 
 bool instrumentMemIntrinsic(MemIntrinsic *MI) {
     IRBuilder<> IRB(MI);
-    if (isa<MemTransferInst>(MI)) {
+    if (isa<MemTransferInst>(MI) && isa<MemCpyInst>(MI)) {
         IRB.CreateCall(
-            isa<MemMoveInst>(MI) ? MemMemmoveFn : MemMemcpyFn,
+            MemMemcpyFn,
+            //isa<MemMoveInst>(MI) ? MemMemmoveFn : MemMemcpyFn,
             {IRB.CreatePointerCast(MI->getOperand(0), IRB.getInt8PtrTy(), "dest_i8ptr_"),
              IRB.CreatePointerCast(MI->getOperand(1), IRB.getInt8PtrTy(), "src_i8ptr_"),
              IRB.CreateIntCast(MI->getOperand(2), IRB.getInt32Ty(), false, "size_int32_")});

test/ir/mem_fn.ll

@@ -28,7 +28,8 @@ define void @q(i8*) #0 {
 ; CHECK: call void @__adin_memcpy_(i8* %5, i8* bitcast (%union.SYSCTRL_OSC8M_Type* getelementptr inbounds (%struct.Sysctrl, %struct.Sysctrl* null, i32 0, i32 1) to i8*), i32 4)
 ; CHECK: call void @__adin_memcpy_(i8* bitcast (%union.SYSCTRL_OSC8M_Type* getelementptr inbounds (%struct.Sysctrl, %struct.Sysctrl* null, i32 0, i32 1) to i8*), i8* %6, i32 4)
 ; CHECK: call void @__adin_memset_(i8* %7, i8 0, i32 11)
-; CHECK: call void @__adin_memmove_(i8* %8, i8* %9, i32 11)
+; cHECK: call void @__adin_memmove_(i8* %8, i8* %9, i32 11)
+; CHECK: call void @llvm.memmove.p0i8.p0i8.i64(i8* %8, i8* %9, i64 11, i32 1, i1 false)
   ret void
 }