Changeset 3914

Timestamp:

07/02/09 05:12:38 (5 months ago)

Author:

chf

Message:

parse descriptors

Location:

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

Files:

• CodeGen.java (modified) (8 diffs)
• CodeGenClassWriter.java (modified) (1 diff)
• CodeGenMethodVisitor.java (modified) (3 diffs)

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

@@ -145 +145 @@
         mv.visitVarInsn(Opcodes.ALOAD, mv.getLocalVariable("instance"));
 
-        System.out.println("Creating local variable " + task);
         mv.visitVarInsn(Opcodes.ASTORE, mv.createLocalVariable(task));
         
@@ -828 +827 @@
     }
 
+    private void generatePrintArgs(CodeGen cg) {
+        cg.mv.visitVarInsn(Opcodes.ALOAD, 1);
+        cg.mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, NamingCzar.internalFortressZZ32,
+                              "getValue", "()I");
+        cg.mv.visitMethodInsn(Opcodes.INVOKESTATIC,"com/sun/fortress/nativeHelpers/simplePrintArgs", 
+                              "nativePrintZZ32",  "(I)V");
+    }
+
+
     // This sets up the parallel task construct.
     // Caveats: We assume that everything has a ZZ32 result
@@ -833 +841 @@
     public String delegate(ASTNode x) {
         String className = NamingCzar.gensymTaskName(packageAndClassName);
-        debug("delegate creating class " + className);
+        debug("delegate creating class " + className + " node = " + x);
         // Create a new environment
         CodeGen cg = new CodeGen(this);
@@ -850 +858 @@
                                   "(" + NamingCzar.descFortressZZ32 + ")V", null, null);
         cg.mv.visitCode();
-        cg.mv.visitVarInsn(Opcodes.ALOAD, 0);
+        cg.mv.visitVarInsn(Opcodes.ALOAD, cg.mv.getLocalVariable("instance"));
         cg.mv.visitMethodInsn(Opcodes.INVOKESPECIAL, NamingCzar.fortressBaseTask, 
                               "<init>", NamingCzar.voidToVoid);
-
-        cg.mv.visitVarInsn(Opcodes.ALOAD, 0);
+        cg.mv.visitVarInsn(Opcodes.ALOAD, cg.mv.getLocalVariable("instance"));
         cg.mv.visitVarInsn(Opcodes.ALOAD, 1);
         cg.mv.visitFieldInsn(Opcodes.PUTFIELD, className, "n", NamingCzar.descFortressZZ32);
-        //        cg.mv.visitVarInsn(Opcodes.ALOAD, 1);
-        //        cg.mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, NamingCzar.internalFortressZZ32,
-        //                              "getValue", "()I");
-        //        cg.mv.visitMethodInsn(Opcodes.INVOKESTATIC,"com/sun/fortress/nativeHelpers/simplePrintArgs", 
-        //                              "nativePrintZZ32",  "(I)V");
 
         cg.mv.visitInsn(Opcodes.RETURN);
@@ -890 +892 @@
     }
 
+    private void generatePrintResult(CodeGen cg) {
+        mv.visitInsn(Opcodes.DUP);
+        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, NamingCzar.internalFortressZZ32,
+                           "getValue", "()I");
+        mv.visitMethodInsn(Opcodes.INVOKESTATIC,"com/sun/fortress/nativeHelpers/simplePrintResult", 
+                           "nativePrintZZ32",  "(I)V");
+    }
+
     public void forOpExpr(OpExpr x) {
         debug("forOpExpr ", x, " op = ", x.getOp(),
@@ -902 +912 @@
         mv.visitVarInsn(Opcodes.ASTORE, mv.createLocalVariable("TaskArray", "java/util/ArrayList"));
     
-        System.out.println("RRRRRRR:" + pa + " SSSSSS " + x);
         if (pa.worthParallelizing(x)) {
             for (int i = 0; i < args.size(); i++) {
@@ -926 +935 @@
                 mv.visitVarInsn(Opcodes.ALOAD, mv.getLocalVariable(tasks.get(i)));
                 mv.visitFieldInsn(Opcodes.GETFIELD, tasks.get(i), "result", NamingCzar.descFortressZZ32);
-                //                mv.visitInsn(Opcodes.DUP);
-                //                mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, NamingCzar.internalFortressZZ32,
-                //                                      "getValue", "()I");
-                //                mv.visitMethodInsn(Opcodes.INVOKESTATIC,"com/sun/fortress/nativeHelpers/simplePrintResult", 
-                //                              "nativePrintZZ32",  "(I)V");
-                
             }
         } else {
@@ -1126 +1129 @@
                 List<Expr> exprs = targ.getExprs();
                 for (Expr expr : exprs) {
-                    System.out.println("args = " + expr);
                     expr.accept(this);
                 }

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

@@ -35 +35 @@
     }
 
-    // When we can reliably parse type descriptors, this will go away.
-
-    public CodeGenMethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions, String[] argTypes, String resultType) {
-        return new CodeGenMethodVisitor(access, name, desc, signature, exceptions, 
-                                        super.visitMethod(access, name, desc, signature, exceptions),
-                                        argTypes, resultType);
-    }
-
 }
             

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

@@ -39 +39 @@
     private String signature;
     private String[] exceptions;
-    private String[] arguments;
+    private List<String> argumentTypes;
     private String resultType;
+    int localVariableCount;
 
+    static void error(String s) {throw new RuntimeException("Bad Signature " + s);}    
+
+    private void parseDescriptor(String desc) {
+        argumentTypes = new ArrayList<String>();
+
+        System.out.println("parseDescriptor: " + desc);
+        
+        if (desc.charAt(0) != '(') error(desc);
+        int i = 1;
+        int start = 0;
+        int ch = desc.charAt(i);
+
+
+        while (ch != ')') {
+            System.out.println("parseDescriptor: desc = " + desc + 
+                               " i = " + i + " argumentTypes = " + argumentTypes);
+
+            switch(ch) {
+            case 'B': 
+            case 'S': 
+            case 'F': 
+            case 'D': 
+            case 'C': 
+            case 'I': 
+            case 'J': 
+            case 'Z': 
+                argumentTypes.add(Character.toString(desc.charAt(i))); ch = desc.charAt(++i); break;
+            case '[': 
+            case 'L': 
+                start = i;
+                while (ch != ';') {
+                    ch = desc.charAt(++i);
+                }
+                argumentTypes.add(desc.substring(start, ++i));
+                ch = desc.charAt(i);
+                break;
+            default: error(desc);
+            }
+        }
+        ch = desc.charAt(++i);
+
+        switch(ch) {
+        case 'B': 
+        case 'S': 
+        case 'F': 
+        case 'D': 
+        case 'C': 
+        case 'I': 
+        case 'J': 
+        case 'Z': 
+        case 'V':
+            resultType = Character.toString(desc.charAt(i)); break;
+        case '[': 
+            start = i;
+            while (ch != ']') {
+                ch = desc.charAt(++i);
+            }
+            resultType = new String(desc.substring(start, ++i));
+            break;
+        case 'L': 
+            start = i;
+            while (ch != ';') {
+                ch = desc.charAt(++i);
+            }
+            resultType = new String(desc.substring(start, ++i));
+            break;
+        default: error(desc);
+        }
+        System.out.println("parseDescriptor: desc = " + desc + 
+                           " i = " + i + " argumentTypes = " + argumentTypes + 
+                           " resultType = " + resultType);
+    }
 
     public CodeGenMethodVisitor(int access, String name, String desc, 
@@ -56 +129 @@
         this.localVariableTypeTable = new HashMap<String, String>();
         this.localVariableCount = 0;
-        createLocalVariable("instance");
-        createLocalVariable("result");
 
-    }
+        if ((access & Opcodes.ACC_STATIC) != Opcodes.ACC_STATIC) {
+            createLocalVariable("instance", name);            
+        }
 
-    public CodeGenMethodVisitor(int access, String name, String desc, 
-                                String signature, String[] exceptions,
-                                MethodVisitor mvisitor, String argTypes[],
-                                String resultType) {
-        super(mvisitor);
-        this.access = access;
-        this.name = name;
-        this.desc = desc;
-        this.signature = signature;
-        this.exceptions = exceptions;
-        this.arguments = argTypes;
-        this.resultType = resultType;
+        parseDescriptor(desc);
+
+        System.out.println("MethodVisitor: name = " + name + " desc = " + desc + 
+                           " argumentTypes = " + argumentTypes + " resultType " + resultType);
         
-        this.localVariableTable = new HashMap<String, Integer>();
-        this.localVariableTypeTable = new HashMap<String, String>();
-        this.localVariableCount = 0;
+        int i = 0;
 
-        createLocalVariable("instance");
-
-        int ind = 0;
-        for (String arg : arguments) {
-            createLocalVariable("arg" + ind, arguments[ind++]);
+        for (String argumentType : argumentTypes) {
+            createLocalVariable("arg" + i++, argumentType);
         }
         
         createLocalVariable("result", resultType);
+
     }
 
@@ -96 +157 @@
         Debug.debug(Debug.Type.CODEGEN, 1, getText());
     }
-
-    // We need to be smarter about this.
-    public int localVariableCount;
 
     public int createLocalVariable(String name) {