automated reading and writing of GenericAttribute tags

Rroscha · Dec 14, 2011 · 7715d8f · 7715d8f
1 parent e854fc6
commit 7715d8f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -54,6 +54,8 @@ Improvements and API changes in trunk
 9. Improved support for custom entry points in the points-to analysis.
 10.Added option allowing putiry analysis to add a "Pure" bytecode
    attribute for pure methods.
+11.GenericAttribute instances are now automatically read from class
+   files and stored in class files.
 
 Improvements and API changes in version 2.4.0
 

diff --git a/src/soot/coffi/ClassFile.java b/src/soot/coffi/ClassFile.java
@@ -786,6 +786,7 @@ else if (s.compareTo(attribute_info.AnnotationDefault)==0){
             }
             a = (attribute_info)ga;
          }
+         if(this.toString().endsWith("Main")) System.out.println(s);
          a.attribute_name = j;
          a.attribute_length = len;
          ai[i] = a;

diff --git a/src/soot/coffi/Util.java b/src/soot/coffi/Util.java
@@ -205,6 +205,12 @@ else if (fieldInfo.attributes[j] instanceof Signature_attribute){
                 else if (fieldInfo.attributes[j] instanceof RuntimeVisibleAnnotations_attribute || fieldInfo.attributes[j] instanceof RuntimeInvisibleAnnotations_attribute)
                 {
                     addAnnotationVisibilityAttribute(field, fieldInfo.attributes[j], coffiClass, references);
+                }
+                else if (fieldInfo.attributes[j] instanceof Generic_attribute)
+                {        	
+                	Generic_attribute attr = (Generic_attribute) fieldInfo.attributes[j];
+                    String name = ((CONSTANT_Utf8_info)(coffiClass.constant_pool[attr.attribute_name])).convert();
+        			field.addTag(new GenericAttribute(name, attr.info));
                 }
 		    }
         }
@@ -295,6 +301,12 @@ else if (methodInfo.attributes[j] instanceof AnnotationDefault_attribute)
                         ArrayList<AnnotationElem> list = createElementTags(1, coffiClass, input);
                         method.addTag(new AnnotationDefaultTag(list.get(0)));
                     }
+                    else if (methodInfo.attributes[j] instanceof Generic_attribute)
+                    {        	
+                    	Generic_attribute attr = (Generic_attribute) methodInfo.attributes[j];
+                        String name = ((CONSTANT_Utf8_info)(coffiClass.constant_pool[attr.attribute_name])).convert();
+            			method.addTag(new GenericAttribute(name, attr.info));
+                    }
                 }
             }
 
@@ -401,6 +413,12 @@ else if (coffiClass.attributes[i] instanceof RuntimeVisibleAnnotations_attribute
         {
             addAnnotationVisibilityAttribute(bclass, coffiClass.attributes[i], coffiClass, references);
         }
+        else if (coffiClass.attributes[i] instanceof Generic_attribute)
+        {        	
+        	Generic_attribute attr = (Generic_attribute) coffiClass.attributes[i];
+            String name = ((CONSTANT_Utf8_info)(coffiClass.constant_pool[attr.attribute_name])).convert();
+			bclass.addTag(new GenericAttribute(name, attr.info));
+        }
 
     }
     }

diff --git a/src/soot/tagkit/GenericAttribute.java b/src/soot/tagkit/GenericAttribute.java
@@ -44,8 +44,9 @@ public class GenericAttribute implements Attribute
 
     public GenericAttribute(String name, byte[] value)
     {
-	mName = name;
-	mValue = value;
+    	if(value==null) value = new byte[0];
+		mName = name;
+		mValue = value;
     }
     public String getName()
     {