Changeset 3916

Timestamp:

07/02/09 14:57:49 (5 months ago)

Author:

chf

Message:

cleanups

Location:

trunk/ProjectFortress/src/com/sun/fortress/compiler/codegen

Files:

• CodeGen.java (modified) (4 diffs)
• CodeGenMethodVisitor.java (modified) (10 diffs)

trunk/ProjectFortress/src/com/sun/fortress/compiler/codegen/CodeGen.java

@@ -840 +840 @@
     //          We create separate taskClasses for every task      
     public String delegate(ASTNode x) {
+
+        if (! (x instanceof _RewriteFnApp)) {
+            sayWhat(x);
+        }
+
+        _RewriteFnApp _rewriteFnApp = (_RewriteFnApp) x;
+
+        Expr function = _rewriteFnApp.getFunction();
+        
+        System.out.println("BBBBBBB: function = " + function);
+        ExprInfo info = function.getInfo();
+        Option<Type> exprType = info.getExprType();
+
+
+        if (!exprType.isSome()) {
+            sayWhat(x, "Missing type information for delegate " + x);
+        }
+        
+        String desc = NamingCzar.jvmTypeDesc(exprType.unwrap(), component.getName());
+        
+        List<String> args = CodeGenMethodVisitor.parseArgs(desc);
+        String result = CodeGenMethodVisitor.parseResult(desc);
+
         String className = NamingCzar.gensymTaskName(packageAndClassName);
         debug("delegate creating class " + className + " node = " + x);
@@ -846 +869 @@
         cg.localsDepth = 0;
         cg.cw = new CodeGenClassWriter(ClassWriter.COMPUTE_FRAMES);
-        
         cg.cw.visitSource(className,null);
 
@@ -854 +876 @@
                     className,null, NamingCzar.fortressBaseTask, null);
 
-        // FIXME, this assumes we only take a ZZ32 argument.
-        cg.mv = cg.cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", 
-                                  "(" + NamingCzar.descFortressZZ32 + ")V", null, null);
+        String initDesc = "(";
+
+        for (String arg : args) {
+            initDesc = initDesc + arg;
+        }
+        initDesc = initDesc + ")V";
+
+        System.out.println("initDesc = " + initDesc + "should be (ZZ32)V");
+            
+        cg.mv = cg.cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", initDesc, null, null);
         cg.mv.visitCode();
+
         cg.mv.visitVarInsn(Opcodes.ALOAD, cg.mv.getLocalVariable("instance"));
         cg.mv.visitMethodInsn(Opcodes.INVOKESPECIAL, NamingCzar.fortressBaseTask, 
                               "<init>", NamingCzar.voidToVoid);
         cg.mv.visitVarInsn(Opcodes.ALOAD, cg.mv.getLocalVariable("instance"));
+
+        // Fib specific
         cg.mv.visitVarInsn(Opcodes.ALOAD, 1);
-        cg.mv.visitFieldInsn(Opcodes.PUTFIELD, className, "n", NamingCzar.descFortressZZ32);
+        cg.mv.visitFieldInsn(Opcodes.PUTFIELD, className, "n", args.get(0));            
 
         cg.mv.visitInsn(Opcodes.RETURN);
@@ -881 +913 @@
 
         // Fixme, not all results are ZZ32
-        cg.mv.visitFieldInsn(Opcodes.PUTFIELD, className, "result", NamingCzar.descFortressZZ32);
+        cg.mv.visitFieldInsn(Opcodes.PUTFIELD, className, "result", result);
 
         cg.mv.visitInsn(Opcodes.RETURN);        

trunk/ProjectFortress/src/com/sun/fortress/compiler/codegen/CodeGenMethodVisitor.java

@@ -43 +43 @@
     int localVariableCount;
 
-    static void error(String s) {throw new RuntimeException("Bad Signature " + s);}    
+    static void error(String s) {throw new RuntimeException("Bad Signature " + s);}   
 
-    private void parseDescriptor(String desc) {
-        argumentTypes = new ArrayList<String>();
+    // Move these to their own class
 
-        System.out.println("parseDescriptor: " + desc);
-        
+    public static List<String> parseArgs(String desc) {
+        List<String> args = new ArrayList<String>();
         if (desc.charAt(0) != '(') error(desc);
         int i = 1;
@@ -57 +56 @@
 
         while (ch != ')') {
-            System.out.println("parseDescriptor: desc = " + desc + 
-                               " i = " + i + " argumentTypes = " + argumentTypes);
-
             switch(ch) {
             case 'B': 
@@ -69 +65 @@
             case 'J': 
             case 'Z': 
-                argumentTypes.add(Character.toString(desc.charAt(i))); ch = desc.charAt(++i); break;
+                args.add(Character.toString(desc.charAt(i))); ch = desc.charAt(++i); break;
             case '[': 
             case 'L': 
@@ -76 +72 @@
                     ch = desc.charAt(++i);
                 }
-                argumentTypes.add(desc.substring(start, ++i));
+                args.add(desc.substring(start, ++i));
                 ch = desc.charAt(i);
                 break;
@@ -82 +78 @@
             }
         }
-        ch = desc.charAt(++i);
+        return args;
+    }
 
+    public static String parseResult(String desc) {
+        int i = desc.indexOf(')') + 1;
+        int ch = desc.charAt(i);
+        int start;
         switch(ch) {
         case 'B': 
@@ -94 +95 @@
         case 'Z': 
         case 'V':
-            resultType = Character.toString(desc.charAt(i)); break;
+            return Character.toString(desc.charAt(i)); 
         case '[': 
             start = i;
@@ -100 +101 @@
                 ch = desc.charAt(++i);
             }
-            resultType = new String(desc.substring(start, ++i));
-            break;
+            return new String(desc.substring(start, ++i));
         case 'L': 
             start = i;
@@ -107 +107 @@
                 ch = desc.charAt(++i);
             }
-            resultType = new String(desc.substring(start, ++i));
-            break;
+            return new String(desc.substring(start, ++i));
         default: error(desc);
         }
-        System.out.println("parseDescriptor: desc = " + desc + 
-                           " i = " + i + " argumentTypes = " + argumentTypes + 
-                           " resultType = " + resultType);
+        return ("Shouln't happen");
     }
+
 
     public CodeGenMethodVisitor(int access, String name, String desc, 
@@ -125 +123 @@
         this.signature = signature;
         this.exceptions = exceptions;
+        this.argumentTypes = parseArgs(desc);
+        this.resultType = parseResult(desc);
         
         this.localVariableTable = new HashMap<String, Integer>();
@@ -133 +133 @@
             createLocalVariable("instance", name);            
         }
-
-        parseDescriptor(desc);
 
         System.out.println("MethodVisitor: name = " + name + " desc = " + desc +