X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fnestedvm%2FRuntimeCompiler.java;h=325224203a90051535e918afc2bacac514a6e1d2;hp=80f56ac2995ca51844ec5a4d03ea42bfb7f3d290;hb=ab9be117467f7459965c61e49749b333678b6e4c;hpb=98f786ce8ee1fcd9568d1c367160851d32e1c786

diff --git a/src/org/ibex/nestedvm/RuntimeCompiler.java b/src/org/ibex/nestedvm/RuntimeCompiler.java
index 80f56ac..3252242 100644
--- a/src/org/ibex/nestedvm/RuntimeCompiler.java
+++ b/src/org/ibex/nestedvm/RuntimeCompiler.java
@@ -6,19 +6,26 @@ import org.ibex.nestedvm.util.*;
 
 // FEATURE: This need a lot of work to support binaries spanned across many classes
 public class RuntimeCompiler {  
-    // FEATURE: Do we need to periodicly create a new classloader to allow old clases to be GCed?
-    private static SingleClassLoader singleClassLoader = new SingleClassLoader();
-    // FEATURE: Is it ok if this overflows?
-    private static long nextID = 1;
-    private static synchronized String uniqueID() { return Long.toString(nextID++); }
+    private static SingleClassLoader singleClassLoader;
+    private static int nextID;
     
-    public static Class compile(Seekable data) throws IOException, Compiler.Exn {
-        String className = "nextedvm.runtimecompiled_" + uniqueID();
+    public static Class compile(Seekable data) throws IOException, Compiler.Exn { return compile(data,null); }
+    public static Class compile(Seekable data, String extraoptions) throws IOException, Compiler.Exn {
+        int id;
+        synchronized(RuntimeCompiler.class) {
+            if(nextID == 32 || singleClassLoader == null) {
+                singleClassLoader = new SingleClassLoader();
+                nextID = 0;
+            }
+            id = nextID++;
+        }
+        String className = "nextedvm.runtimecompiled_" + id;
         System.err.println("RuntimeCompiler: Building " + className);
+        String options = "nosupportcall";
+        if(extraoptions != null) options += "," + extraoptions;
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ClassFileCompiler c = new ClassFileCompiler(data,className,baos);
-        // FEATURE: make this Optional, pass options on compile arguments
-        c.parseOptions("unixruntime");
+        c.parseOptions(options);
         c.go();
         baos.close();
         byte[] bytecode = baos.toByteArray();
@@ -27,7 +34,7 @@ public class RuntimeCompiler {
     
     private static class SingleClassLoader extends ClassLoader {
         public Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
-        	    System.err.println(this + ": loadClass(\"" + name + "," + resolve + ");");
+            //System.err.println(this + ": loadClass(\"" + name + "," + resolve + ");");
             return super.loadClass(name,resolve);
         }
         public Class fromBytes(String name, byte[] b) { return fromBytes(name,b,0,b.length); }
@@ -39,13 +46,13 @@ public class RuntimeCompiler {
     }
     
     public static void main(String[] args) throws Exception {
-    	    if(args.length == 0) {
-    	    	    System.err.println("Usage: RuntimeCompiler mipsbinary");
+        if(args.length == 0) {
+            System.err.println("Usage: RuntimeCompiler mipsbinary");
             System.exit(1);
         }
         UnixRuntime r = (UnixRuntime) compile(new Seekable.File(args[0])).newInstance();
         System.err.println("Instansiated: "+ r);
-        System.exit(r.run(args));
+        System.exit(UnixRuntime.runAndExec(r,args));
     }
     
     private RuntimeCompiler() { }