opcodes を cflib に変更したことにともなう変更．

[stigmata/stigmata-plugins.git] / wsp / src / main / java / jp / sourceforge / stigmata / birthmarks / wsp / StackPatternBasedBirthmarkExtractor.java

diff --git a/wsp/src/main/java/jp/sourceforge/stigmata/birthmarks/wsp/StackPatternBasedBirthmarkExtractor.java b/wsp/src/main/java/jp/sourceforge/stigmata/birthmarks/wsp/StackPatternBasedBirthmarkExtractor.java
index fd722fc..db88032 100644 (file)
--- a/wsp/src/main/java/jp/sourceforge/stigmata/birthmarks/wsp/StackPatternBasedBirthmarkExtractor.java
+++ b/wsp/src/main/java/jp/sourceforge/stigmata/birthmarks/wsp/StackPatternBasedBirthmarkExtractor.java
@@ -6,7 +6,6 @@ package jp.sourceforge.stigmata.birthmarks.wsp;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -15,16 +14,15 @@ import jp.sourceforge.stigmata.BirthmarkContext;
 import jp.sourceforge.stigmata.BirthmarkElement;
 import jp.sourceforge.stigmata.ExtractionUnit;
 import jp.sourceforge.stigmata.birthmarks.ASMBirthmarkExtractor;
+import jp.sourceforge.stigmata.birthmarks.BirthmarkElementBuilder;
 import jp.sourceforge.stigmata.birthmarks.BirthmarkExtractVisitor;
-import jp.sourceforge.stigmata.plugins.LabelOpcode;
-import jp.sourceforge.stigmata.plugins.Opcode;
-import jp.sourceforge.stigmata.plugins.OpcodeExtractMethodVisitor;
+import jp.sourceforge.stigmata.birthmarks.LabelOpcode;
+import jp.sourceforge.stigmata.birthmarks.Opcode;
+import jp.sourceforge.stigmata.birthmarks.OpcodeExtractVisitor;
 import jp.sourceforge.stigmata.spi.BirthmarkSpi;
 
-import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
 
 /**
  *
@@ -38,7 +36,7 @@ public class StackPatternBasedBirthmarkExtractor extends ASMBirthmarkExtractor{
 
     @Override
     public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkContext context){
-        return new Visitor(writer, birthmark, context);
+        return new OpcodeExtractVisitor(writer, birthmark, context, new WSPBirthmarkElementBuilder());
     }
 
     @Override
@@ -48,79 +46,55 @@ public class StackPatternBasedBirthmarkExtractor extends ASMBirthmarkExtractor{
         };
     }
 
-    private BirthmarkElement[] buildElement(List<Opcode> opcodes, BirthmarkContext context){
-        List<CurrentDepth> pattern = buildStackPattern(opcodes, context);
-        List<BirthmarkElement> elements = new ArrayList<BirthmarkElement>();
-
-        List<CurrentDepth> subPattern = new ArrayList<CurrentDepth>();
-        for(CurrentDepth depth: pattern){
-            subPattern.add(depth);
-            if(depth.getDepth() == 0){
-                elements.add(new StackPatternBasedBirthmarkElement(subPattern.toArray(new CurrentDepth[subPattern.size()])));
-                subPattern.clear();
+    private static class WSPBirthmarkElementBuilder implements BirthmarkElementBuilder{
+        public BirthmarkElement[] buildElements(List<Opcode> opcodes, BirthmarkContext context){
+            List<CurrentDepth> pattern = buildStackPattern(opcodes, context);
+            List<BirthmarkElement> elements = new ArrayList<BirthmarkElement>();
+
+            List<CurrentDepth> subPattern = new ArrayList<CurrentDepth>();
+            for(CurrentDepth depth: pattern){
+                subPattern.add(depth);
+                if(depth.getDepth() == 0){
+                    elements.add(new StackPatternBasedBirthmarkElement(subPattern.toArray(new CurrentDepth[subPattern.size()])));
+                    subPattern.clear();
+                }
             }
-        }
-        elements.add(new StackPatternBasedBirthmarkElement(subPattern.toArray(new CurrentDepth[subPattern.size()])));
+            elements.add(new StackPatternBasedBirthmarkElement(subPattern.toArray(new CurrentDepth[subPattern.size()])));
 
-        return elements.toArray(new BirthmarkElement[elements.size()]);
-    }
-
-    @SuppressWarnings("unchecked")
-    private List<CurrentDepth> buildStackPattern(List<Opcode> opcodes, BirthmarkContext context){
-        Map<Label, Integer> tableMap = new HashMap<Label, Integer>();
-        List<CurrentDepth> pattern = new ArrayList<CurrentDepth>();
-        Map<Integer, Integer> weights = (Map<Integer, Integer>)context.getProperty("birthmarks.wsp.weights");
+            return elements.toArray(new BirthmarkElement[elements.size()]);
+        }
 
-        int currentDepth = 0;
-        Integer forwardedStatus = null;
-        for(Opcode opcode: opcodes){
-            if(opcode.getCategory() == Opcode.Category.TARGETER){
-                forwardedStatus = tableMap.get(((LabelOpcode)opcode).getLabel());
-            }
-            else{
-                opcode.setWeight(weights.get(opcode.getOpcode()));
-                if(forwardedStatus == null){
-                    currentDepth += opcode.getAct();
+        @SuppressWarnings("unchecked")
+        private List<CurrentDepth> buildStackPattern(List<Opcode> opcodes, BirthmarkContext context){
+            Map<Label, Integer> tableMap = new HashMap<Label, Integer>();
+            List<CurrentDepth> pattern = new ArrayList<CurrentDepth>();
+            Map<Integer, Integer> weights = (Map<Integer, Integer>)context.getProperty("birthmarks.wsp.weights");
+
+            int currentDepth = 0;
+            Integer forwardedStatus = null;
+            for(Opcode opcode: opcodes){
+                if(opcode.getCategory() == Opcode.Category.TARGETER){
+                    forwardedStatus = tableMap.get(((LabelOpcode)opcode).getLabel());
                 }
                 else{
-                    currentDepth = forwardedStatus + opcode.getAct();
-                }
-                forwardedStatus = null;
+                    WSPOpcode wspOpcode = new WSPOpcode(opcode, weights.get(opcode.getOpcode()));
+                    if(forwardedStatus == null){
+                        currentDepth += opcode.getAct();
+                    }
+                    else{
+                        currentDepth = forwardedStatus + opcode.getAct();
+                    }
+                    forwardedStatus = null;
 
-                pattern.add(new CurrentDepth(currentDepth, opcode));
-                if(opcode.getCategory() == Opcode.Category.BRANCH){
-                    for(Iterator<Label> i = opcode.labels(); i.hasNext(); ){
-                        Label label = i.next();
-                        tableMap.put(label, currentDepth);
+                    pattern.add(new CurrentDepth(currentDepth, wspOpcode));
+                    if(opcode.getCategory() == Opcode.Category.BRANCH){
+                        for(Label label: opcode.getLabels()){
+                            tableMap.put(label, currentDepth);
+                        }
                     }
                 }
             }
-        }
-        return pattern;
-    }
-
-    private class Visitor extends BirthmarkExtractVisitor{
-        private List<Opcode> opcodeList = new ArrayList<Opcode>();
-
-        public Visitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkContext context){
-            super(visitor, birthmark, context);
-        }
-
-        public void visitEnd(){
-            BirthmarkElement[] elements = buildElement(opcodeList, getContext());
-            for(BirthmarkElement element: elements){
-                addElement(element);
-            }
-        }
-
-        @Override
-        public MethodVisitor visitMethod(int arg0, String arg1, String arg2, String arg3, String[] arg4){
-            MethodVisitor visitor = super.visitMethod(arg0, arg1, arg2, arg3, arg4);
-            OpcodeExtractMethodVisitor opcodeVisitor = new OpcodeExtractMethodVisitor(visitor, opcodeList);
-
-            return opcodeVisitor;
+            return pattern;
         }
     };
-
-
 }