Adding ability to retrieve constants from ConstantValueTags

Author: MarcMil

src/soot/tagkit/ConstantValueTag.java

@@ -25,21 +25,24 @@
 
 package soot.tagkit;
 
-public abstract class ConstantValueTag implements Tag
-{
-    protected byte[] bytes;			// encoded constant
-
-    protected ConstantValueTag() {
-    }
-
-    public String getName() {
-	String className = getClass().getName();
-	return className.substring(className.lastIndexOf('.') + 1);
-    }
-
-    public byte[] getValue() {
-	return bytes;
-    }
-    public abstract String toString();
-}
+import soot.jimple.Constant;
+
+public abstract class ConstantValueTag implements Tag {
+	protected byte[] bytes; // encoded constant
+
+	protected ConstantValueTag() {
+	}
+
+	public String getName() {
+		String className = getClass().getName();
+		return className.substring(className.lastIndexOf('.') + 1);
+	}
 
+	public byte[] getValue() {
+		return bytes;
+	}
+
+	public abstract Constant getConstant();
+
+	public abstract String toString();
+}

src/soot/tagkit/DoubleConstantValueTag.java

@@ -25,6 +25,9 @@
 
 package soot.tagkit;
 
+import soot.jimple.Constant;
+import soot.jimple.DoubleConstant;
+
 public class DoubleConstantValueTag extends ConstantValueTag
 {
     private final double value;
@@ -72,5 +75,10 @@ public DoubleConstantValueTag(double val){
     public String toString() {
         return "ConstantValue: "+Double.toString(value);
     }
+
+	@Override
+	public DoubleConstant getConstant() {
+		return DoubleConstant.v(value);
+	}
 }
 

src/soot/tagkit/FloatConstantValueTag.java

@@ -25,6 +25,9 @@
 
 package soot.tagkit;
 
+import soot.jimple.Constant;
+import soot.jimple.FloatConstant;
+
 public class FloatConstantValueTag extends ConstantValueTag
 {
     private final float value;
@@ -64,5 +67,10 @@ public float getFloatValue() {
     public String toString() {
         return "ConstantValue: "+Float.toString(value);
     }
+
+	@Override
+	public FloatConstant getConstant() {
+		return FloatConstant.v(value);
+	}
 }
 

src/soot/tagkit/IntegerConstantValueTag.java

@@ -25,25 +25,27 @@
 
 package soot.tagkit;
 
-public class IntegerConstantValueTag extends ConstantValueTag
-{
-    private final int value;
-
-    public IntegerConstantValueTag(int value) {
-	this.value = value;
-	this.bytes = new byte[] {
-	  (byte)((value >> 24) & 0xff),
-	  (byte)((value >> 16) & 0xff),
-	  (byte)((value >>  8) & 0xff),
-	  (byte)((value      ) & 0xff)
-	};
-    }
-
-    public int getIntValue() {
-	return value;
-    }
-    public String toString() {
-        return "ConstantValue: "+Integer.toString(value);
-    }
-}
+import soot.jimple.IntConstant;
+
+public class IntegerConstantValueTag extends ConstantValueTag {
+	private final int value;
+
+	public IntegerConstantValueTag(int value) {
+		this.value = value;
+		this.bytes = new byte[] { (byte) ((value >> 24) & 0xff), (byte) ((value >> 16) & 0xff),
+				(byte) ((value >> 8) & 0xff), (byte) ((value) & 0xff) };
+	}
 
+	public int getIntValue() {
+		return value;
+	}
+
+	public String toString() {
+		return "ConstantValue: " + Integer.toString(value);
+	}
+
+	@Override
+	public IntConstant getConstant() {
+		return IntConstant.v(value);
+	}
+}

src/soot/tagkit/LongConstantValueTag.java

@@ -25,29 +25,28 @@
 
 package soot.tagkit;
 
-public class LongConstantValueTag extends ConstantValueTag
-{
-    private final long value;
-
-    public LongConstantValueTag(long value) {
-	this.value = value;
-	this.bytes = new byte[] {
-	  (byte)((value >> 56) & 0xff),
-	  (byte)((value >> 48) & 0xff),
-	  (byte)((value >> 40) & 0xff),
-	  (byte)((value >> 32) & 0xff),
-	  (byte)((value >> 24) & 0xff),
-	  (byte)((value >> 16) & 0xff),
-	  (byte)((value >>  8) & 0xff),
-	  (byte)((value      ) & 0xff)
-	};
-    }
-
-    public long getLongValue() {
-	return value;
-    }
-    public String toString() {
-        return "ConstantValue: "+Long.toString(value);
-    }
-}
+import soot.jimple.LongConstant;
+
+public class LongConstantValueTag extends ConstantValueTag {
+	private final long value;
+
+	public LongConstantValueTag(long value) {
+		this.value = value;
+		this.bytes = new byte[] { (byte) ((value >> 56) & 0xff), (byte) ((value >> 48) & 0xff),
+				(byte) ((value >> 40) & 0xff), (byte) ((value >> 32) & 0xff), (byte) ((value >> 24) & 0xff),
+				(byte) ((value >> 16) & 0xff), (byte) ((value >> 8) & 0xff), (byte) ((value) & 0xff) };
+	}
 
+	public long getLongValue() {
+		return value;
+	}
+
+	public String toString() {
+		return "ConstantValue: " + Long.toString(value);
+	}
+
+	@Override
+	public LongConstant getConstant() {
+		return LongConstant.v(value);
+	}
+}

src/soot/tagkit/StringConstantValueTag.java

@@ -26,21 +26,26 @@
 package soot.tagkit;
 
 import soot.coffi.CONSTANT_Utf8_info;
+import soot.jimple.StringConstant;
 
-public class StringConstantValueTag extends ConstantValueTag
-{
-    private final String value;
-
-    public StringConstantValueTag(String value) {
-	this.value = value;
-	this.bytes = CONSTANT_Utf8_info.toUtf8(value);
-    }
-
-    public String getStringValue() {
-	return value;
-    }
-    public String toString() {
-        return "ConstantValue: "+value;
-    }
-}
+public class StringConstantValueTag extends ConstantValueTag {
+	private final String value;
+
+	public StringConstantValueTag(String value) {
+		this.value = value;
+		this.bytes = CONSTANT_Utf8_info.toUtf8(value);
+	}
+
+	public String getStringValue() {
+		return value;
+	}
 
+	public String toString() {
+		return "ConstantValue: " + value;
+	}
+
+	@Override
+	public StringConstant getConstant() {
+		return StringConstant.v(value);
+	}
+}