Index: /trunk/ProjectFortress/src/com/sun/fortress/compiler/phases/CodeGenerationPhase.java =================================================================== --- /trunk/ProjectFortress/src/com/sun/fortress/compiler/phases/CodeGenerationPhase.java (revision 3849) +++ /trunk/ProjectFortress/src/com/sun/fortress/compiler/phases/CodeGenerationPhase.java (revision 3852) @@ -111,4 +111,9 @@ Relation fns = ci.functions(); TypeAnalyzer ta = new TypeAnalyzer(new TraitTable(ci, getEnv())); + + // Temporary code + ParallelismAnalyzer pa = new ParallelismAnalyzer(); + component.accept(pa); + pa.printTable(); CodeGen c = new CodeGen(component, symbolTable, ta, ci); Index: /trunk/ProjectFortress/src/com/sun/fortress/compiler/codegen/CodeGen.java =================================================================== --- /trunk/ProjectFortress/src/com/sun/fortress/compiler/codegen/CodeGen.java (revision 3850) +++ /trunk/ProjectFortress/src/com/sun/fortress/compiler/codegen/CodeGen.java (revision 3852) @@ -76,52 +76,4 @@ Component component; private final ComponentIndex ci; - - - - private void generateMainMethod() { - - // We generate two methods. First a springboard method that creates an - // instance of the class we are generating, and then the real main method - // which takes the instance and uses it to pass to the primordial task. - - mv = cw.visitMethod(Opcodes.ACC_PUBLIC + Opcodes.ACC_STATIC, "main", - NamingCzar.stringArrayToVoid, null, null); - mv.visitCode(); - mv.visitVarInsn(Opcodes.ALOAD, 0); - mv.visitMethodInsn(Opcodes.INVOKESTATIC, "com/sun/fortress/nativeHelpers/systemHelper", - "registerArgs", NamingCzar.stringArrayToVoid); - - mv.visitTypeInsn(Opcodes.NEW, packageAndClassName); - mv.visitInsn(Opcodes.DUP); - mv.visitMethodInsn(Opcodes.INVOKESPECIAL, packageAndClassName, "", "()V"); - - mv.visitMethodInsn(Opcodes.INVOKESTATIC, packageAndClassName, "main", - "(Lcom/sun/fortress/runtimeSystem/FortressComponent;)V"); - - mv.visitInsn(Opcodes.RETURN); - mv.visitMaxs(NamingCzar.ignore,NamingCzar.ignore); - mv.visitEnd(); - - mv = cw.visitMethod(Opcodes.ACC_PUBLIC + Opcodes.ACC_STATIC, "main", - "(Lcom/sun/fortress/runtimeSystem/FortressComponent;)V", - null, null); - mv.visitVarInsn(Opcodes.ALOAD, 0); - mv.visitMethodInsn(Opcodes.INVOKESTATIC, NamingCzar.primordialTask, "startFortress", - "(Lcom/sun/fortress/runtimeSystem/FortressComponent;)Lcom/sun/fortress/runtimeSystem/PrimordialTask;"); - - mv.visitInsn(Opcodes.RETURN); - mv.visitMaxs(NamingCzar.ignore,NamingCzar.ignore); - mv.visitEnd(); - } - - private void generateInitMethod() { - mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "", NamingCzar.voidToVoid, null, null); - mv.visitCode(); - mv.visitVarInsn(Opcodes.ALOAD, 0); - mv.visitMethodInsn(Opcodes.INVOKESPECIAL, NamingCzar.internalObject, "", NamingCzar.voidToVoid); - mv.visitInsn(Opcodes.RETURN); - mv.visitMaxs(NamingCzar.ignore, NamingCzar.ignore); - mv.visitEnd(); - } public CodeGen(Component c, Symbols s, TypeAnalyzer ta, ComponentIndex ci) { @@ -164,4 +116,51 @@ } + private void generateMainMethod() { + + // We generate two methods. First a springboard method that creates an + // instance of the class we are generating, and then the real main method + // which takes the instance and uses it to pass to the primordial task. + + mv = cw.visitMethod(Opcodes.ACC_PUBLIC + Opcodes.ACC_STATIC, "main", + NamingCzar.stringArrayToVoid, null, null); + mv.visitCode(); + mv.visitVarInsn(Opcodes.ALOAD, 0); + mv.visitMethodInsn(Opcodes.INVOKESTATIC, "com/sun/fortress/nativeHelpers/systemHelper", + "registerArgs", NamingCzar.stringArrayToVoid); + + mv.visitTypeInsn(Opcodes.NEW, packageAndClassName); + mv.visitInsn(Opcodes.DUP); + mv.visitMethodInsn(Opcodes.INVOKESPECIAL, packageAndClassName, "", "()V"); + + mv.visitMethodInsn(Opcodes.INVOKESTATIC, packageAndClassName, "main", + "(Lcom/sun/fortress/runtimeSystem/FortressComponent;)V"); + + mv.visitInsn(Opcodes.RETURN); + mv.visitMaxs(NamingCzar.ignore,NamingCzar.ignore); + mv.visitEnd(); + + mv = cw.visitMethod(Opcodes.ACC_PUBLIC + Opcodes.ACC_STATIC, "main", + "(Lcom/sun/fortress/runtimeSystem/FortressComponent;)V", + null, null); + mv.visitVarInsn(Opcodes.ALOAD, 0); + mv.visitMethodInsn(Opcodes.INVOKESTATIC, NamingCzar.primordialTask, "startFortress", + "(Lcom/sun/fortress/runtimeSystem/FortressComponent;)Lcom/sun/fortress/runtimeSystem/PrimordialTask;"); + + mv.visitInsn(Opcodes.RETURN); + mv.visitMaxs(NamingCzar.ignore,NamingCzar.ignore); + mv.visitEnd(); + } + + private void generateInitMethod() { + mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "", NamingCzar.voidToVoid, null, null); + mv.visitCode(); + mv.visitVarInsn(Opcodes.ALOAD, 0); + mv.visitMethodInsn(Opcodes.INVOKESPECIAL, NamingCzar.internalObject, "", NamingCzar.voidToVoid); + mv.visitInsn(Opcodes.RETURN); + mv.visitMaxs(NamingCzar.ignore, NamingCzar.ignore); + mv.visitEnd(); + } + + private void cgWithNestedScope(ASTNode n) { CodeGen cg = new CodeGen(this); @@ -200,4 +199,119 @@ } + private void popAll(int onStack) { + if (onStack > 0) { + for (; onStack > 1; onStack -= 2) { + mv.visitInsn(Opcodes.POP2); + } + if (onStack==1) { + mv.visitInsn(Opcodes.POP); + } + } + } + + private void dumpDecls(List decls) { + debug("dumpDecls", decls); + for (Decl d : decls) { + if (!(d instanceof FnDecl)) { + sayWhat(d); + return; + } + d.accept(this); + } + } + + + private void addLineNumberInfo(ASTNode x) { + addLineNumberInfo(mv, x); + } + + private void addLineNumberInfo(MethodVisitor m, ASTNode x) { + org.objectweb.asm.Label bogus_label = new org.objectweb.asm.Label(); + m.visitLabel(bogus_label); + Span span = NodeUtil.getSpan(x); + SourceLoc begin = span.getBegin(); + SourceLoc end = span.getEnd(); + String fileName = span.getFileName(); + m.visitLineNumber(begin.getLine(), bogus_label); + } + + public static String jvmSignatureFor(Function f) { + String sig; + List params = f.parameters(); + sig = "("; + for (Param p : params ) { + Type ty = p.getIdType().unwrap(); + String toType = NamingCzar.only.boxedImplDesc(ty); + sig += toType; + } + sig += ")"; + sig += NamingCzar.only.boxedImplDesc(f.getReturnType()); + return sig; + } + + + /** + * @param x + * @param arrow + * @param pkgAndClassName + * @param methodName + */ + private void callStaticSingleOrOverloaded(FnRef x, + com.sun.fortress.nodes.Type arrow, String pkgAndClassName, + String methodName) { + { + debug("class = " + pkgAndClassName + " method = " + methodName ); + + if ( arrow instanceof ArrowType ) { + addLineNumberInfo(x); + mv.visitMethodInsn(Opcodes.INVOKESTATIC, pkgAndClassName, + methodName, Naming.emitDesc(arrow)); + } else if (arrow instanceof IntersectionType) { + addLineNumberInfo(x); + IntersectionType it = (IntersectionType) arrow; + mv.visitMethodInsn(Opcodes.INVOKESTATIC, pkgAndClassName, + OverloadSet.actuallyOverloaded(it, paramCount) ? + OverloadSet.oMangle(methodName) :methodName, + OverloadSet.getSignature(it, paramCount, ta)); + } else { + sayWhat( x, "Neither arrow nor intersection type: " + arrow ); + } + } + + } + + // paramCount communicates this information from call to function reference, + // as it's needed to determine type descriptors for methods. + private int paramCount = -1; + + /** + * @param y + */ + private void pushInteger(int y) { + switch (y) { + case 0: + mv.visitInsn(Opcodes.ICONST_0); + break; + case 1: + mv.visitInsn(Opcodes.ICONST_1); + break; + case 2: + mv.visitInsn(Opcodes.ICONST_2); + break; + case 3: + mv.visitInsn(Opcodes.ICONST_3); + break; + case 4: + mv.visitInsn(Opcodes.ICONST_4); + break; + case 5: + mv.visitInsn(Opcodes.ICONST_5); + break; + default: + mv.visitLdcInsn(y); + break; + } + + } private T sayWhat(ASTNode x) { throw new CompilerError(NodeUtil.getSpan(x), "Can't compile " + x); @@ -217,134 +331,21 @@ } - public void forComponent(Component x) { - debug("forComponent ",x.getName(),NodeUtil.getSpan(x)); - cw = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES ); - cw.visitSource(packageAndClassName, null); - boolean exportsExecutable = false; - boolean exportsDefaultLibrary = false; - - for ( APIName export : x.getExports() ) { - if ( WellKnownNames.exportsMain(export.getText()) ) - exportsExecutable = true; - if ( WellKnownNames.exportsDefaultLibrary(export.getText()) ) - exportsDefaultLibrary = true; - } - - cw.visit(Opcodes.V1_5, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER, - packageAndClassName, null, NamingCzar.fortressComponent, - null); - - // Always generate the init method - generateInitMethod(); - - // If this component exports an executable API, - // generate a main method. - if ( exportsExecutable ) { - generateMainMethod(); - } - for ( Import i : x.getImports() ) { - i.accept(this); - } - - // determineOverloadedNames(x.getDecls() ); - - // Must do this first, to get local decls right. - generateTopLevelOverloads(); - - for ( Decl d : x.getDecls() ) { - d.accept(this); - } - - - - dumpClass( packageAndClassName ); - } - - /** - * Creates overloaded functions for any overloads present at the top level - * of this component. Top level overloads are those that might be exported; - * Reference overloads are rewritten into _RewriteFnOverloadDecl nodes - * and generated in the normal visits. - */ - private void generateTopLevelOverloads() { - - for (Map.Entry> entry1 : topLevelOverloads.entrySet()) { - IdOrOpOrAnonymousName name = entry1.getKey(); - MultiMap partitionedByArgCount = entry1.getValue(); - - for (Map.Entry> entry : partitionedByArgCount - .entrySet()) { - int i = entry.getKey(); - Set fs = entry.getValue(); - - OverloadSet os = - new OverloadSet.Local(ci.ast().getName(), name, - ta, fs, i); - - os.split(true); - - String s = name.stringName(); - - os.generateAnOverloadDefinition(s, cw); - - for (Map.Entry o_entry : os.getOverloadSubsets().entrySet()) { - String ss = o_entry.getKey(); - ss = s + ss; - overloadedNamesAndSigs.add(ss); - } - } - } - } - - Map> - sizePartitionedOverloads(Relation fns) { - - Map> result = - new HashMap>(); - - for (IdOrOpOrAnonymousName name : fns.firstSet()) { - Set defs = fns.matchFirst(name); - if (defs.size() <= 1) continue; - - MultiMap partitionedByArgCount = - new MultiMap(); - - for (Function d : defs) { - partitionedByArgCount.putItem(d.parameters().size(), d); - } - - for (Function d : defs) { - Set sf = partitionedByArgCount.get(d.parameters().size()); - if (sf != null && sf.size() <= 1) - partitionedByArgCount.remove(d.parameters().size()); - } - if (partitionedByArgCount.size() > 0) - result.put(name, partitionedByArgCount); - } - - return result; - } - - public void forImportNames(ImportNames x) { - debug("forImportNames", x); - Option foreign = x.getForeignLanguage(); - if ( !foreign.isSome() ) return; - if ( !foreign.unwrap().equals("java") ) { - sayWhat(x, "Unrecognized foreign import type (only recognize java): "+ - foreign.unwrap()); - return; - } - String apiName = x.getApiName().getText(); - for ( AliasedSimpleName n : x.getAliasedNames() ) { - Option aliasId = n.getAlias(); - if (!(aliasId.isSome())) continue; - debug("forImportNames ", x, - " aliasing ", NodeUtil.nameString(aliasId.unwrap()), - " to ", NodeUtil.nameString(n.getName())); - aliasTable.put(NodeUtil.nameString(aliasId.unwrap()), - apiName + "." + NodeUtil.nameString(n.getName())); - } - } - + public void forBlock(Block x) { + boolean oldInABlock = inABlock; + inABlock = true; + int onStack = 0; + debug("forBlock ", x); + for ( Expr e : x.getExprs() ) { + popAll(onStack); + e.accept(this); + onStack = 1; + // TODO: can we have multiple values on stack in future? + // Whither primitive types? + // May require some tracking of abstract stack state. + // For now we always have 1 pointer on stack and this doesn't + // matter. + } + inABlock=oldInABlock; + } public void forChainExpr(ChainExpr x) { debug( "forChainExpr" + x); @@ -367,40 +368,485 @@ } + public void forComponent(Component x) { + debug("forComponent ",x.getName(),NodeUtil.getSpan(x)); + cw = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES ); + cw.visitSource(packageAndClassName, null); + boolean exportsExecutable = false; + boolean exportsDefaultLibrary = false; + + for ( APIName export : x.getExports() ) { + if ( WellKnownNames.exportsMain(export.getText()) ) + exportsExecutable = true; + if ( WellKnownNames.exportsDefaultLibrary(export.getText()) ) + exportsDefaultLibrary = true; + } + + cw.visit(Opcodes.V1_5, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER, + packageAndClassName, null, NamingCzar.fortressComponent, + null); + + // Always generate the init method + generateInitMethod(); + + // If this component exports an executable API, + // generate a main method. + if ( exportsExecutable ) { + generateMainMethod(); + } + for ( Import i : x.getImports() ) { + i.accept(this); + } + + // determineOverloadedNames(x.getDecls() ); + + // Must do this first, to get local decls right. + generateTopLevelOverloads(); + + for ( Decl d : x.getDecls() ) { + d.accept(this); + } + + + + dumpClass( packageAndClassName ); + } + public void forDecl(Decl x) { sayWhat(x, "forDecl"); } - private void dumpSigs(List decls) { - debug("dumpSigs", decls); - for (Decl d : decls) { - debug("dumpSigs decl =", d); - if (!(d instanceof FnDecl)) { - sayWhat(d); - return; - } - - FnDecl f = (FnDecl) d; - FnHeader h = f.getHeader(); - IdOrOpOrAnonymousName xname = h.getName(); - IdOrOp name = (IdOrOp) xname; - String desc = Naming.generateTypeDescriptor(f); - debug("about to call visitMethod with", name.getText(), - " and desc ", desc); - mv = cw.visitMethod(Opcodes.ACC_ABSTRACT + Opcodes.ACC_PUBLIC, - NamingCzar.mangleIdentifier(name.getText()), desc, null, null); + + public void forDo(Do x) { + debug("forDo ", x); + int onStack = 0; + for ( Block b : x.getFronts() ) { + popAll(onStack); + b.accept(this); + onStack = 1; + } + } + + public void forFnDecl(FnDecl x) { + debug("forFnDecl ", x ); + FnHeader header = x.getHeader(); + boolean canCompile = + header.getStaticParams().isEmpty() && // no static parameter + header.getWhereClause().isNone() && // no where clause + header.getThrowsClause().isNone() && // no throws clause + header.getContract().isNone() && // no contract + header.getMods().isEmpty() && // no modifiers + !inABlock; // no local functions + + if ( !canCompile ) sayWhat(x); + + Option body = x.getBody(); + IdOrOpOrAnonymousName name = header.getName(); + List params = header.getParams(); + boolean functionalMethod = false; + boolean emitUnambiguous = false; + + for (Param p : params) { + debug("iterating params looking for self : param = ", p); + if (p.getName().getText() == "self") + functionalMethod = true; + } + + Option returnType = header.getReturnType(); + + // For now every Fortress entity is made public, with + // namespace management happening in Fortress-land. Right? + int modifiers = Opcodes.ACC_PUBLIC; + + if ( body.isNone() ) + sayWhat(x, "Abstract function declarations are not supported."); + if ( returnType.isNone() ) + sayWhat(x, "Return type is not inferred."); + if ( !( name instanceof IdOrOp )) + sayWhat(x, "Unhandled function name."); + + String nameString = ((IdOrOp)name).getText(); + if ( name instanceof Id ) { + Id id = (Id) name; + debug("forId ", id, + " class = ", Naming.getJavaClassForSymbol(id)); + } else if ( name instanceof Op ) { + Op op = (Op) name; + Fixity fixity = op.getFixity(); + boolean isEnclosing = op.isEnclosing(); + Option maybe_apiName = op.getApiName(); + debug("forOp ", op, " fixity = ", fixity, + " isEnclosing = ", isEnclosing, + " class = ", Naming.getJavaClassForSymbol(op)); + } else { + sayWhat(x); + } + + CodeGen cg = new CodeGen(this); + cg.localsDepth = 0; + + if (!functionalMethod && (inAnObject || inATrait)) { + // TODO: Add proper type information here based on the + // enclosing trait/object decl. For now we can get away + // with just stashing a null as we're not using it to + // determine stack sizing or anything similarly crucial. + cg.addLocalVar(new VarCodeGen.SelfVar(NodeUtil.getSpan(name), null)); + } else if (!nameString.equals("run")) { + // Top-level function or functional method + + // I'm a little puzzled about how else "run" might be called, + // if it is not static. (DRC) + modifiers += Opcodes.ACC_STATIC; + } + + String mname = NamingCzar.mangleIdentifier(nameString); + String sig = Naming.emitFnDeclDesc(NodeUtil.getParamType(x), + returnType.unwrap()); + + if (overloadedNamesAndSigs.contains(mname+sig)) { + mname = NamingCzar.only.mangleAwayFromOverload(mname); + } + + cg.mv = cw.visitMethod(modifiers, + mname, + sig, + null, null); + + // Now inside method body. Generate code for the method body. + for (Param p : params) { + VarCodeGen v = cg.addParam(p); + // v.pushValue(cg.mv); + } + body.unwrap().accept(cg); + + // Method body is complete except for returning final result if any. + // TODO: Fancy footwork here later on if we need to return a non-pointer; + // for now every fortress functional returns a single pointer result. + cg.mv.visitInsn(Opcodes.ARETURN); + cg.mv.visitMaxs(NamingCzar.ignore,NamingCzar.ignore); + cg.mv.visitEnd(); + // Method body complete, cg now invalid. + + // Check to see if a wrapper is needed. + if (topLevelOverloads.containsKey(name)) { + + } + + Option iun = x.getImplementsUnambiguousName(); + + if (iun.isSome()) { + + } + } + + + // Setting up the alias table which we will refer to at runtime. + public void forFnRef(FnRef x) { + debug("forFnRef ", x); + String name = x.getOriginalName().getText(); + Option type = x.getInfo().getExprType(); + if ( type.isNone() ) { + sayWhat( x, "The type of this expression is not inferred." ); + } + /* Arrow, or perhaps an intersection if it is an overloaded function. */ + com.sun.fortress.nodes.Type arrow = type.unwrap(); + + List names = x.getNames(); + + /* Note that after pre-processing in the overload rewriter, there is + * only one name here; this is not an overload check. + */ + if ( names.size() == 1) { + IdOrOp fnName = names.get(0); + Option apiName = fnName.getApiName(); + if (apiName.isSome() && ForeignJava.only.definesApi(apiName.unwrap())) { + + if ( aliasTable.containsKey(name) ) { + String n = aliasTable.get(name); + // Cheating by assuming class is everything before the dot. + int lastDot = n.lastIndexOf("."); + String calleePackageAndClass = n.substring(0, lastDot).replace(".", "/"); + String _method = n.substring(lastDot+1); + + + callStaticSingleOrOverloaded(x, arrow, calleePackageAndClass, _method); + } else { + sayWhat(x, "Should be a foreign function in Alias table"); + } + + } else { + // NOT Foreign + + // deal with in component, or in imported api. + String calleePackageAndClass = apiName.isSome() ? + NamingCzar.fortressPackage + "/" + apiName.unwrap().getText() + : packageAndClassName; + String _method = fnName.getText(); + + callStaticSingleOrOverloaded(x, arrow, calleePackageAndClass, _method); + + + } + } else { +// sayWhat(x, "Expected to see only one name here"); +// } +// } + } + } + + public void forIf(If x) { + Debug.debug( Debug.Type.CODEGEN, 1,"forIf " + x); + List clauses = x.getClauses(); + Option elseClause = x.getElseClause(); + if (clauses.size() > 1) throw new CompilerError(NodeUtil.getSpan(x), "Don't know how to compile multiple if clauses yet"); + + org.objectweb.asm.Label action = new org.objectweb.asm.Label(); + org.objectweb.asm.Label done = new org.objectweb.asm.Label(); + IfClause ifclause = clauses.get(0); + GeneratorClause cond = ifclause.getTestClause(); + + if (!cond.getBind().isEmpty()) + sayWhat(x, "Undesugared generalized if expression."); + + Expr testExpr = cond.getInit(); + debug( "about to accept " + testExpr + " of class " + testExpr.getClass()); + testExpr.accept(this); + addLineNumberInfo(x); + mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, NamingCzar.internalFortressBoolean, "getValue", + NamingCzar.makeMethodDesc("", NamingCzar.descBoolean)); + + mv.visitJumpInsn(Opcodes.IFNE, action); + Option maybe_else = x.getElseClause(); + if (maybe_else.isSome()) { + maybe_else.unwrap().accept(this); + } + mv.visitJumpInsn(Opcodes.GOTO, done); + mv.visitLabel(action); + ifclause.getBody().accept(this); + mv.visitLabel(done); + } + + public void forImportNames(ImportNames x) { + debug("forImportNames", x); + Option foreign = x.getForeignLanguage(); + if ( !foreign.isSome() ) return; + if ( !foreign.unwrap().equals("java") ) { + sayWhat(x, "Unrecognized foreign import type (only recognize java): "+ + foreign.unwrap()); + return; + } + String apiName = x.getApiName().getText(); + for ( AliasedSimpleName n : x.getAliasedNames() ) { + Option aliasId = n.getAlias(); + if (!(aliasId.isSome())) continue; + debug("forImportNames ", x, + " aliasing ", NodeUtil.nameString(aliasId.unwrap()), + " to ", NodeUtil.nameString(n.getName())); + aliasTable.put(NodeUtil.nameString(aliasId.unwrap()), + apiName + "." + NodeUtil.nameString(n.getName())); + } + } + + public void forIntLiteralExpr(IntLiteralExpr x) { + debug("forIntLiteral ", x); + BigInteger bi = x.getIntVal(); + // This might not work. + int l = bi.bitLength(); + if (l < 32) { + int y = bi.intValue(); + addLineNumberInfo(x); + pushInteger(y); + addLineNumberInfo(x); + + mv.visitMethodInsn(Opcodes.INVOKESTATIC, + NamingCzar.internalFortressZZ32, NamingCzar.make, + NamingCzar.makeMethodDesc(NamingCzar.descInt, + NamingCzar.descFortressZZ32)); + } else if (l < 64) { + long yy = bi.longValue(); + addLineNumberInfo(x); + mv.visitLdcInsn(yy); + addLineNumberInfo(x); + mv.visitMethodInsn(Opcodes.INVOKESTATIC, + NamingCzar.internalFortressZZ64, NamingCzar.make, + NamingCzar.makeMethodDesc(NamingCzar.descLong, + NamingCzar.descFortressZZ64)); + } + } + + public void forObjectDecl(ObjectDecl x) { + debug("forObjectDecl", x); + TraitTypeHeader header = x.getHeader(); + List extendsC = header.getExtendsClause(); + boolean canCompile = + x.getParams().isNone() && // no parameters + header.getStaticParams().isEmpty() && // no static parameter + header.getWhereClause().isNone() && // no where clause + header.getThrowsClause().isNone() && // no throws clause + header.getContract().isNone() && // no contract + // header.getDecls().isEmpty() && // no members + header.getMods().isEmpty() && // no modifiers + ( extendsC.size() <= 1 ); // 0 or 1 super trait + if ( !canCompile ) sayWhat(x); + inAnObject = true; + String [] superInterfaces = NamingCzar.extendsClauseToInterfaces(extendsC); + + if (!header.getDecls().isEmpty()) { + debug("header.getDecls:", header.getDecls()); + + cw.visitField(Opcodes.ACC_STATIC + Opcodes.ACC_PUBLIC + Opcodes.ACC_FINAL, + "default_args", + "LCompilerSystem$args;", + null, + null); + + mv = cw.visitMethod(Opcodes.ACC_STATIC, + "", + "()V", + null, + null); + + mv.visitTypeInsn(Opcodes.NEW, "CompilerSystem$args"); + mv.visitInsn(Opcodes.DUP); + mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "CompilerSystem$args", "", NamingCzar.voidToVoid); + mv.visitFieldInsn(Opcodes.PUTSTATIC, "CompilerSystem", "default_args", "LCompilerSystem$args;"); + mv.visitInsn(Opcodes.RETURN); mv.visitMaxs(NamingCzar.ignore, NamingCzar.ignore); mv.visitEnd(); } - } - - private void dumpDecls(List decls) { - debug("dumpDecls", decls); - for (Decl d : decls) { - if (!(d instanceof FnDecl)) { - sayWhat(d); - return; - } + + String classFile = Naming.makeClassName(packageAndClassName, x); + ClassWriter prev = cw; + cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES); + cw.visitSource(classFile, null); + // Until we resolve the directory hierarchy problem. + // cw.visit( Opcodes.V1_5, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER+ Opcodes.ACC_FINAL, + // classFile, null, NamingCzar.internalObject, new String[] { parent }); + cw.visit( Opcodes.V1_5, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER+ Opcodes.ACC_FINAL, + classFile, null, NamingCzar.internalObject, superInterfaces); + + generateInitMethod(); + + for (Decl d : header.getDecls()) { d.accept(this); - } + // If we have a singleton object we can create a default_xxx accessor for it. + if (d instanceof ObjectDecl) { + } + } + dumpClass( classFile ); + cw = prev; + inAnObject = false; + } + + public void forOpExpr(OpExpr x) { + debug("forOpExpr ", x, " op = ", x.getOp(), + " of class ", x.getOp().getClass(), " args = ", x.getArgs()); + FunctionalRef op = x.getOp(); + + List args = x.getArgs(); + for (Expr arg : args) { + arg.accept(this); + } + op.accept(this); + } + + public void forOpRef(OpRef x) { + debug("forOpRef " + x ); + ExprInfo info = x.getInfo(); + Option exprType = info.getExprType(); + List staticArgs = x.getStaticArgs(); + int lexicalDepth = x.getLexicalDepth(); + IdOrOp originalName = x.getOriginalName(); + List names = x.getNames(); + Option> overloadings = x.getOverloadings(); + Option overloadingType = x.getOverloadingType(); + debug("forOpRef ", x, + " info = ", info, "staticArgs = ", staticArgs, " exprType = ", exprType, + " lexicalDepth = ", lexicalDepth, " originalName = ", originalName, + " overloadings = ", overloadings, + " overloadingType = ", overloadingType, " names = ", names); + + boolean canCompile = + x.getStaticArgs().isEmpty() && + x.getOverloadings().isNone() && + names.size() == 1; + + if (canCompile) { + String name = NamingCzar.mangleIdentifier(originalName.getText()); + IdOrOp newName = names.get(0); + Option api = newName.getApiName(); + + addLineNumberInfo(x); + + if (api.isSome()) { + APIName apiName = api.unwrap(); + debug("forOpRef name = ", name, + " api = ", apiName); + if (exprType.isSome()) + mv.visitMethodInsn(Opcodes.INVOKESTATIC, Naming.getJavaClassForSymbol(newName), + NamingCzar.mangleIdentifier(newName.getText()), + Naming.emitDesc(exprType.unwrap())); + else + mv.visitMethodInsn(Opcodes.INVOKESTATIC, + NamingCzar.fortressPackage + "/" + api.unwrap().getText(), + NamingCzar.mangleIdentifier(newName.getText()), + symbols.getTypeSignatureForIdOrOp(newName, component)); + + } else { + if (exprType.isSome()) + mv.visitMethodInsn(Opcodes.INVOKESTATIC, packageAndClassName, NamingCzar.mangleIdentifier(name), + Naming.emitDesc(exprType.unwrap())); + else + mv.visitMethodInsn(Opcodes.INVOKESTATIC, packageAndClassName, + NamingCzar.mangleIdentifier(name), symbols.getTypeSignatureForIdOrOp(newName, component)); + } + } else + debug("forOpRef can't compile staticArgs ", + x.getStaticArgs().isEmpty(), " overloadings ", + x.getOverloadings().isNone()); + + } + + public void forStringLiteralExpr(StringLiteralExpr x) { + // This is cheating, but the best we can do for now. + // We make a FString and push it on the stack. + debug("forStringLiteral ", x); + addLineNumberInfo(x); + mv.visitLdcInsn(x.getText()); + addLineNumberInfo(x); + mv.visitMethodInsn(Opcodes.INVOKESTATIC, NamingCzar.internalFortressString, NamingCzar.make, + NamingCzar.makeMethodDesc(NamingCzar.descString, NamingCzar.descFortressString)); + } + + public void forSubscriptExpr(SubscriptExpr x) { + debug("forSubscriptExpr ", x); + Expr obj = x.getObj(); + List subs = x.getSubs(); + Option maybe_op = x.getOp(); + List staticArgs = x.getStaticArgs(); + boolean canCompile = staticArgs.isEmpty() && maybe_op.isSome() && (obj instanceof VarRef); + if (!canCompile) { sayWhat(x); return; } + Op op = maybe_op.unwrap(); + VarRef var = (VarRef) obj; + Id id = var.getVarId(); + + debug("ForSubscriptExpr ", x, "obj = ", obj, + " subs = ", subs, " op = ", op, " static args = ", staticArgs, + " varRef = ", id.getText()); + + addLineNumberInfo(x); + mv.visitFieldInsn(Opcodes.GETSTATIC, Naming.getJavaClassForSymbol(id) , "default_" + id.getText(), + "L" + Naming.getJavaClassForSymbol(id) + "$" + id.getText() + ";"); + + + + for (Expr e : subs) { + debug("calling accept on ", e); + e.accept(this); + } + addLineNumberInfo(x); + mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, + Naming.getJavaClassForSymbol(id) + "$" + id.getText(), + NamingCzar.mangleIdentifier(op.getText()), + "(Lcom/sun/fortress/compiler/runtimeValues/FZZ32;)Lcom/sun/fortress/compiler/runtimeValues/FString;"); } @@ -459,482 +905,20 @@ } - public void forObjectDecl(ObjectDecl x) { - debug("forObjectDecl", x); - TraitTypeHeader header = x.getHeader(); - List extendsC = header.getExtendsClause(); - boolean canCompile = - x.getParams().isNone() && // no parameters - header.getStaticParams().isEmpty() && // no static parameter - header.getWhereClause().isNone() && // no where clause - header.getThrowsClause().isNone() && // no throws clause - header.getContract().isNone() && // no contract - // header.getDecls().isEmpty() && // no members - header.getMods().isEmpty() && // no modifiers - ( extendsC.size() <= 1 ); // 0 or 1 super trait - if ( !canCompile ) sayWhat(x); - inAnObject = true; - String [] superInterfaces = NamingCzar.extendsClauseToInterfaces(extendsC); - - if (!header.getDecls().isEmpty()) { - debug("header.getDecls:", header.getDecls()); - - cw.visitField(Opcodes.ACC_STATIC + Opcodes.ACC_PUBLIC + Opcodes.ACC_FINAL, - "default_args", - "LCompilerSystem$args;", - null, - null); - - mv = cw.visitMethod(Opcodes.ACC_STATIC, - "", - "()V", - null, - null); - - mv.visitTypeInsn(Opcodes.NEW, "CompilerSystem$args"); - mv.visitInsn(Opcodes.DUP); - mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "CompilerSystem$args", "", NamingCzar.voidToVoid); - mv.visitFieldInsn(Opcodes.PUTSTATIC, "CompilerSystem", "default_args", "LCompilerSystem$args;"); - mv.visitInsn(Opcodes.RETURN); - mv.visitMaxs(NamingCzar.ignore, NamingCzar.ignore); - mv.visitEnd(); - } - - String classFile = Naming.makeClassName(packageAndClassName, x); - ClassWriter prev = cw; - cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES); - cw.visitSource(classFile, null); - // Until we resolve the directory hierarchy problem. - // cw.visit( Opcodes.V1_5, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER+ Opcodes.ACC_FINAL, - // classFile, null, NamingCzar.internalObject, new String[] { parent }); - cw.visit( Opcodes.V1_5, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER+ Opcodes.ACC_FINAL, - classFile, null, NamingCzar.internalObject, superInterfaces); - - generateInitMethod(); - - for (Decl d : header.getDecls()) { - d.accept(this); - // If we have a singleton object we can create a default_xxx accessor for it. - if (d instanceof ObjectDecl) { - } - } - dumpClass( classFile ); - cw = prev; - inAnObject = false; - } - - public void forOpExpr(OpExpr x) { - debug("forOpExpr ", x, " op = ", x.getOp(), - " of class ", x.getOp().getClass(), " args = ", x.getArgs()); - FunctionalRef op = x.getOp(); - - List args = x.getArgs(); - for (Expr arg : args) { - arg.accept(this); - } - op.accept(this); - } - - private void addLineNumberInfo(ASTNode x) { - addLineNumberInfo(mv, x); - } - - private void addLineNumberInfo(MethodVisitor m, ASTNode x) { - org.objectweb.asm.Label bogus_label = new org.objectweb.asm.Label(); - m.visitLabel(bogus_label); - Span span = NodeUtil.getSpan(x); - SourceLoc begin = span.getBegin(); - SourceLoc end = span.getEnd(); - String fileName = span.getFileName(); - m.visitLineNumber(begin.getLine(), bogus_label); - } - - public static String jvmSignatureFor(Function f) { - String sig; - List params = f.parameters(); - sig = "("; - for (Param p : params ) { - Type ty = p.getIdType().unwrap(); - String toType = NamingCzar.only.boxedImplDesc(ty); - sig += toType; - } - sig += ")"; - sig += NamingCzar.only.boxedImplDesc(f.getReturnType()); - return sig; - } - - public void forOpRef(OpRef x) { - debug("forOpRef " + x ); - ExprInfo info = x.getInfo(); - Option exprType = info.getExprType(); - List staticArgs = x.getStaticArgs(); - int lexicalDepth = x.getLexicalDepth(); - IdOrOp originalName = x.getOriginalName(); - List names = x.getNames(); - Option> overloadings = x.getOverloadings(); - Option overloadingType = x.getOverloadingType(); - debug("forOpRef ", x, - " info = ", info, "staticArgs = ", staticArgs, " exprType = ", exprType, - " lexicalDepth = ", lexicalDepth, " originalName = ", originalName, - " overloadings = ", overloadings, - " overloadingType = ", overloadingType, " names = ", names); - - boolean canCompile = - x.getStaticArgs().isEmpty() && - x.getOverloadings().isNone() && - names.size() == 1; - - if (canCompile) { - String name = NamingCzar.mangleIdentifier(originalName.getText()); - IdOrOp newName = names.get(0); - Option api = newName.getApiName(); - - addLineNumberInfo(x); - - if (api.isSome()) { - APIName apiName = api.unwrap(); - debug("forOpRef name = ", name, - " api = ", apiName); - if (exprType.isSome()) - mv.visitMethodInsn(Opcodes.INVOKESTATIC, Naming.getJavaClassForSymbol(newName), - NamingCzar.mangleIdentifier(newName.getText()), - Naming.emitDesc(exprType.unwrap())); - else - mv.visitMethodInsn(Opcodes.INVOKESTATIC, - NamingCzar.fortressPackage + "/" + api.unwrap().getText(), - NamingCzar.mangleIdentifier(newName.getText()), - symbols.getTypeSignatureForIdOrOp(newName, component)); - - } else { - if (exprType.isSome()) - mv.visitMethodInsn(Opcodes.INVOKESTATIC, packageAndClassName, NamingCzar.mangleIdentifier(name), - Naming.emitDesc(exprType.unwrap())); - else - mv.visitMethodInsn(Opcodes.INVOKESTATIC, packageAndClassName, - NamingCzar.mangleIdentifier(name), symbols.getTypeSignatureForIdOrOp(newName, component)); - } - } else - debug("forOpRef can't compile staticArgs ", - x.getStaticArgs().isEmpty(), " overloadings ", - x.getOverloadings().isNone()); - - } - - public void for_RewriteFnOverloadDecl(_RewriteFnOverloadDecl x) { - /* Note for refactoring -- this code does it the "right" way. - * And also, this code NEEDS refactoring. - */ - List fns = x.getFns(); - IdOrOp name = x.getName(); - Option ot = x.getType(); - Relation fnrl = ci.functions(); - - MultiMap byCount = - new MultiMap(); - - for (IdOrOp fn : fns) { - - Option fnapi = fn.getApiName(); - PredicateSet set_of_f; - APIName apiname; - - if (fnapi.isNone()) { - apiname = ci.ast().getName(); - set_of_f = fnrl.matchFirst(fn); - } else { - apiname = fnapi.unwrap(); - ApiIndex ai = symbols.apis.get(apiname); - IdOrOp fnnoapi = NodeFactory.makeLocalIdOrOp(fn); - set_of_f = ai.functions().matchFirst(fnnoapi); - } - - for (Function f : set_of_f) { - OverloadSet.TaggedFunctionName tagged_f = new OverloadSet.TaggedFunctionName(apiname, f); - byCount.putItem(f.parameters().size(), tagged_f); - } - - for (Map.Entry> entry : byCount - .entrySet()) { - int i = entry.getKey(); - Set fs = entry.getValue(); - if (fs.size() > 1) { - OverloadSet os = new OverloadSet.AmongApis(name, - ta, fs, i); - - os.split(false); - os.generateAnOverloadDefinition(name.stringName(), cw); - - } - } - } - } - - public void forFnDecl(FnDecl x) { - debug("forFnDecl ", x ); - FnHeader header = x.getHeader(); - boolean canCompile = - header.getStaticParams().isEmpty() && // no static parameter - header.getWhereClause().isNone() && // no where clause - header.getThrowsClause().isNone() && // no throws clause - header.getContract().isNone() && // no contract - header.getMods().isEmpty() && // no modifiers - !inABlock; // no local functions - - if ( !canCompile ) sayWhat(x); - - Option body = x.getBody(); - IdOrOpOrAnonymousName name = header.getName(); - List params = header.getParams(); - boolean functionalMethod = false; - boolean emitUnambiguous = false; - - for (Param p : params) { - debug("iterating params looking for self : param = ", p); - if (p.getName().getText() == "self") - functionalMethod = true; - } - - Option returnType = header.getReturnType(); - - // For now every Fortress entity is made public, with - // namespace management happening in Fortress-land. Right? - int modifiers = Opcodes.ACC_PUBLIC; - - if ( body.isNone() ) - sayWhat(x, "Abstract function declarations are not supported."); - if ( returnType.isNone() ) - sayWhat(x, "Return type is not inferred."); - if ( !( name instanceof IdOrOp )) - sayWhat(x, "Unhandled function name."); - - String nameString = ((IdOrOp)name).getText(); - if ( name instanceof Id ) { - Id id = (Id) name; - debug("forId ", id, - " class = ", Naming.getJavaClassForSymbol(id)); - } else if ( name instanceof Op ) { - Op op = (Op) name; - Fixity fixity = op.getFixity(); - boolean isEnclosing = op.isEnclosing(); - Option maybe_apiName = op.getApiName(); - debug("forOp ", op, " fixity = ", fixity, - " isEnclosing = ", isEnclosing, - " class = ", Naming.getJavaClassForSymbol(op)); - } else { - sayWhat(x); - } - - CodeGen cg = new CodeGen(this); - cg.localsDepth = 0; - - if (!functionalMethod && (inAnObject || inATrait)) { - // TODO: Add proper type information here based on the - // enclosing trait/object decl. For now we can get away - // with just stashing a null as we're not using it to - // determine stack sizing or anything similarly crucial. - cg.addLocalVar(new VarCodeGen.SelfVar(NodeUtil.getSpan(name), null)); - } else if (!nameString.equals("run")) { - // Top-level function or functional method - - // I'm a little puzzled about how else "run" might be called, - // if it is not static. (DRC) - modifiers += Opcodes.ACC_STATIC; - } - - String mname = NamingCzar.mangleIdentifier(nameString); - String sig = Naming.emitFnDeclDesc(NodeUtil.getParamType(x), - returnType.unwrap()); - - if (overloadedNamesAndSigs.contains(mname+sig)) { - mname = NamingCzar.only.mangleAwayFromOverload(mname); - } - - cg.mv = cw.visitMethod(modifiers, - mname, - sig, - null, null); - - // Now inside method body. Generate code for the method body. - for (Param p : params) { - VarCodeGen v = cg.addParam(p); - // v.pushValue(cg.mv); - } - body.unwrap().accept(cg); - - // Method body is complete except for returning final result if any. - // TODO: Fancy footwork here later on if we need to return a non-pointer; - // for now every fortress functional returns a single pointer result. - cg.mv.visitInsn(Opcodes.ARETURN); - cg.mv.visitMaxs(NamingCzar.ignore,NamingCzar.ignore); - cg.mv.visitEnd(); - // Method body complete, cg now invalid. - - // Check to see if a wrapper is needed. - if (topLevelOverloads.containsKey(name)) { - - } - - Option iun = x.getImplementsUnambiguousName(); - - if (iun.isSome()) { - - } - } - - public void forIf(If x) { - Debug.debug( Debug.Type.CODEGEN, 1,"forIf " + x); - List clauses = x.getClauses(); - Option elseClause = x.getElseClause(); - if (clauses.size() > 1) throw new CompilerError(NodeUtil.getSpan(x), "Don't know how to compile multiple if clauses yet"); - - org.objectweb.asm.Label action = new org.objectweb.asm.Label(); - org.objectweb.asm.Label done = new org.objectweb.asm.Label(); - IfClause ifclause = clauses.get(0); - GeneratorClause cond = ifclause.getTestClause(); - - if (!cond.getBind().isEmpty()) - sayWhat(x, "Undesugared generalized if expression."); - - Expr testExpr = cond.getInit(); - debug( "about to accept " + testExpr + " of class " + testExpr.getClass()); - testExpr.accept(this); + public void forVarRef(VarRef v) { + debug("forVarRef ", v, " which had better be local (for the moment)"); + if (v.getStaticArgs().size() > 0) { + sayWhat(v,"varRef with static args! That requires non-local VarRefs"); + } + VarCodeGen vcg = getLocalVar(v.getVarId()); + vcg.pushValue(mv); + } + + public void forVoidLiteralExpr(VoidLiteralExpr x) { + debug("forVoidLiteral ", x); addLineNumberInfo(x); - mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, NamingCzar.internalFortressBoolean, "getValue", - NamingCzar.makeMethodDesc("", NamingCzar.descBoolean)); - - mv.visitJumpInsn(Opcodes.IFNE, action); - Option maybe_else = x.getElseClause(); - if (maybe_else.isSome()) { - maybe_else.unwrap().accept(this); - } - mv.visitJumpInsn(Opcodes.GOTO, done); - mv.visitLabel(action); - ifclause.getBody().accept(this); - mv.visitLabel(done); - } - - private void popAll(int onStack) { - if (onStack > 0) { - for (; onStack > 1; onStack -= 2) { - mv.visitInsn(Opcodes.POP2); - } - if (onStack==1) { - mv.visitInsn(Opcodes.POP); - } - } - } - - public void forDo(Do x) { - debug("forDo ", x); - int onStack = 0; - for ( Block b : x.getFronts() ) { - popAll(onStack); - b.accept(this); - onStack = 1; - } - } - - public void forBlock(Block x) { - boolean oldInABlock = inABlock; - inABlock = true; - int onStack = 0; - debug("forBlock ", x); - for ( Expr e : x.getExprs() ) { - popAll(onStack); - e.accept(this); - onStack = 1; - // TODO: can we have multiple values on stack in future? - // Whither primitive types? - // May require some tracking of abstract stack state. - // For now we always have 1 pointer on stack and this doesn't - // matter. - } - inABlock=oldInABlock; - } - - // Setting up the alias table which we will refer to at runtime. - public void forFnRef(FnRef x) { - debug("forFnRef ", x); - String name = x.getOriginalName().getText(); - Option type = x.getInfo().getExprType(); - if ( type.isNone() ) { - sayWhat( x, "The type of this expression is not inferred." ); - } - /* Arrow, or perhaps an intersection if it is an overloaded function. */ - com.sun.fortress.nodes.Type arrow = type.unwrap(); - - List names = x.getNames(); - - /* Note that after pre-processing in the overload rewriter, there is - * only one name here; this is not an overload check. - */ - if ( names.size() == 1) { - IdOrOp fnName = names.get(0); - Option apiName = fnName.getApiName(); - if (apiName.isSome() && ForeignJava.only.definesApi(apiName.unwrap())) { - - if ( aliasTable.containsKey(name) ) { - String n = aliasTable.get(name); - // Cheating by assuming class is everything before the dot. - int lastDot = n.lastIndexOf("."); - String calleePackageAndClass = n.substring(0, lastDot).replace(".", "/"); - String _method = n.substring(lastDot+1); - - - callStaticSingleOrOverloaded(x, arrow, calleePackageAndClass, _method); - } else { - sayWhat(x, "Should be a foreign function in Alias table"); - } - - } else { - // NOT Foreign - - // deal with in component, or in imported api. - String calleePackageAndClass = apiName.isSome() ? - NamingCzar.fortressPackage + "/" + apiName.unwrap().getText() - : packageAndClassName; - String _method = fnName.getText(); - - callStaticSingleOrOverloaded(x, arrow, calleePackageAndClass, _method); - - - } - } else { - sayWhat(x, "Expected to see only one name here"); - } - } - - /** - * @param x - * @param arrow - * @param pkgAndClassName - * @param methodName - */ - private void callStaticSingleOrOverloaded(FnRef x, - com.sun.fortress.nodes.Type arrow, String pkgAndClassName, - String methodName) { - { - debug("class = " + pkgAndClassName + " method = " + methodName ); - - if ( arrow instanceof ArrowType ) { - addLineNumberInfo(x); - mv.visitMethodInsn(Opcodes.INVOKESTATIC, pkgAndClassName, - methodName, Naming.emitDesc(arrow)); - } else if (arrow instanceof IntersectionType) { - addLineNumberInfo(x); - IntersectionType it = (IntersectionType) arrow; - mv.visitMethodInsn(Opcodes.INVOKESTATIC, pkgAndClassName, - OverloadSet.actuallyOverloaded(it, paramCount) ? - OverloadSet.oMangle(methodName) :methodName, - OverloadSet.getSignature(it, paramCount, ta)); - } else { - sayWhat( x, "Neither arrow nor intersection type: " + arrow ); - } - } - - } - - // paramCount communicates this information from call to function reference, - // as it's needed to determine type descriptors for methods. - private int paramCount = -1; + mv.visitMethodInsn(Opcodes.INVOKESTATIC, NamingCzar.internalFortressVoid, NamingCzar.make, + NamingCzar.makeMethodDesc("", NamingCzar.descFortressVoid)); + + } public void for_RewriteFnApp(_RewriteFnApp x) { @@ -965,123 +949,143 @@ } - public void forSubscriptExpr(SubscriptExpr x) { - debug("forSubscriptExpr ", x); - Expr obj = x.getObj(); - List subs = x.getSubs(); - Option maybe_op = x.getOp(); - List staticArgs = x.getStaticArgs(); - boolean canCompile = staticArgs.isEmpty() && maybe_op.isSome() && (obj instanceof VarRef); - if (!canCompile) { sayWhat(x); return; } - Op op = maybe_op.unwrap(); - VarRef var = (VarRef) obj; - Id id = var.getVarId(); - - debug("ForSubscriptExpr ", x, "obj = ", obj, - " subs = ", subs, " op = ", op, " static args = ", staticArgs, - " varRef = ", id.getText()); - - addLineNumberInfo(x); - mv.visitFieldInsn(Opcodes.GETSTATIC, Naming.getJavaClassForSymbol(id) , "default_" + id.getText(), - "L" + Naming.getJavaClassForSymbol(id) + "$" + id.getText() + ";"); - - - - for (Expr e : subs) { - debug("calling accept on ", e); - e.accept(this); - } - addLineNumberInfo(x); - mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, - Naming.getJavaClassForSymbol(id) + "$" + id.getText(), - NamingCzar.mangleIdentifier(op.getText()), - "(Lcom/sun/fortress/compiler/runtimeValues/FZZ32;)Lcom/sun/fortress/compiler/runtimeValues/FString;"); - } - - - public void forIntLiteralExpr(IntLiteralExpr x) { - debug("forIntLiteral ", x); - BigInteger bi = x.getIntVal(); - // This might not work. - int l = bi.bitLength(); - if (l < 32) { - int y = bi.intValue(); - addLineNumberInfo(x); - pushInteger(y); - addLineNumberInfo(x); - - mv.visitMethodInsn(Opcodes.INVOKESTATIC, - NamingCzar.internalFortressZZ32, NamingCzar.make, - NamingCzar.makeMethodDesc(NamingCzar.descInt, - NamingCzar.descFortressZZ32)); - } else if (l < 64) { - long yy = bi.longValue(); - addLineNumberInfo(x); - mv.visitLdcInsn(yy); - addLineNumberInfo(x); - mv.visitMethodInsn(Opcodes.INVOKESTATIC, - NamingCzar.internalFortressZZ64, NamingCzar.make, - NamingCzar.makeMethodDesc(NamingCzar.descLong, - NamingCzar.descFortressZZ64)); - } - } - + public void for_RewriteFnOverloadDecl(_RewriteFnOverloadDecl x) { + /* Note for refactoring -- this code does it the "right" way. + * And also, this code NEEDS refactoring. + */ + List fns = x.getFns(); + IdOrOp name = x.getName(); + Option ot = x.getType(); + Relation fnrl = ci.functions(); + + MultiMap byCount = + new MultiMap(); + + for (IdOrOp fn : fns) { + + Option fnapi = fn.getApiName(); + PredicateSet set_of_f; + APIName apiname; + + if (fnapi.isNone()) { + apiname = ci.ast().getName(); + set_of_f = fnrl.matchFirst(fn); + } else { + apiname = fnapi.unwrap(); + ApiIndex ai = symbols.apis.get(apiname); + IdOrOp fnnoapi = NodeFactory.makeLocalIdOrOp(fn); + set_of_f = ai.functions().matchFirst(fnnoapi); + } + + for (Function f : set_of_f) { + OverloadSet.TaggedFunctionName tagged_f = new OverloadSet.TaggedFunctionName(apiname, f); + byCount.putItem(f.parameters().size(), tagged_f); + } + + for (Map.Entry> entry : byCount + .entrySet()) { + int i = entry.getKey(); + Set fs = entry.getValue(); + if (fs.size() > 1) { + OverloadSet os = new OverloadSet.AmongApis(name, + ta, fs, i); + + os.split(false); + os.generateAnOverloadDefinition(name.stringName(), cw); + + } + } + } + } + + /** - * @param y + * Creates overloaded functions for any overloads present at the top level + * of this component. Top level overloads are those that might be exported; + * Reference overloads are rewritten into _RewriteFnOverloadDecl nodes + * and generated in the normal visits. */ - private void pushInteger(int y) { - switch (y) { - case 0: - mv.visitInsn(Opcodes.ICONST_0); - break; - case 1: - mv.visitInsn(Opcodes.ICONST_1); - break; - case 2: - mv.visitInsn(Opcodes.ICONST_2); - break; - case 3: - mv.visitInsn(Opcodes.ICONST_3); - break; - case 4: - mv.visitInsn(Opcodes.ICONST_4); - break; - case 5: - mv.visitInsn(Opcodes.ICONST_5); - break; - default: - mv.visitLdcInsn(y); - break; - } - - } - - - public void forStringLiteralExpr(StringLiteralExpr x) { - // This is cheating, but the best we can do for now. - // We make a FString and push it on the stack. - debug("forStringLiteral ", x); - addLineNumberInfo(x); - mv.visitLdcInsn(x.getText()); - addLineNumberInfo(x); - mv.visitMethodInsn(Opcodes.INVOKESTATIC, NamingCzar.internalFortressString, NamingCzar.make, - NamingCzar.makeMethodDesc(NamingCzar.descString, NamingCzar.descFortressString)); - } - - public void forVoidLiteralExpr(VoidLiteralExpr x) { - debug("forVoidLiteral ", x); - addLineNumberInfo(x); - mv.visitMethodInsn(Opcodes.INVOKESTATIC, NamingCzar.internalFortressVoid, NamingCzar.make, - NamingCzar.makeMethodDesc("", NamingCzar.descFortressVoid)); - - } - - public void forVarRef(VarRef v) { - debug("forVarRef ", v, " which had better be local (for the moment)"); - if (v.getStaticArgs().size() > 0) { - sayWhat(v,"varRef with static args! That requires non-local VarRefs"); - } - VarCodeGen vcg = getLocalVar(v.getVarId()); - vcg.pushValue(mv); - } - + private void generateTopLevelOverloads() { + + for (Map.Entry> entry1 : topLevelOverloads.entrySet()) { + IdOrOpOrAnonymousName name = entry1.getKey(); + MultiMap partitionedByArgCount = entry1.getValue(); + + for (Map.Entry> entry : partitionedByArgCount + .entrySet()) { + int i = entry.getKey(); + Set fs = entry.getValue(); + + OverloadSet os = + new OverloadSet.Local(ci.ast().getName(), name, + ta, fs, i); + + os.split(true); + + String s = name.stringName(); + + os.generateAnOverloadDefinition(s, cw); + + for (Map.Entry o_entry : os.getOverloadSubsets().entrySet()) { + String ss = o_entry.getKey(); + ss = s + ss; + overloadedNamesAndSigs.add(ss); + } + } + } + } + + Map> + sizePartitionedOverloads(Relation fns) { + + Map> result = + new HashMap>(); + + for (IdOrOpOrAnonymousName name : fns.firstSet()) { + Set defs = fns.matchFirst(name); + if (defs.size() <= 1) continue; + + MultiMap partitionedByArgCount = + new MultiMap(); + + for (Function d : defs) { + partitionedByArgCount.putItem(d.parameters().size(), d); + } + + for (Function d : defs) { + Set sf = partitionedByArgCount.get(d.parameters().size()); + if (sf != null && sf.size() <= 1) + partitionedByArgCount.remove(d.parameters().size()); + } + if (partitionedByArgCount.size() > 0) + result.put(name, partitionedByArgCount); + } + + return result; + } + + + + private void dumpSigs(List decls) { + debug("dumpSigs", decls); + for (Decl d : decls) { + debug("dumpSigs decl =", d); + if (!(d instanceof FnDecl)) { + sayWhat(d); + return; + } + + FnDecl f = (FnDecl) d; + FnHeader h = f.getHeader(); + IdOrOpOrAnonymousName xname = h.getName(); + IdOrOp name = (IdOrOp) xname; + String desc = Naming.generateTypeDescriptor(f); + debug("about to call visitMethod with", name.getText(), + " and desc ", desc); + mv = cw.visitMethod(Opcodes.ACC_ABSTRACT + Opcodes.ACC_PUBLIC, + NamingCzar.mangleIdentifier(name.getText()), desc, null, null); + mv.visitMaxs(NamingCzar.ignore, NamingCzar.ignore); + mv.visitEnd(); + } + } } + Index: /trunk/ProjectFortress/src/com/sun/fortress/compiler/codegen/ParallelismAnalyzer.java =================================================================== --- /trunk/ProjectFortress/src/com/sun/fortress/compiler/codegen/ParallelismAnalyzer.java (revision 3852) +++ /trunk/ProjectFortress/src/com/sun/fortress/compiler/codegen/ParallelismAnalyzer.java (revision 3852) @@ -0,0 +1,170 @@ +/******************************************************************************* + Copyright 2009 Sun Microsystems, Inc., + 4150 Network Circle, Santa Clara, California 95054, U.S.A. + All rights reserved. + + U.S. Government Rights - Commercial software. + Government users are subject to the Sun Microsystems, Inc. standard + license agreement and applicable provisions of the FAR and its supplements. + + Use is subject to license terms. + + This distribution may include materials developed by third parties. + + Sun, Sun Microsystems, the Sun logo and Java are trademarks or registered + trademarks of Sun Microsystems, Inc. in the U.S. and other countries. +******************************************************************************/ + +package com.sun.fortress.compiler.phases; + +import java.util.*; +import com.sun.fortress.nodes.*; +import com.sun.fortress.nodes_util.*; +import com.sun.fortress.useful.Debug; + +import edu.rice.cs.plt.tuple.Option; + +public class ParallelismAnalyzer extends NodeAbstractVisitor { + private final HashMap worthy; + + private final static Boolean f = new Boolean(false); + private final static Boolean t = new Boolean(true); + + ParallelismAnalyzer() { + worthy = new HashMap(); + } + + private void debug(ASTNode x) { + Debug.debug(Debug.Type.CODEGEN,1, "ParallelismAnalyzer: node =" + x); + } + + private void debug(ASTNode x, String message){ + Debug.debug(Debug.Type.CODEGEN,1, "ParallelismAnalyzer: node =" + x + "::" + message); + } + + private void debug(String message) { + Debug.debug(Debug.Type.CODEGEN,1, "ParallelismAnalyzer: " + "::" + message); + } + + public Boolean defaultCase(ASTNode x) { + debug(x,"defaultCase"); + worthy.put(x, f); + return f; + } + + public Boolean forComponent(Component x) { + debug(x, "forComponent"); + + for (Decl d : x.getDecls()) { + d.accept(this); + } + worthy.put(x,f); + return f; + } + + public Boolean forFnDecl(FnDecl x) { + debug(x,"forFnDecl"); + boolean result = false; + List params = x.getHeader().getParams(); + boolean paramsWorthy[] = new boolean[params.size()]; + int i = 0; + + for (Param p : params) + paramsWorthy[i++] = p.accept(this); + + + debug(x,"ZZZZZZ" + x.getBody().unwrap()); + x.getBody().unwrap().accept(this); + return f; + } + + // The FnRef is not parallel, but as an argument it is worth parallelizing. + public Boolean forFnRef(FnRef x) { + debug(x,"forFnRef"); + worthy.put(x, f); + return t; + } + + public Boolean forIf(If x) { + debug(x,"forIf"); + for (IfClause clause : x.getClauses()) clause.accept(this); + Option maybe_else = x.getElseClause(); + if (maybe_else.isSome()) { + maybe_else.unwrap().accept(this); + } + worthy.put(x,f); + return f; + } + + public Boolean forOpExpr(OpExpr x) { + debug(x,"forOpExpr"); + List args = x.getArgs(); + boolean argsWorthy[] = new boolean[args.size()]; + int i = 0; + int count = 0; + + for (Expr e : args) { + Boolean temp = e.accept(this); + argsWorthy[i++] = temp; + if (temp) { + count++; + } + } + worthy.put(x, f); + return f; + } + + public Boolean forTraitDecl(TraitDecl x) { + debug(x,"forTraitDecl"); + for (Decl d : x.getHeader().getDecls()) d.accept(this); + worthy.put(x,f); + return f; + } + + + public Boolean for_RewriteFnApp(_RewriteFnApp x) { + debug(x,"for_RewriteFnApp"); + + Expr arg = x.getArgument(); + if (arg instanceof VoidLiteralExpr) { + + } else if (arg instanceof TupleExpr) { + TupleExpr targ = (TupleExpr) arg; + List exprs = targ.getExprs(); + + for (Expr expr : exprs) { + expr.accept(this); + } + } else { + arg.accept(this); + } + x.getFunction().accept(this); + worthy.put(x, f); + return f; + } + + // Why doesn't the defaultCase handle these? + + public Boolean forBlock(Block x) {debug(x,"forBlock"); return f;} + public Boolean forChainExpr(ChainExpr x) {debug(x,"forChainExpr"); return f;} + public Boolean forDecl(Decl x) {debug(x,"forDecl"); return f;} + public Boolean forDo(Do x) {debug(x,"forDo"); return f;} + public Boolean forIfClause(IfClause x) {debug(x,"forIfClause"); return f;} + public Boolean forImportNames(ImportNames x) {debug(x,"forImportNames"); return f;} + public Boolean forIntLiteralExpr(IntLiteralExpr x) {debug(x,"forIntLiteralExpr"); return f;} + public Boolean forObjectDecl(ObjectDecl x) {debug(x,"forObjectDecl"); return f;} + public Boolean forOpRef(OpRef x) {debug(x,"forOpRef"); return f;} + public Boolean forParam(Param x) {debug(x,"forParam"); return f;} + public Boolean forStringLiteralExpr(StringLiteralExpr x) {debug(x,"forStringLiteralExpr"); return f;} + public Boolean forSubscriptExpr(SubscriptExpr x) {debug(x,"forSubscriptExpr"); return f;} + public Boolean forVarRef(VarRef x) {debug(x,"forVarRef"); return f;} + public Boolean forVoidLiteralExpr(VoidLiteralExpr x) {debug(x,"forVoidLiteralExpr"); return f;} + public Boolean for_RewriteFnOverloadDecl(_RewriteFnOverloadDecl x) {debug(x,"for"); return f;} + + + public void printTable() { + Set keys = worthy.keySet(); + for (ASTNode key : keys) + debug("Parallelizable table entry " + key + " has value " + worthy.get(key)); + } +}