X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fcom%2Fbrian_web%2Fgcclass%2FGCClass.java;fp=src%2Fcom%2Fbrian_web%2Fgcclass%2FGCClass.java;h=86b427148c326658e189f8929049a98f722b8646;hb=6c5c8ed617e9e8f793cfbe9f0117440bfcb9a0a3;hp=02d89cb6f61a98c24311403ed0d1543873986121;hpb=431f2858571452178a061ba5737a36bd91c0482b;p=org.ibex.gcclass.git

diff --git a/src/com/brian_web/gcclass/GCClass.java b/src/com/brian_web/gcclass/GCClass.java
index 02d89cb..86b4271 100644
--- a/src/com/brian_web/gcclass/GCClass.java
+++ b/src/com/brian_web/gcclass/GCClass.java
@@ -48,7 +48,12 @@ public class GCClass {
             System.exit(1);
         }
         GCClass gc = new GCClass(args[0]);
-        for(int i=2;i<args.length;i++) gc.referenceMethod(args[i]);
+        for(int i=2;i<args.length;i++) {
+            if(args[i].startsWith("hint:"))
+                gc.parseHint(args[i].substring(5));
+            else
+                gc.referenceMethod(args[i]);
+        }
         gc.go();
         gc.dump(new File(args[1]));
     }
@@ -58,6 +63,7 @@ public class GCClass {
     private final Hashtable completed = new Hashtable();
     private final Hashtable references = new Hashtable();
     private final Hashtable instansiated = new Hashtable();
+    private final Hashtable hints = new Hashtable();
     
     public GCClass(String classpath) throws ClassNotFoundException {
         if(classpath.startsWith("="))
@@ -115,6 +121,28 @@ public class GCClass {
             }
         }
     }
+    
+    public void parseHint(String s) throws ClassNotFoundException {
+        int p = s.indexOf(':');
+        if(p == -1) throw new IllegalArgumentException("invalid  hint");
+        String cms = s.substring(0,p);
+        String hint = s.substring(p+1);
+        p = cms.lastIndexOf('.');
+        if(p == -1)  throw new IllegalArgumentException("invalid hint");
+        String cs = cms.substring(0,p);
+        String ms = cms.substring(p+1);
+        
+        JavaClass c = repoGet(cs);
+        Method[] methods = c.getMethods();
+        for(int i=0;i<methods.length;i++) {
+            if(ms.equals("*") || methods[i].getName().equals(ms)) {
+                MethodRef mr = new MethodRef(c,methods[i]);
+                Vector v = (Vector) hints.get(mr);
+                if(v == null) hints.put(mr,v=new Vector());
+                v.add(hint);
+            }
+        }
+    }
         
     private final void referenceMethod(MethodRef m) {
         if(completed.get(m) != null) return;
@@ -172,15 +200,16 @@ public class GCClass {
             }
         }
     }
-    
+        
     private void fixup() throws ClassNotFoundException {
         for(Enumeration e = references.keys(); e.hasMoreElements(); ) {
             ObjectType t = (ObjectType) e.nextElement();
             JavaClass c = repoGet(t);
-            if(c == null) continue;
-            
             Hashtable refs = (Hashtable) references.get(t);
-            // add a ref to clinit is any fields/methods are referenced
+             
+            if(c == null) continue;
+           
+            // add a ref to clinit if any fields/methods are referenced
             if(refs.size() != 0) {
                 MethodRef clinit = new MethodRef(t,"<clinit>",Type.VOID,Type.NO_ARGS);
                 if(findMethod(c,clinit) != null) referenceMethod(clinit);
@@ -276,6 +305,11 @@ public class GCClass {
             else if(i instanceof InvokeInstruction) // INVOKESTATIC, INVOKEVIRTUAL, INVOKESPECIAL
                 referenceMethod(new MethodRef((InvokeInstruction)i,cpg,mr));
         }
+        
+        if(hints.get(mr) != null) {
+            Vector v = (Vector) hints.get(mr);
+            for(int i=0;i<v.size();i++) referenceMethod((String) v.elementAt(i));
+        }
     }
     
     private void process(FieldRef fr) throws ClassNotFoundException {