DASCA
/
DASCA
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use SSAInstructionKey for map sgNodesInstId.

This commit is contained in:
Achim D. Brucker 2016-09-18 02:00:09 +01:00
parent 61575d6769
commit 9514d3633c
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/eu.aniketos.dasca.dataflow/src/main/java/eu/aniketos/dasca/dataflow/util/SuperGraphUtil.java
View File

@ -129,7 +129,7 @@ public class SuperGraphUtil {
HashMap<Integer, BasicBlockInContext<IExplodedBasicBlock>> sgNodes = new HashMap<Integer, BasicBlockInContext<IExplodedBasicBlock>>(); HashMap<Integer, BasicBlockInContext<IExplodedBasicBlock>> sgNodes = new HashMap<Integer, BasicBlockInContext<IExplodedBasicBlock>>();
HashMap<BasicBlockInContext<IExplodedBasicBlock>, Integer> sgNodesReversed = new HashMap<BasicBlockInContext<IExplodedBasicBlock>, Integer>(); HashMap<BasicBlockInContext<IExplodedBasicBlock>, Integer> sgNodesReversed = new HashMap<BasicBlockInContext<IExplodedBasicBlock>, Integer>();
HashMap<SSAInstruction, Integer> sgNodesInstId = new HashMap<SSAInstruction, Integer>(); HashMap<SSAInstructionKey, Integer> sgNodesInstId = new HashMap<SSAInstructionKey, Integer>();
ArrayList<MethodReference> acceptedMethods = new ArrayList<MethodReference>(); ArrayList<MethodReference> acceptedMethods = new ArrayList<MethodReference>();
// Add all blocks into a Map with a unique identifier in both directions and find entry/exit node // Add all blocks into a Map with a unique identifier in both directions and find entry/exit node
@ -144,7 +144,7 @@ public class SuperGraphUtil {
Iterator<SSAInstruction> instIt = current.iterator(); Iterator<SSAInstruction> instIt = current.iterator();
while (instIt.hasNext()) { while (instIt.hasNext()) {
SSAInstruction inst = instIt.next(); SSAInstruction inst = instIt.next();
sgNodesInstId.put(inst, i); sgNodesInstId.put(new SSAInstructionKey(inst), i);
log.debug(" sgNodesInstId: insert node "+i+" ==> "+inst); log.debug(" sgNodesInstId: insert node "+i+" ==> "+inst);
/* add to include other required methods into CFG /* add to include other required methods into CFG
if(inst instanceof AstJavaInvokeInstruction){ if(inst instanceof AstJavaInvokeInstruction){
@ -276,13 +276,13 @@ public class SuperGraphUtil {
ArrayList<SSAInstruction> conditionsList = AnalysisUtil.getConditions(sgNodes); ArrayList<SSAInstruction> conditionsList = AnalysisUtil.getConditions(sgNodes);
ArrayList<Integer> conditionsIdList = new ArrayList<Integer>(); ArrayList<Integer> conditionsIdList = new ArrayList<Integer>();
for (SSAInstruction cond : conditionsList) { for (SSAInstruction cond : conditionsList) {
conditionsIdList.add(sgNodesInstId.get(cond)); conditionsIdList.add(sgNodesInstId.get(new SSAInstructionKey(cond)));
} }
//*/ //*/
//* <<< get the corresponding source code line number for each condition (node id) inside the callgraph //* <<< get the corresponding source code line number for each condition (node id) inside the callgraph
HashMap<Integer, Integer> conditionLineNumber = new HashMap<Integer, Integer>(); HashMap<Integer, Integer> conditionLineNumber = new HashMap<Integer, Integer>();
for (SSAInstruction instCondition : conditionsList) { for (SSAInstruction instCondition : conditionsList) {
int nodeId = sgNodesInstId.get(instCondition); int nodeId = sgNodesInstId.get(new SSAInstructionKey(instCondition));
int lineNumber = lineNumbers.get(instCondition); int lineNumber = lineNumbers.get(instCondition);
conditionLineNumber.put(nodeId, lineNumber); conditionLineNumber.put(nodeId, lineNumber);
} }
@ -297,13 +297,13 @@ public class SuperGraphUtil {
vc.pop(); vc.pop();
vc.push(); vc.push();
for (SSAInstruction instCondition : conditionsList) { for (SSAInstruction instCondition : conditionsList) {
int condId = sgNodesInstId.get(instCondition); int condId = sgNodesInstId.get(new SSAInstructionKey(instCondition));
if(loops.keySet().contains(condId)) { if(loops.keySet().contains(condId)) {
Expr expr = SMTChecker.getExprForLoop(vc , instCondition, entryIR); Expr expr = SMTChecker.getExprForLoop(vc , instCondition, entryIR);
expressions.put(sgNodesInstId.get(instCondition), expr); expressions.put(sgNodesInstId.get(new SSAInstructionKey(instCondition)), expr);
} else { } else {
Expr expr = SMTChecker.getExprForConditionalBranchInstruction(vc , instCondition, entryIR); Expr expr = SMTChecker.getExprForConditionalBranchInstruction(vc , instCondition, entryIR);
expressions.put(sgNodesInstId.get(instCondition), expr); expressions.put(sgNodesInstId.get(new SSAInstructionKey(instCondition)), expr);
} }
vc.pop(); vc.pop();
vc.push(); vc.push();
@ -357,9 +357,9 @@ public class SuperGraphUtil {
boolean isNotSanitized = true; boolean isNotSanitized = true;
if(analysisLevel >= AnalysisUtil.ANALYSIS_DEPTH_SANITIZING) { if(analysisLevel >= AnalysisUtil.ANALYSIS_DEPTH_SANITIZING) {
log.debug("Calling isNotSanitized:"); log.debug("Calling isNotSanitized:");
log.debug(" Source (" + sgNodesInstId.get(source.toString()) + "): " + source); log.debug(" Source (" + sgNodesInstId.get(new SSAInstructionKey(source)) + "): " + source);
log.debug(" Sink (" + sgNodesInstId.get(sink.toString()) + "): " + sink); log.debug(" Sink (" + sgNodesInstId.get(new SSAInstructionKey(sink)) + "): " + sink);
isNotSanitized = isNotSanitized(sgNodesInstId.get(source), sgNodesInstId.get(sink), adjList, finalConditions, expressions, vc, conditionsIdList, sanitizer, sgNodes); isNotSanitized = isNotSanitized(sgNodesInstId.get(new SSAInstructionKey(source)), sgNodesInstId.get(new SSAInstructionKey(sink)), adjList, finalConditions, expressions, vc, conditionsIdList, sanitizer, sgNodes);
} }
if(isNotSanitized) { if(isNotSanitized) {
weaknessCount++; weaknessCount++;
@ -522,13 +522,13 @@ public class SuperGraphUtil {
*/ */
private static boolean isNotMutuallyExclusive(SSAInstruction sink, private static boolean isNotMutuallyExclusive(SSAInstruction sink,
SSAInstruction source, SSAInstruction source,
HashMap<SSAInstruction, Integer> sgNodesInstId, HashMap<SSAInstructionKey, Integer> sgNodesInstId,
HashMap<Integer,ArrayList<Integer>> finalConditions, HashMap<Integer,ArrayList<Integer>> finalConditions,
HashMap<Integer, Expr> expressions, ValidityChecker vc) { HashMap<Integer, Expr> expressions, ValidityChecker vc) {
vc.pop(); vc.pop();
vc.push(); vc.push();
int sourceId = sgNodesInstId.get(source); int sourceId = sgNodesInstId.get(new SSAInstructionKey(source));
int sinkId = sgNodesInstId.get(sink); int sinkId = sgNodesInstId.get(new SSAInstructionKey(sink));
ArrayList<Integer> combinedConditions = new ArrayList<Integer>(); ArrayList<Integer> combinedConditions = new ArrayList<Integer>();
if(finalConditions.containsKey(sourceId)) { if(finalConditions.containsKey(sourceId)) {
combinedConditions.addAll(finalConditions.get(sourceId)); combinedConditions.addAll(finalConditions.get(sourceId));