X-Git-Url: http://git.megacz.com/?p=org.ibex.classgen.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fclassgen%2FClassGen.java;h=16e10e7e47b506fff5bc5a364392636fcd3a86d3;hp=cd120454ef54690e3b7e0aefeccbd12a42a8d6d3;hb=bc9112573cba51be5e7d285ccd3e496be4278c63;hpb=cb0bae954e7dd0067e77c436c78ee19ace52d9e3

diff --git a/src/org/ibex/classgen/ClassGen.java b/src/org/ibex/classgen/ClassGen.java
index cd12045..16e10e7 100644
--- a/src/org/ibex/classgen/ClassGen.java
+++ b/src/org/ibex/classgen/ClassGen.java
@@ -36,6 +36,12 @@ public class ClassGen implements CGConst {
         return mg;
     }
     
+    public final FieldGen addField(String name, Type type, int flags) {
+        FieldGen fg = new FieldGen(this,name,type,flags);
+        fields.addElement(fg);
+        return fg;
+    }
+    
     public void dump(String s) throws IOException { dump(new File(s)); }
     public void dump(File f) throws IOException {
         if(f.isDirectory()) {
@@ -63,19 +69,26 @@ public class ClassGen implements CGConst {
         cp.seal();
         
         o.writeInt(0xcafebabe); // magic
+        // FIXME: What should this be for JDK 1.1 ?
         o.writeShort(0); // minor_version
         o.writeShort(46); // major_version
+        
         o.writeShort(cp.size()); // constant_pool_count
         cp.dump(o); // constant_pool
+        
         o.writeShort(flags);
-        o.writeShort(cp.get(thisType).index); // this_class
-        o.writeShort(cp.get(superType).index); // super_class
+        o.writeShort(cp.getIndex(thisType)); // this_class
+        o.writeShort(cp.getIndex(superType)); // super_class
+        
         o.writeShort(interfaces.size()); // interfaces_count
-        for(int i=0;i<interfaces.size();i++) o.writeShort(cp.get((Type.Object)interfaces.elementAt(i)).index); // interfaces
+        for(int i=0;i<interfaces.size();i++) o.writeShort(cp.getIndex(interfaces.elementAt(i))); // interfaces
+        
         o.writeShort(fields.size()); // fields_count
         for(int i=0;i<fields.size();i++) ((FieldGen)fields.elementAt(i)).dump(o); // fields
+
         o.writeShort(methods.size()); // methods_count
         for(int i=0;i<methods.size();i++) ((MethodGen)methods.elementAt(i)).dump(o); // methods
+        
         o.writeShort(attributes.size()); // attributes_count
         attributes.dump(o); // attributes        
     }
@@ -85,18 +98,65 @@ public class ClassGen implements CGConst {
         public Exn(String s) { super(s); }
     }
 
+    // FEATURE: Remove these - they are just here to be compatible with the old api
+    public final static MethodRef methodRef(Type.Object c, String name, Type ret, Type[] args) {        
+        return new MethodRef(c,name,ret,args);
+    }
+    public final static FieldRef fieldRef(Type.Object c, String name, Type type) {
+        return new FieldRef(c,name,type);
+    }
+    
+    public static class NameAndType {
+        String name;
+        String type;
+        NameAndType(String name, String type) { this.name = name; this.type = type; }
+        public boolean equals(Object o_) {
+            if(!(o_ instanceof NameAndType)) return false;
+            NameAndType o = (NameAndType) o_;
+            return o.name.equals(name) && o.type.equals(type);
+        }
+        public int hashCode() { return name.hashCode() ^ type.hashCode(); }
+    }
+    
+    public static abstract class FieldMethodRef {
+        Type.Object klass;
+        NameAndType nameAndType;
+        FieldMethodRef(Type.Object klass, NameAndType nameAndType) { this.klass = klass; this.nameAndType = nameAndType; }
+        public boolean equals(Object o_) {
+            if(!(o_ instanceof FieldMethodRef)) return false;
+            FieldMethodRef o = (FieldMethodRef) o_;
+            return o.klass.equals(klass) && o.nameAndType.equals(nameAndType);
+        }
+        public int hashCode() { return klass.hashCode() ^ nameAndType.hashCode(); }
+    }
+    
+    public static class InterfaceMethodRef extends FieldMethodRef {
+        public InterfaceMethodRef(MethodRef r) { super(r.klass,r.nameAndType); }
+        public InterfaceMethodRef(Type.Object c, NameAndType t) { super(c,t); }
+    }
+    
     public static void main(String[] args) throws Exception {
+        Type.Object me = new Type.Object("Test");
         ClassGen cg = new ClassGen("Test","java.lang.Object",ACC_PUBLIC|ACC_SUPER|ACC_FINAL);
+        FieldGen fg = cg.addField("foo",Type.INT,ACC_PUBLIC|ACC_STATIC);
+        
         MethodGen mg = cg.addMethod("main",Type.VOID,new Type[]{Type.arrayType(Type.STRING)},ACC_STATIC|ACC_PUBLIC);
         mg.setMaxLocals(1);
         mg.addPushConst(0);
-        mg.add(ISTORE_0);
+        //mg.add(ISTORE_0);
+        mg.add(PUTSTATIC,cg.fieldRef(me,"foo",Type.INT));
         int top = mg.size();
-        mg.add(GETSTATIC,mg.fieldRef(new Type.Object("java.lang.System"),"out",new Type.Object("java.io.PrintStream")));
-        mg.add(ILOAD_0);
-        mg.add(INVOKEVIRTUAL,mg.methodRef(new Type.Object("java.io.PrintStream"),"println",Type.VOID, new Type[]{Type.INT}));
-        mg.add(IINC,new int[]{0,1});
-        mg.add(ILOAD_0);
+        mg.add(GETSTATIC,cg.fieldRef(new Type.Object("java.lang.System"),"out",new Type.Object("java.io.PrintStream")));
+        //mg.add(ILOAD_0);
+        mg.add(GETSTATIC,cg.fieldRef(me,"foo",Type.INT));
+        mg.add(INVOKEVIRTUAL,cg.methodRef(new Type.Object("java.io.PrintStream"),"println",Type.VOID, new Type[]{Type.INT}));
+        //mg.add(IINC,new int[]{0,1});
+        //mg.add(ILOAD_0);
+        mg.add(GETSTATIC,cg.fieldRef(me,"foo",Type.INT));
+        mg.addPushConst(1);
+        mg.add(IADD);
+        mg.add(DUP);
+        mg.add(PUTSTATIC,cg.fieldRef(me,"foo",Type.INT));       
         mg.addPushConst(10);
         mg.add(IF_ICMPLT,top);
         mg.add(RETURN);