X-Git-Url: http://git.megacz.com/?p=org.ibex.classgen.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fclassgen%2FMethodGen.java;h=854b76a6b25635606dec35bddaac2361d2c2f5d1;hp=baf7fe3f4e79842af1741c592987e7ac48e5cf94;hb=76a1336320be6b7dbae29acd341659ed648f9487;hpb=72cc9664e25a90f5241c9f4c39319889cd36ed15
diff --git a/src/org/ibex/classgen/MethodGen.java b/src/org/ibex/classgen/MethodGen.java
index baf7fe3..854b76a 100644
--- a/src/org/ibex/classgen/MethodGen.java
+++ b/src/org/ibex/classgen/MethodGen.java
@@ -5,12 +5,12 @@ import java.util.*;
/** A class representing a method in a generated classfile
@see ClassFile#addMethod */
-public class MethodGen implements CGConst {
+public class MethodGen extends Type.Class.Method.Body implements CGConst {
private final static boolean EMIT_NOPS = false;
private static final int NO_CODE = -1;
- private final Type.Class.Method method;
+ public final Type.Class.Method method;
private final int flags;
private final ClassFile.AttrGen attrs;
private final ClassFile.AttrGen codeAttrs;
@@ -25,10 +25,12 @@ public class MethodGen implements CGConst {
private byte[] op;
private Object[] arg;
private ConstantPool.Ent[] cparg;
-
+
+
// Constructors //////////////////////////////////////////////////////////////////////////////
MethodGen(Type.Class.Method method, int flags) {
+ method.super();
if ((flags & ~VALID_METHOD_FLAGS) != 0) throw new IllegalArgumentException("invalid flags");
this.method = method;
this.flags = flags;
@@ -42,10 +44,16 @@ public class MethodGen implements CGConst {
}
MethodGen(Type.Class c, DataInput in, ConstantPool cp) throws IOException {
- this.flags = in.readShort();
+ this(in.readShort(), cp.getUtf8KeyByIndex(in.readShort()), c, in, cp); }
+
+ private MethodGen(short flags, String name, Type.Class c, DataInput in, ConstantPool cp) throws IOException {
+ this(flags, name, c.method(name+cp.getUtf8KeyByIndex(in.readShort())), c, in, cp); }
+ private MethodGen(short flags, String name, Type.Class.Method m,
+ Type.Class c, DataInput in, ConstantPool cp) throws IOException {
+ m.super();
+ this.flags = flags;
if ((flags & ~VALID_METHOD_FLAGS) != 0) throw new ClassFile.ClassReadExn("invalid flags");
- String name = cp.getUtf8KeyByIndex(in.readShort());
- this.method = c.method(name+cp.getUtf8KeyByIndex(in.readShort()));
+ this.method = m;
this.attrs = new ClassFile.AttrGen(in,cp);
if ((flags & (NATIVE|ABSTRACT))==0) {
@@ -291,7 +299,8 @@ public class MethodGen implements CGConst {
}
/** Adds a exception type that can be thrown from this method
- NOTE: This isn't enforced by the JVM. This is for reference only. A method can throw exceptions not declared to be thrown
+ NOTE: This isn't enforced by the JVM. This is for reference
+ only. A method can throw exceptions not declared to be thrown
@param type The type of exception that can be thrown
*/
public final void addThrow(Type.Class type) { thrownExceptions.put(type, type); }
@@ -315,6 +324,9 @@ public class MethodGen implements CGConst {
// Accessors //////////////////////////////////////////////////////////////////////////////
+ public int getFlags() { return flags; }
+ public Hashtable getThrownExceptions() { return thrownExceptions; }
+
/** Returns the size (in instructions) of this method
@return The size of the method (in instructions)
*/
@@ -547,30 +559,6 @@ public class MethodGen implements CGConst {
// Emitting Bits //////////////////////////////////////////////////////////////////////////////
- /** Negates the IF* instruction, op (IF_ICMPGT -> IF_ICMPLE, IFNE -> IFEQ, etc)
- @exception IllegalArgumentException if op isn't an IF* instruction */
- public static byte negate(byte op) {
- switch(op) {
- case IFEQ: return IFNE;
- case IFNE: return IFEQ;
- case IFLT: return IFGE;
- case IFGE: return IFLT;
- case IFGT: return IFLE;
- case IFLE: return IFGT;
- case IF_ICMPEQ: return IF_ICMPNE;
- case IF_ICMPNE: return IF_ICMPEQ;
- case IF_ICMPLT: return IF_ICMPGE;
- case IF_ICMPGE: return IF_ICMPLT;
- case IF_ICMPGT: return IF_ICMPLE;
- case IF_ICMPLE: return IF_ICMPGT;
- case IF_ACMPEQ: return IF_ACMPNE;
- case IF_ACMPNE: return IF_ACMPEQ;
-
- default:
- throw new IllegalArgumentException("Can't negate " + Integer.toHexString(op));
- }
- }
-
private Object resolveTarget(Object arg) {
int target;
if (arg instanceof PhantomTarget) {
@@ -966,7 +954,7 @@ public class MethodGen implements CGConst {
// Debugging //////////////////////////////////////////////////////////////////////////////
- public void debugToString(StringBuffer sb, String constructorName) {
+ public void debugBodyToString(StringBuffer sb) {
// This is intentionally a local variable so it can be removed by gcclass
final String[] OP_NAMES = new String[]{
"nop", "aconst_null", "iconst_m1", "iconst_0", "iconst_1", "iconst_2",
@@ -1013,35 +1001,46 @@ public class MethodGen implements CGConst {
"", "", "", "", "", "",
"", "", "", ""
};
-
- sb.append(" ").append(ClassFile.flagsToString(flags,false));
- sb.append(method.debugToString());
- if (thrownExceptions.size() > 0) {
- sb.append("throws");
- for(Enumeration e = thrownExceptions.keys();e.hasMoreElements();)
- sb.append(" ").append(((Type.Class)e.nextElement()).debugToString()).append(",");
- sb.setLength(sb.length()-1);
- sb.append(" ");
+ for(int i=0;iop (IF_ICMPGT -> IF_ICMPLE, IFNE -> IFEQ, etc)
+ @exception IllegalArgumentException if op isn't an IF* instruction */
+ public static byte negate(byte op) {
+ switch(op) {
+ case IFEQ: return IFNE;
+ case IFNE: return IFEQ;
+ case IFLT: return IFGE;
+ case IFGE: return IFLT;
+ case IFGT: return IFLE;
+ case IFLE: return IFGT;
+ case IF_ICMPEQ: return IF_ICMPNE;
+ case IF_ICMPNE: return IF_ICMPEQ;
+ case IF_ICMPLT: return IF_ICMPGE;
+ case IF_ICMPGE: return IF_ICMPLT;
+ case IF_ICMPGT: return IF_ICMPLE;
+ case IF_ICMPLE: return IF_ICMPGT;
+ case IF_ACMPEQ: return IF_ACMPNE;
+ case IF_ACMPNE: return IF_ACMPEQ;
+
+ default:
+ throw new IllegalArgumentException("Can't negate " + Integer.toHexString(op));
}
}
+
}