From: Brian Demsky <bdemsky@uci.edu>
Date: Mon, 22 Jul 2019 23:18:21 +0000 (-0700)
Subject: Merge branch 'master' of /home/git/cds-llvm
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=106fed033350a4949d394fa72b2cd91d0f036e59;hp=-c;p=c11llvm.git

Merge branch 'master' of /home/git/cds-llvm
---

106fed033350a4949d394fa72b2cd91d0f036e59
diff --combined CDSPass.cpp
index 164de72,d550140..50aca18
--- a/CDSPass.cpp
+++ b/CDSPass.cpp
@@@ -89,6 -89,7 +89,6 @@@ Type * Int64PtrTy
  Type * VoidTy;
  
  static const size_t kNumberOfAccessSizes = 4;
 -static const int volatile_order = 6;
  
  int getAtomicOrderIndex(AtomicOrdering order){
  	switch (order) {
@@@ -198,9 -199,9 +198,9 @@@ void CDSPass::initializeCallbacks(Modul
  		CDSLoad[i]  = M.getOrInsertFunction(LoadName, VoidTy, PtrTy);
  		CDSStore[i] = M.getOrInsertFunction(StoreName, VoidTy, PtrTy);
  		CDSVolatileLoad[i]  = M.getOrInsertFunction(VolatileLoadName,
 -									Ty, PtrTy, OrdTy, Int8PtrTy);
 +									Ty, PtrTy, Int8PtrTy);
  		CDSVolatileStore[i] = M.getOrInsertFunction(VolatileStoreName, 
 -									VoidTy, PtrTy, Ty, OrdTy, Int8PtrTy);
 +									VoidTy, PtrTy, Ty, Int8PtrTy);
  		CDSAtomicInit[i] = M.getOrInsertFunction(AtomicInitName, 
  								VoidTy, PtrTy, Ty, Int8PtrTy);
  		CDSAtomicLoad[i]  = M.getOrInsertFunction(AtomicLoadName, 
@@@ -384,8 -385,6 +384,6 @@@ bool CDSPass::runOnFunction(Function &F
  
  			Res = true;
  		}
- 
- 		F.dump();
  	}
  
  	return false;
@@@ -507,7 -506,8 +505,7 @@@ bool CDSPass::instrumentVolatile(Instru
  		if (Idx < 0)
  			return false;
  
 -		Value *order = ConstantInt::get(OrdTy, volatile_order);
 -		Value *args[] = {Addr, order, position};
 +		Value *args[] = {Addr, position};
  		Instruction* funcInst=CallInst::Create(CDSVolatileLoad[Idx], args);
  		ReplaceInstWithInst(LI, funcInst);
  	} else if (StoreInst *SI = dyn_cast<StoreInst>(I)) {
@@@ -518,7 -518,8 +516,7 @@@
  			return false;
  
  		Value *val = SI->getValueOperand();
 -		Value *order = ConstantInt::get(OrdTy, volatile_order);
 -		Value *args[] = {Addr, val, order, position};
 +		Value *args[] = {Addr, val, position};
  		Instruction* funcInst=CallInst::Create(CDSVolatileStore[Idx], args);
  		ReplaceInstWithInst(SI, funcInst);
  	} else {