X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fnestedvm%2FUnixRuntime.java;h=bd63674c1bdf18175dcdba86bf2cfc5c7df1015f;hp=71368d8e9eff8c8b59263cad43c4aac1924142bf;hb=fe043acb5384fe545075e22967068ca93e9bc0cd;hpb=8197fc63ffd1d640b08d3117a13ce9d19d7336e9

diff --git a/src/org/ibex/nestedvm/UnixRuntime.java b/src/org/ibex/nestedvm/UnixRuntime.java
index 71368d8..bd63674 100644
--- a/src/org/ibex/nestedvm/UnixRuntime.java
+++ b/src/org/ibex/nestedvm/UnixRuntime.java
@@ -59,7 +59,6 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
                     System.err.println(s);
                     System.err.println(d);
                     while(!d.equals(root)) {
-                        System.err.println("Got " + d.getName());
                         vec.addElement(d.getName());
                         if((s = d.getParent()) == null) break;
                         d = new File(s);
@@ -174,6 +173,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
             case SYS_fchown: return sys_fchown(a,b,c);
             case SYS_chmod: return sys_chmod(a,b,c);
             case SYS_fchmod: return sys_fchmod(a,b,c);
+            case SYS_umask: return sys_umask(a);
             
             default: return super._syscall(syscall,a,b,c,d,e,f);
         }
@@ -202,7 +202,9 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
     private int sys_fchmod(int fd, int uid, int gid) {
         return 0;
     }
-    
+    private int sys_umask(int mask) {
+        return 0;
+    }
     
     private int sys_access(int cstring, int mode) throws ErrnoException, ReadFaultException {
         // FEATURE: sys_access
@@ -408,7 +410,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
     static {
         Method m;
         try {
-            m = Class.forName("org.ibex.nestedvm.RuntimeCompiler").getMethod("compile",new Class[]{Seekable.class,String.class});
+            m = Class.forName("org.ibex.nestedvm.RuntimeCompiler").getMethod("compile",new Class[]{Seekable.class,String.class,String.class});
         } catch(NoSuchMethodException e) {
             m = null;
         } catch(ClassNotFoundException e) {
@@ -417,14 +419,14 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         runtimeCompilerCompile = m;
     }
             
-    public Class runtimeCompile(Seekable s) throws IOException {
+    public Class runtimeCompile(Seekable s, String sourceName) throws IOException {
         if(runtimeCompilerCompile == null) {
             if(STDERR_DIAG) System.err.println("WARNING: Exec attempted but RuntimeCompiler not found!");
             return null;
         }
         
         try {
-            return (Class) runtimeCompilerCompile.invoke(null,new Object[]{s,"unixruntime"});
+            return (Class) runtimeCompilerCompile.invoke(null,new Object[]{s,"unixruntime,maxinsnpermethod=256,lessconstants",sourceName});
         } catch(IllegalAccessException e) {
             e.printStackTrace();
             return null;
@@ -484,7 +486,9 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
                     if(n < 4) s.tryReadFully(buf,n,4-n);
                     if(buf[1] != 'E' || buf[2] != 'L' || buf[3] != 'F') return -ENOEXEC;
                     s.seek(0);
-                    Class c = runtimeCompile(s);
+                    if(STDERR_DIAG) System.err.println("Running RuntimeCompiler for " + path);
+                    Class c = runtimeCompile(s,path);
+                    if(STDERR_DIAG) System.err.println("RuntimeCompiler finished for " + path);
                     if(c == null) throw new ErrnoException(ENOEXEC);
                     gs.execCache.put(path,new GlobalState.CacheEnt(mtime,size,c));
                     return execClass(c,argv,envp);
@@ -503,13 +507,16 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
                         if(p == buf.length) break OUTER;
                         n = s.read(buf,p,buf.length-p);
                     }
-                    int arg;
-                    for(arg=2;arg<p;arg++) if(buf[arg] == ' ') break;
-                    int cmdEnd = arg;
-                    while(arg < p && buf[arg] == ' ') arg++;
+                    int cmdStart = 2;
+                    for(;cmdStart<p;cmdStart++) if(buf[cmdStart]!=' ') break;
+                    if(cmdStart == p) throw new ErrnoException(ENOEXEC);
+                    int argStart = cmdStart;
+                    for(;argStart<p;argStart++) if(buf[argStart] == ' ') break;
+                    int cmdEnd = argStart;
+                    while(argStart < p && buf[argStart] == ' ') argStart++;
                     String[] command = new String[] {
-                        new String(buf,2,cmdEnd),
-                        arg < p ? new String(buf,arg,p-arg) : null
+                        new String(buf,cmdStart,cmdEnd-cmdStart),
+                        argStart < p ? new String(buf,argStart,p-argStart) : null
                     };
                     gs.execCache.put(path,new GlobalState.CacheEnt(mtime,size,command));
                     return execScript(path,command,argv,envp);
@@ -524,13 +531,16 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
     }
     
     public int execScript(String path, String[] command, String[] argv, String[] envp) throws ErrnoException {
-        String[] newArgv = new String[argv.length + command[1] != null ? 2 : 1];
+        String[] newArgv = new String[argv.length-1 + (command[1] != null ? 3 : 2)];
         int p = command[0].lastIndexOf('/');
         newArgv[0] = p == -1 ? command[0] : command[0].substring(p+1);
-        p = 1;
+        newArgv[1] = "/" + path;
+        p = 2;
         if(command[1] != null) newArgv[p++] = command[1];
-        newArgv[p++] = "/" + path;
         for(int i=1;i<argv.length;i++) newArgv[p++] = argv[i];
+        if(p != newArgv.length) throw new Error("p != newArgv.length");
+        System.err.println("Execing: " + command[0]);
+        for(int i=0;i<newArgv.length;i++) System.err.println("execing [" + i + "] " + newArgv[i]);
         return exec(command[0],newArgv,envp);
     }
     
@@ -1177,6 +1187,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
             if(defaultMounts) {
                 addMount("/",new HostFS());
                 addMount("/dev",new DevFS());
+                addMount("/resource",new ResourceFS());
             }
         }
         
@@ -1316,6 +1327,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         
         char[] in = new char[path.length()+1];
         char[] out = new char[in.length + (absolute ? -1 : cwd.length())];
+        path.getChars(0,path.length(),in,0);
         int inp=0, outp=0;
         
         if(absolute) {
@@ -1325,7 +1337,6 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
             outp = cwdl;
         }
 
-        path.getChars(0,path.length(),in,0);
         while(in[inp] != 0) {
             if(inp != 0) {
                 while(in[inp] != 0 && in[inp] != '/') { out[outp++] = in[inp++]; }
@@ -1353,7 +1364,8 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         }
         if(outp > 0 && out[outp-1] == '/') outp--;
         //System.err.println("normalize: " + path + " -> " + new String(out,0,outp) + " (cwd: " + cwd + ")");
-        return new String(out,0,outp);
+        int outStart = out[0] == '/' ? 1 : 0;
+        return new String(out,outStart,outp - outStart);
     }
     
     FStat hostFStat(final File f, Object data) {
@@ -1652,5 +1664,55 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         
         public void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException { throw new ErrnoException(EROFS); }
         public void unlink(UnixRuntime r, String path) throws ErrnoException { throw new ErrnoException(EROFS); }
-    }    
+    }
+    
+    
+    public static class ResourceFS extends FS {
+        final InodeCache inodes = new InodeCache(500);
+        
+        public FStat lstat(UnixRuntime r, String path) throws ErrnoException { return stat(r,path); }
+        public void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException { throw new ErrnoException(EROFS); }
+        public void unlink(UnixRuntime r, String path) throws ErrnoException { throw new ErrnoException(EROFS); }
+        
+        FStat connFStat(final URLConnection conn) {
+            return new FStat() {
+                public int type() { return S_IFREG; }
+                public int nlink() { return 1; }
+                public int mode() { return 0444; }
+                public int size() { return conn.getContentLength(); }
+                public int mtime() { return (int)(conn.getDate() / 1000); }
+                public int inode() { return inodes.get(conn.getURL().toString()); }
+                public int dev() { return devno; }
+            };
+        }
+        
+        public FStat stat(UnixRuntime r, String path) throws ErrnoException {
+            URL url = r.getClass().getResource("/" + path);
+            if(url == null) return null;
+            try {
+                return connFStat(url.openConnection());
+            } catch(IOException e) {
+                throw new ErrnoException(EIO);
+            }
+        }
+        
+        public FD open(UnixRuntime r, String path, int flags, int mode) throws ErrnoException {
+            if((flags & ~3) != 0) {
+                if(STDERR_DIAG)
+                    System.err.println("WARNING: Unsupported flags passed to ResourceFS.open(\"" + path + "\"): " + toHex(flags & ~3));
+                throw new ErrnoException(ENOTSUP);
+            }
+            if((flags&3) != RD_ONLY) throw new ErrnoException(EROFS);
+            URL url = r.getClass().getResource("/" + path);
+            if(url == null) return null;
+            try {
+                final URLConnection conn = url.openConnection();
+                Seekable.InputStream si = new Seekable.InputStream(conn.getInputStream());
+                return new SeekableFD(si,flags) { protected FStat _fstat() { return connFStat(conn); } };
+            } catch(FileNotFoundException e) {
+                if(e.getMessage() != null && e.getMessage().indexOf("Permission denied") >= 0) throw new ErrnoException(EACCES);
+                return null;
+            } catch(IOException e) { throw new ErrnoException(EIO); }
+        }
+    }
 }