licensing update to APSL 2.0

[nestedvm.git] / src / org / ibex / nestedvm / RuntimeCompiler.java

diff --git a/src/org/ibex/nestedvm/RuntimeCompiler.java b/src/org/ibex/nestedvm/RuntimeCompiler.java
index 2d0a182..443c217 100644 (file)
--- a/src/org/ibex/nestedvm/RuntimeCompiler.java
+++ b/src/org/ibex/nestedvm/RuntimeCompiler.java
@@ -1,10 +1,14 @@
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the Apache Public Source License 2.0 ("the License").
+// You may not use this file except in compliance with the License.
+
 package org.ibex.nestedvm;
 
 import java.io.*;
 
 import org.ibex.nestedvm.util.*;
 
-// FEATURE: This need a lot of work to support binaries spanned across many classes
+// This need a lot of work to support binaries spanned across many classes
 public class RuntimeCompiler {  
     private static SingleClassLoader singleClassLoader;
     private static int nextID;
@@ -21,15 +25,33 @@ public class RuntimeCompiler {
         }
         String className = "nestedvm.runtimecompiled_" + id;
         System.err.println("RuntimeCompiler: Building " + className);
-        String options = "nosupportcall";
-        if(extraoptions != null) options += "," + extraoptions;
+        byte[] bytecode;
+        try {
+            bytecode = runCompiler(data,className,extraoptions,null);
+        } catch(Compiler.Exn e) {
+            if(e.getMessage() != null || e.getMessage().indexOf("constant pool full")  != -1)
+                bytecode = runCompiler(data,className,extraoptions,"lessconstants");
+            else
+                throw e;
+        }
+        return singleClassLoader.fromBytes(className,bytecode);
+    }
+    
+    private static byte[] runCompiler(Seekable data, String name, String options, String moreOptions) throws IOException, Compiler.Exn {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ClassFileCompiler c = new ClassFileCompiler(data,className,baos);
-        c.parseOptions(options);
-        c.go();
+        
+        try {
+            ClassFileCompiler c = new ClassFileCompiler(data,name,baos);
+            c.parseOptions("nosupportcall,maxinsnpermethod=256");
+            if(options != null) c.parseOptions(options);
+            if(moreOptions != null) c.parseOptions(moreOptions);
+            c.go();
+        } finally {
+            data.seek(0);
+        }
+        
         baos.close();
-        byte[] bytecode = baos.toByteArray();
-        return singleClassLoader.fromBytes(className,bytecode);
+        return baos.toByteArray();        
     }
     
     private static class SingleClassLoader extends ClassLoader {