X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fnestedvm%2FUnixRuntime.java;h=051a50be063926a90b68c1f811487254a09ae4d2;hp=3befb91aeaf744fe096c22a9630b73c0d631af36;hb=c59b7cfc7a6b67574d38c5c8eb7732bad37236b0;hpb=c2b2704764af1ade923ba8f15d517b87f9d16189

diff --git a/src/org/ibex/nestedvm/UnixRuntime.java b/src/org/ibex/nestedvm/UnixRuntime.java
index 3befb91..051a50b 100644
--- a/src/org/ibex/nestedvm/UnixRuntime.java
+++ b/src/org/ibex/nestedvm/UnixRuntime.java
@@ -4,60 +4,37 @@ import org.ibex.nestedvm.util.*;
 import java.io.*;
 import java.util.*;
 
-public abstract class UnixRuntime extends Runtime {
+// FEATURE: Remove System.{out,err}.printlns and throw Errors where applicable
+
+// FEATURE: BusyBox's ASH doesn't like \r\n at the end of lines
+// is ash just broken or are many apps like this? if so workaround in nestedvm
+
+public abstract class UnixRuntime extends Runtime implements Cloneable {
     /** The pid of this "process" */
     private int pid;
-    private int ppid;
+    private UnixRuntime parent;
     protected int getPid() { return pid; }
     
-    /** processes filesystem */
-    private FS fs;
-    public FS getFS() { return fs; }
-    public void setFS(FS fs) {
-        if(state >= RUNNING) throw new IllegalStateException("Can't change fs while process is running");
-        this.fs = fs;
-    }
+    private static final GlobalState defaultGD = new GlobalState();
+    private GlobalState gd = defaultGD;
     
-    /** proceses current working directory */
+    /** proceses' current working directory - absolute path WITHOUT leading slash
+        "" = root, "bin" = /bin "usr/bin" = /usr/bin */
     private String cwd;
     
-    /* Static stuff */
-    // FEATURE: Most of this is O(n) or worse - fix it
-    private final Object waitNotification = new Object();
-    private final static int MAX_TASKS = 256;
-    private final static UnixRuntime[] tasks = new UnixRuntime[MAX_TASKS];
-    private static int addTask(UnixRuntime rt) {
-        synchronized(tasks) {
-            for(int i=1;i<MAX_TASKS;i++) {
-                if(tasks[i] == null) {
-                    tasks[i] = rt;
-                    rt.pid = i;
-                    return i;
-                }
-            }
-            return -1;
-        }
-    }
-    private static void removeTask(UnixRuntime rt) {
-        synchronized(tasks) {
-            for(int i=1;i<MAX_TASKS;i++)
-                if(tasks[i] == rt) { tasks[i] = null; break; }
-        }
-    }
+    /** The runtime that should be run next when in state == EXECED */
+    private UnixRuntime execedRuntime;
+
+    private Object children; // used only for synchronizatin
+    private Vector activeChildren;
+    private Vector exitedChildren;
     
-    public UnixRuntime(int pageSize, int totalPages, boolean allowEmptyPages) {
-        super(pageSize,totalPages,allowEmptyPages);
-        
-        HostFS root = new HostFS();
-        fs = new UnixOverlayFS(root);
-        
-        String dir = root.hostCWD();
-        try {
-            chdir(dir == null ? "/" : dir);
-        } catch(FileNotFoundException e) {
-            e.printStackTrace();
-            cwd = "/";
-        }
+    public UnixRuntime(int pageSize, int totalPages) {
+        super(pageSize,totalPages);
+                
+        // FEATURE: Do the proper mangling for non-unix hosts
+        String userdir = getSystemProperty("user.dir");
+        cwd = userdir != null && userdir.startsWith("/") && File.separatorChar == '/'  ? userdir.substring(1) : "";
     }
     
     // NOTE: getDisplayName() is a Java2 function
@@ -99,25 +76,27 @@ public abstract class UnixRuntime extends Runtime {
         return env;
     }
     
-    protected void _start() {
-        if(addTask(this) < 0) throw new Error("Task list full");
-    }
+    private static class ProcessTableFullExn extends RuntimeException { }
     
-    protected void _exit() {
-        synchronized(tasks) {
-            if(ppid == 0) removeTask(this);
-            for(int i=0;i<MAX_TASKS;i++) {
-                if(tasks[i] != null && tasks[i].ppid == pid) {
-                    if(tasks[i].state == DONE) removeTask(tasks[i]);
-                    else tasks[i].ppid = 0;
-                }
+    protected void _started() {
+        UnixRuntime[] tasks = gd.tasks;
+        synchronized(gd) {
+            if(pid != 0) {
+                if(tasks[pid] == null || tasks[pid].pid != pid) throw new Error("should never happen");
+            } else {
+                int newpid = -1;
+                int nextPID = gd.nextPID;
+            	    for(int i=nextPID;i<tasks.length;i++) if(tasks[i] == null) { newpid = i; break; }
+            	    if(newpid == -1) for(int i=1;i<nextPID;i++) if(tasks[i] == null) { newpid = i; break; }
+            	    if(newpid == -1) throw new ProcessTableFullExn();
+            	    pid = newpid;
+                gd.nextPID = newpid + 1;
             }
-            state = DONE;
-            if(ppid != 0) synchronized(tasks[ppid].waitNotification) { tasks[ppid].waitNotification.notify(); }
+            tasks[pid] = this;
         }
     }
-
-    protected int syscall(int syscall, int a, int b, int c, int d) {
+    
+    int _syscall(int syscall, int a, int b, int c, int d) throws ErrnoException, FaultException {
         switch(syscall) {
             case SYS_kill: return sys_kill(a,b);
             case SYS_fork: return sys_fork();
@@ -125,19 +104,20 @@ public abstract class UnixRuntime extends Runtime {
             case SYS_dup2: return sys_dup2(a,b);
             case SYS_waitpid: return sys_waitpid(a,b,c);
             case SYS_stat: return sys_stat(a,b);
+            case SYS_lstat: return sys_lstat(a,b);
             case SYS_mkdir: return sys_mkdir(a,b);
             case SYS_getcwd: return sys_getcwd(a,b);
             case SYS_chdir: return sys_chdir(a);
+            case SYS_exec: return sys_exec(a,b,c);
 
-            default: return super.syscall(syscall,a,b,c,d);
+            default: return super._syscall(syscall,a,b,c,d);
         }
     }
     
-    protected FD open(String path, int flags, int mode) throws IOException { return fs.open(cleanupPath(path),flags,mode); }
+    protected FD _open(String path, int flags, int mode) throws ErrnoException {
+        return gd.open(this,normalizePath(path),flags,mode);
+    }
 
-    // FEATURE: Allow simple, broken signal delivery to other processes 
-    // (check if a signal was delivered before and after syscalls)
-    // FEATURE: Implement raise() in terms of call("raise",...) - kinda cheap, but it keeps the complexity in newlib
     /** The kill syscall.
        SIGSTOP, SIGTSTO, SIGTTIN, and SIGTTOUT pause the process.
        SIGCONT, SIGCHLD, SIGIO, and SIGWINCH are ignored.
@@ -160,112 +140,219 @@ public abstract class UnixRuntime extends Runtime {
             case 23: // SIGIO
             case 28: // SIGWINCH
                 break;
-            default: {
-                String msg = "Terminating on signal: " + signal + "\n";
-                exitStatus = 1;
-                state = DONE;
-                if(fds[2]==null) {
-                    System.out.print(msg);
-                } else {
-                    try {
-                        byte[] b = getBytes(msg); 
-                        fds[2].write(b,0,b.length);
-                    }
-                    catch(IOException e) { /* ignore */ }
-                }
-            }
+            default:
+                return syscall(SYS_exit,128+signal,0,0,0);
         }
         return 0;
     }
 
-    private int sys_waitpid(int pid, int statusAddr, int options) {
+    private int sys_waitpid(int pid, int statusAddr, int options) throws FaultException, ErrnoException {
+        System.err.println("PID: " + this.pid + " is waiting on " + pid);
         final int WNOHANG = 1;
         if((options & ~(WNOHANG)) != 0) return -EINVAL;
-        if(pid !=-1 && (pid <= 0 || pid >= MAX_TASKS)) return -ECHILD;
-        for(;;) {
-            synchronized(tasks) {
-                UnixRuntime task = null;
+        if(pid == 0 || pid < -1) {
+            System.err.println("WARNING: waitpid called with a pid of " + pid);
+            return -ECHILD;
+        }
+        boolean blocking = (options&WNOHANG)==0;
+        
+        if(pid !=-1 && (pid <= 0 || pid >= gd.tasks.length)) return -ECHILD;
+        if(children == null) return blocking ? -ECHILD : 0;
+        
+        UnixRuntime done = null;
+        
+        synchronized(children) {
+            for(;;) {
                 if(pid == -1) {
-                    for(int i=0;i<MAX_TASKS;i++) {
-                        if(tasks[i] != null && tasks[i].ppid == this.pid && tasks[i].state == DONE) {
-                            task = tasks[i];
-                            break;
-                        }
+                    if(exitedChildren.size() > 0) done = (UnixRuntime)exitedChildren.remove(exitedChildren.size() - 1);
+                } else if(pid > 0) {
+                    UnixRuntime t = gd.tasks[pid];
+                    if(t.parent != this) return -ECHILD;
+                    if(t.state == EXITED) {
+                        if(!exitedChildren.remove(t)) throw new Error("should never happen");
+                        done = t;
                     }
-                } else if(tasks[pid] != null && tasks[pid].ppid == this.pid && tasks[pid].state == DONE) {
-                    task = tasks[pid];
+                } else {
+                    // process group stuff, EINVAL returned above
+                	    throw new Error("should never happen");
                 }
-                
-                if(task != null) {
-                    removeTask(task);
-                    try {
-                        if(statusAddr!=0) memWrite(statusAddr,task.exitStatus()<<8);
-                    } catch(FaultException e) {
-                        return -EFAULT;
-                    }
-
-                    return task.pid;
+                if(done == null) {
+                    if(!blocking) return 0;
+                    try { children.wait(); } catch(InterruptedException e) {}
+                    System.err.println("waitpid woke up: " + exitedChildren.size());
+                } else {
+                    gd.tasks[done.pid] = null;
+                    break;
                 }
             }
-            if((options&WNOHANG)!=0) return 0;
-            synchronized(waitNotification) {
-                try { waitNotification.wait(); } catch(InterruptedException e) { /* ignore */ }
+        }
+        if(statusAddr!=0) memWrite(statusAddr,done.exitStatus()<<8);
+        return done.pid;
+    }
+    
+    
+    protected void _exited() {
+        if(children != null) synchronized(children) {
+            for(Enumeration e = exitedChildren.elements(); e.hasMoreElements(); ) {
+                UnixRuntime child = (UnixRuntime) e.nextElement();
+                    gd.tasks[child.pid] = null;
+            }
+            exitedChildren.clear();
+            for(Enumeration e = activeChildren.elements(); e.hasMoreElements(); ) {
+                UnixRuntime child = (UnixRuntime) e.nextElement();
+                child.parent = null;
+            }
+            activeChildren.clear();
+        }
+        
+        UnixRuntime _parent = parent;
+        if(_parent == null) {
+            gd.tasks[pid] = null;
+        } else {
+            synchronized(_parent.children) {
+                if(parent == null) {
+                    gd.tasks[pid] = null;
+                } else {
+                    parent.activeChildren.remove(this);
+                    parent.exitedChildren.add(this);
+                    parent.children.notify();
+                }
             }
         }
     }
     
-    // Great ugliness lies within.....
+    protected Object clone() throws CloneNotSupportedException {
+    	    UnixRuntime r = (UnixRuntime) super.clone();
+        r.pid = 0;
+        r.parent = null;
+        r.children = null;
+        r.activeChildren = r.exitedChildren = null;
+        return r;
+    }
+
     private int sys_fork() {
-        CPUState state = getCPUState();
+        CPUState state = new CPUState();
+        getCPUState(state);
         int sp = state.r[SP];
         final UnixRuntime r;
+        
         try {
-            r = (UnixRuntime) getClass().newInstance();
+            r = (UnixRuntime) clone();
         } catch(Exception e) {
-            System.err.println(e);
+            e.printStackTrace();
             return -ENOMEM;
         }
-        int child_pid = addTask(r);
-        if(child_pid < 0) return -ENOMEM;
-        
-        r.ppid = pid;
-        r.brkAddr = brkAddr;
-        r.fds = new FD[OPEN_MAX];
-        for(int i=0;i<OPEN_MAX;i++) if(fds[i] != null) r.fds[i] = fds[i].dup();
-        r.cwd = cwd;
-        r.fs = fs;
-        for(int i=0;i<TOTAL_PAGES;i++) {
-            if(readPages[i] == null) continue;
-            if(isEmptyPage(writePages[i])) {
-                r.readPages[i] = r.writePages[i] = writePages[i];
-            } else if(writePages[i] != null) {
-                r.readPages[i] = r.writePages[i] = new int[PAGE_WORDS];
-                if(STACK_BOTTOM == 0 || i*PAGE_SIZE < STACK_BOTTOM || i*PAGE_SIZE >= sp-PAGE_SIZE*2)
-                    System.arraycopy(writePages[i],0,r.writePages[i],0,PAGE_WORDS);
-            } else {
-                r.readPages[i] = r.readPages[i];
-            }
+
+        r.parent = this;
+
+        try {
+            r._started();
+        } catch(ProcessTableFullExn e) {
+        	    return -ENOMEM;
+        }
+
+        System.err.println("fork " + pid + " -> " + r.pid + " tasks[" + r.pid + "] = " + gd.tasks[r.pid]);
+        if(children == null) {
+            children = new Object();
+            activeChildren = new Vector();
+            exitedChildren = new Vector();
         }
-        state.r[V0] = 0;
-        state.pc += 4;
+        activeChildren.add(r);
+        
+        state.r[V0] = 0; // return 0 to child
+        state.pc += 4; // skip over syscall instruction
         r.setCPUState(state);
         r.state = PAUSED;
         
-        new Thread() {
-            public void run() {
-                try {
-                    while(!r.execute());
-                } catch(Exception e) {
-                    System.err.println("Forked process threw exception: ");
-                    e.printStackTrace();
-                }
+        new ForkedProcess(r);
+        
+        return r.pid;
+    }
+    
+    public static final class ForkedProcess extends Thread {
+        private final UnixRuntime initial;
+        public ForkedProcess(UnixRuntime initial) { this.initial = initial; start(); }
+        public void run() { UnixRuntime.executeAndExec(initial); }
+    }
+    
+    public static int runAndExec(UnixRuntime r, String argv0, String[] rest) { return runAndExec(r,concatArgv(argv0,rest)); }
+    public static int runAndExec(UnixRuntime r, String[] argv) { r.start(argv); return executeAndExec(r); }
+    
+    public static int executeAndExec(UnixRuntime r) {
+    	    for(;;) {
+            for(;;) {
+                if(r.execute()) break;
+                System.err.println("WARNING: Pause requested while executing runAndExec()");
             }
-        }.start();
+            if(r.state != EXECED) return r.exitStatus();
+            r = r.execedRuntime;
+        }
+    }
+     
+    private String[] readStringArray(int addr) throws ReadFaultException {
+    	    int count = 0;
+        for(int p=addr;memRead(p) != 0;p+=4) count++;
+        String[] a = new String[count];
+        for(int i=0,p=addr;i<count;i++,p+=4) a[i] = cstring(memRead(p));
+        return a;
+    }
+    
+    private int sys_exec(int cpath, int cargv, int cenvp) throws ErrnoException, FaultException {
+    	    return exec(normalizePath(cstring(cpath)),readStringArray(cargv),readStringArray(cenvp));
+    }
         
-        return child_pid;        
+    private int exec(String normalizedPath, String[] argv, String[] envp) throws ErrnoException {
+        if(argv.length == 0) argv = new String[]{""};
+
+        Object o = gd.exec(this,normalizedPath);
+        if(o == null) return -ENOENT;
+
+        if(o instanceof Class) {
+            Class c = (Class) o;
+            try {
+            	    return exec((UnixRuntime) c.newInstance(),argv,envp);
+            } catch(Exception e) {
+            	    e.printStackTrace();
+                return -ENOEXEC;
+            }
+        } else {
+            String[] command = (String[]) o;
+            String[] newArgv = new String[argv.length + command[1] != null ? 2 : 1];
+            int p = command[0].lastIndexOf('/');
+            newArgv[0] = p == -1 ? command[0] : command[0].substring(p+1);
+            p = 1;
+            if(command[1] != null) newArgv[p++] = command[1];
+            newArgv[p++] = "/" + normalizedPath;
+            for(int i=1;i<argv.length;i++) newArgv[p++] = argv[i];
+            return exec(command[0],newArgv,envp);
+        }
     }
-            
-    private int sys_pipe(int addr) {
+    
+    private int exec(UnixRuntime r, String[] argv, String[] envp) {     
+        
+        System.err.println("Execing " + r);
+        for(int i=0;i<OPEN_MAX;i++) if(closeOnExec[i]) closeFD(i);
+        r.fds = fds;
+        r.closeOnExec = closeOnExec;
+        // make sure this doesn't get messed with these since we didn't copy them
+        fds = null;
+        closeOnExec = null;
+        
+        r.gd = gd;
+        r.sm = sm;
+        r.cwd = cwd;
+        r.pid = pid;
+        r.parent = parent;
+        r.start(argv,envp);
+                
+        state = EXECED;
+        execedRuntime = r;
+        
+        return 0;   
+    }
+    
+    // FEATURE: Use custom PipeFD - be sure to support PIPE_BUF of data
+    private int sys_pipe(int addr) throws FaultException {
         PipedOutputStream writerStream = new PipedOutputStream();
         PipedInputStream readerStream;
         try {
@@ -300,87 +387,261 @@ public abstract class UnixRuntime extends Runtime {
         return 0;
     }
     
-    private int sys_stat(int cstring, int addr) {
-        try {
-            String path = cleanupPath(cstring(cstring));
-            return stat(fs.stat(path),addr);
-        }
-        catch(ErrnoException e) { return -e.errno; }
-        catch(FileNotFoundException e) {
-            if(e.getMessage() != null && e.getMessage().indexOf("Permission denied") >= 0) return -EACCES;
-            return -ENOENT;
-        }
-        catch(IOException e) { return -EIO; }
-        catch(FaultException e) { return -EFAULT; }
+    private int sys_stat(int cstring, int addr) throws FaultException, ErrnoException {
+        FStat s = gd.stat(this,normalizePath(cstring(cstring)));
+        if(s == null) return -ENOENT;
+        return stat(s,addr);
     }
     
+    private int sys_lstat(int cstring, int addr) throws FaultException, ErrnoException {
+        FStat s = gd.lstat(this,normalizePath(cstring(cstring)));
+        if(s == null) return -ENOENT;
+        return stat(s,addr);
+    }
     
-    private int sys_mkdir(int cstring, int mode) {
-        try {
-            fs.mkdir(cleanupPath(cstring(cstring)));
-            return 0;
-        }
-        catch(ErrnoException e) { return -e.errno; }
-        catch(FileNotFoundException e) { return -ENOENT; }
-        catch(IOException e) { return -EIO; }
-        catch(FaultException e) { return -EFAULT; }
+    private int sys_mkdir(int cstring, int mode) throws FaultException, ErrnoException {
+        gd.mkdir(this,normalizePath(cstring(cstring)),mode);
+        return 0;
     }
    
     
-    private int sys_getcwd(int addr, int size) {
+    private int sys_getcwd(int addr, int size) throws FaultException, ErrnoException {
         byte[] b = getBytes(cwd);
         if(size == 0) return -EINVAL;
-        if(size < b.length+1) return -ERANGE;
-        if(!new File(cwd).exists()) return -ENOENT;
-        try {
-            copyout(b,addr,b.length);
-            memset(addr+b.length+1,0,1);
-            return addr;
-        } catch(FaultException e) {
-            return -EFAULT;
-        }
+        if(size < b.length+2) return -ERANGE;
+        memset(addr,'/',1);
+        copyout(b,addr+1,b.length);
+        memset(addr+b.length+1,0,1);
+        return addr;
     }
     
-    private int sys_chdir(int addr) {
-        try {
-            String path = cleanupPath(cstring(addr));
-            System.err.println("Chdir: " + cstring(addr) + " -> " + path + " pwd: " + cwd);
-            if(fs.stat(path).type() != FStat.S_IFDIR) return -ENOTDIR;
-            cwd = path;
-            System.err.println("Now: " + cwd);
-            return 0;
-        }
-        catch(ErrnoException e) { return -e.errno; }
-        catch(FileNotFoundException e) { return -ENOENT; }
-        catch(IOException e) { return -EIO; }
-        catch(FaultException e) { return -EFAULT; }
+    private int sys_chdir(int addr) throws ErrnoException, FaultException {
+        String path = normalizePath(cstring(addr));
+        System.err.println("Chdir: " + cstring(addr) + " -> " + path + " pwd: " + cwd);
+        if(gd.stat(this,path).type() != FStat.S_IFDIR) return -ENOTDIR;
+        cwd = path;
+        System.err.println("Now: [" + cwd + "]");
+        return 0;
     }
+    
+    //  FEATURE: Run through the fork/wait stuff one more time
+    public static class GlobalState {    
+        protected static final int OPEN = 1;
+        protected static final int STAT = 2;
+        protected static final int LSTAT = 3;
+        protected static final int MKDIR = 4;
+        
+        // Make this protected (need to fix _exit)
+        private final UnixRuntime[] tasks;
+        private int nextPID = 1;
+        
+        private final MP[][] mps = new MP[128][];
+        private FS root;
+        
+        public GlobalState() { this(255); }
+        public GlobalState(int maxProcs) { this(maxProcs,true); }
+        public GlobalState(int maxProcs, boolean defaultMounts) {
+            tasks = new UnixRuntime[maxProcs+1];
+            if(defaultMounts) {
+            	    root = new HostFS();
+                addMount("/dev",new DevFS());
+            }
+        }
+        
+        private static class MP {
+            public MP(String path, FS fs) { this.path = path; this.fs = fs; }
+            public String path;
+            public FS fs;
+            public int compareTo(Object o) {
+                if(!(o instanceof MP)) return 1;
+                return -path.compareTo(((MP)o).path);
+            }
+        }
+        
+        public synchronized FS getMount(String path) {
+            if(!path.startsWith("/")) throw new IllegalArgumentException("Mount point doesn't start with a /");
+            if(path.equals("/")) return root;
+            path  = path.substring(1);
+            int f = path.charAt(0) & 0x7f;
+            for(int i=0;mps[f] != null && i < mps[f].length;i++)
+                if(mps[f][i].path.equals(path)) return mps[f][i].fs;
+            return null;
+        }
+        
+        public synchronized void addMount(String path, FS fs) {
+            if(getMount(path) != null) throw new IllegalArgumentException("mount point already exists");
+            if(!path.startsWith("/")) throw new IllegalArgumentException("Mount point doesn't start with a /");
+            if(path.equals("/")) { root = fs; return; }
+            path = path.substring(1);
+            int f = path.charAt(0) & 0x7f;
+            int oldLength = mps[f] == null ? 0 : mps[f].length;
+            MP[] newList = new MP[oldLength + 1];
+            if(oldLength != 0) System.arraycopy(mps[f],0,newList,0,oldLength);
+            newList[oldLength] = new MP(path,fs);
+            Arrays.sort(newList);
+            mps[f] = newList;
+        }
+        
+        public synchronized void removeMount(String path) {
+            if(getMount(path) == null) throw new IllegalArgumentException("mount point doesn't exist");
+            if(!path.startsWith("/")) throw new IllegalArgumentException("Mount point doesn't start with a /");
+            if(path.equals("/")) { root = null; return; }
+            path = path.substring(1);
+            int f = path.charAt(0) & 0x7f;
+            MP[] oldList = mps[f];
+            MP[] newList = new MP[oldList.length - 1];
+            int p = 0;
+            for(p=0;p<oldList.length;p++) if(oldList[p].path.equals(path)) break;
+            if(p == oldList.length) throw new Error("should never happen");
+            System.arraycopy(oldList,0,newList,0,p);
+            System.arraycopy(oldList,0,newList,p,oldList.length-p-1);
+            mps[f] = newList;
+        }
+        
+        private Object fsop(int op, UnixRuntime r, String path, int arg1, int arg2) throws ErrnoException {
+            int pl = path.length();
+            if(pl != 0) {
+            	    MP[] list = mps[path.charAt(0) & 0x7f];
+                if(list != null) {
+                    for(int i=0;i<list.length;i++) {
+                    	    MP mp = list[i];
+                    	    int mpl = mp.path.length();
+                        if(path.startsWith(mp.path) && (pl == mpl || (pl < mpl && path.charAt(mpl) == '/')))
+                        	    return dispatch(mp.fs,op,r,pl == mpl ? "" : path.substring(mpl+1),arg1,arg2);
+                    }
+                }
+            }
+            return dispatch(root,op,r,path,arg1,arg2);
+        }
+        
+        private static Object dispatch(FS fs, int op, UnixRuntime r, String path, int arg1, int arg2) throws ErrnoException {
+            switch(op) {
+            	    case OPEN: return fs.open(r,path,arg1,arg2);
+                case STAT: return fs.stat(r,path);
+                case LSTAT: return fs.lstat(r,path);
+                case MKDIR: fs.mkdir(r,path,arg1); return null;
+                default: throw new Error("should never happen");
+            }
+        }
+        
+        public final FD open(UnixRuntime r, String path, int flags, int mode) throws ErrnoException { return (FD) fsop(OPEN,r,path,flags,mode); }
+        public final FStat stat(UnixRuntime r, String path) throws ErrnoException { return (FStat) fsop(STAT,r,path,0,0); }
+        public final FStat lstat(UnixRuntime r, String path) throws ErrnoException { return (FStat) fsop(LSTAT,r,path,0,0); }
+        public final void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException { fsop(MKDIR,r,path,mode,0); }
+        
+        private Hashtable execCache = new Hashtable();
+        private static class CacheEnt {
+            public final long time;
+            public final long size;
+            public final Object o;
+            public CacheEnt(long time, long size, Object o) { this.time = time; this.size = size; this.o = o; }
+        }
 
-    public void chdir(String dir) throws FileNotFoundException {
-        if(state >= RUNNING) throw new IllegalStateException("Can't chdir while process is running");
-        try {
-            dir = cleanupPath(dir);
-            if(fs.stat(dir).type() != FStat.S_IFDIR) throw new FileNotFoundException();
-        } catch(IOException e) {
-            throw new FileNotFoundException();
+        public synchronized Object exec(UnixRuntime r, String path) throws ErrnoException {
+            FStat fstat = stat(r,path);
+            if(fstat == null) return null;
+            long mtime = fstat.mtime();
+            long size = fstat.size();
+            CacheEnt ent = (CacheEnt) execCache.get(path);
+            if(ent != null) {
+                System.err.println("Found cached entry for " + path);
+            	    if(ent.time == mtime && ent.size == size) return ent.o;
+                System.err.println("Cache was out of date");
+                execCache.remove(path);
+            }
+            FD fd = open(r,path,RD_ONLY,0);
+            if(fd == null) return null;
+            Seekable s = fd.seekable();
+            
+            String[] command  = null;
+
+            if(s == null) throw new ErrnoException(EACCES);
+            byte[] buf = new byte[4096];
+            
+            try {
+                int n = s.read(buf,0,buf.length);
+                if(n == -1) throw new Error("zero length file");
+                
+                switch(buf[0]) {
+                    case '\177': // possible ELF
+                        if(n < 4 && s.tryReadFully(buf,n,4-n) != 4-n) throw new ErrnoException(ENOEXEC);
+                        if(buf[1] != 'E' || buf[2] != 'L' || buf[3] != 'F') throw new ErrnoException(ENOEXEC);
+                        break;
+                    case '#':
+                        if(n == 1) {
+                        	    int n2 = s.read(buf,1,buf.length-1);
+                            if(n2 == -1) throw new ErrnoException(ENOEXEC);
+                            n += n2;
+                        }
+                        if(buf[1] != '!') throw new ErrnoException(ENOEXEC);
+                        int p = 2;
+                        n -= 2;
+                        OUTER: for(;;) {
+                        	    for(int i=p;i<p+n;i++) if(buf[i] == '\n') { p = i; break OUTER; }
+                            p += n;
+                            if(p == buf.length) break OUTER;
+                            n = s.read(buf,p,buf.length-p);
+                        }
+                        command = new String[2];
+                        int arg;
+                        for(arg=2;arg<p;arg++) if(buf[arg] == ' ') break;
+                        if(arg < p) {
+                            int cmdEnd = arg;
+                        	    while(arg < p && buf[arg] == ' ') arg++;
+                            command[0] = new String(buf,2,cmdEnd);
+                            command[1] = arg < p ? new String(buf,arg,p-arg) : null;
+                        } else {
+                        	    command[0] = new String(buf,2,p-2);
+                        }
+                        System.err.println("command[0]: " + command[0] + " command[1]: " + command[1]);
+                        break;
+                    default:
+                        throw new ErrnoException(ENOEXEC);
+                }
+            } catch(IOException e) {
+                fd.close();
+            	    throw new ErrnoException(EIO);
+            }
+                        
+            if(command == null) {
+                // its an elf binary
+                try {
+                    s.seek(0);
+                	    Class c = RuntimeCompiler.compile(s);
+                    System.err.println("Compile succeeded: " + c);
+                    ent = new CacheEnt(mtime,size,c);
+                } catch(Compiler.Exn e) {
+                    throw new ErrnoException(ENOEXEC);
+                } catch(IOException e) {
+                	    throw new ErrnoException(EIO);
+                }
+            } else {
+            	    ent = new CacheEnt(mtime,size,command);
+            }
+            
+            fd.close();
+            
+            execCache.put(path,ent);
+            return ent.o;
         }
-        cwd = dir;
     }
         
     public abstract static class FS {
-        public FD open(String path, int flags, int mode) throws IOException { throw new FileNotFoundException(); }
-        public FStat stat(String path) throws IOException { throw new FileNotFoundException(); }
-        public void mkdir(String path) throws IOException { throw new ErrnoException(ENOTDIR); }
-        
-        public static FD directoryFD(String[] files, int hashCode) throws IOException {
+		// FEATURE: inode stuff
+        // FEATURE: Implement whatever is needed to get newlib's opendir and friends to work - that patch is a pain
+        protected static FD directoryFD(String[] files, int hashCode)  {
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
             DataOutputStream dos = new DataOutputStream(bos);
-            for(int i=0;i<files.length;i++) {
-                byte[] b = getBytes(files[i]);
-                int inode = (files[i].hashCode() ^ hashCode) & 0xfffff;
-                dos.writeInt(inode);
-                dos.writeInt(b.length);
-                dos.write(b,0,b.length);
+            try {
+            	    for(int i=0;i<files.length;i++) {
+                	    	byte[] b = getBytes(files[i]);
+                    int inode = (files[i].hashCode() ^ hashCode) & 0xfffff;
+                    dos.writeInt(inode);
+                    dos.writeInt(b.length);
+                    dos.write(b,0,b.length);
+                }
+            } catch(IOException e) {
+            	    return null;
             }
             final byte[] data = bos.toByteArray();
             return new SeekableFD(new Seekable.ByteArray(data,false),RD_ONLY) {
@@ -390,141 +651,120 @@ public abstract class UnixRuntime extends Runtime {
                 }; }
             };
         }
+
+        public FStat lstat(UnixRuntime r, String path) throws ErrnoException { return stat(r,path); }
+
+        // If this returns null it'll be truned into an ENOENT
+        public abstract FD open(UnixRuntime r, String path, int flags, int mode) throws ErrnoException;
+        // If this returns null it'll be turned into an ENOENT
+        public abstract FStat stat(UnixRuntime r, String path) throws ErrnoException;
+        public abstract void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException;
     }
         
-    private static boolean needsCleanup(String path) {
-        if(path.indexOf("//") != -1) return true;
-        if(path.indexOf('.') != -1) {
-            if(path.length() == 1) return true;
-            if(path.equals("..")) return true;
-            if(path.startsWith("./")  || path.indexOf("/./")  != -1 || path.endsWith("/."))  return true;
-            if(path.startsWith("../") || path.indexOf("/../") != -1 || path.endsWith("/..")) return true;
+    private String normalizePath(String path) {
+        boolean absolute = path.startsWith("/");
+        int cwdl = cwd.length();
+        // NOTE: This isn't just a fast path, it handles cases the code below doesn't
+        if(!path.startsWith(".") && path.indexOf("./") == -1 && path.indexOf("//") == -1 && !path.endsWith("."))
+            return absolute ? path.substring(1) : cwdl == 0 ? path : path.length() == 0 ? cwd : cwd + "/" + path;
+        
+        char[] in = new char[path.length()+1];
+        char[] out = new char[in.length + (absolute ? -1 : cwd.length())];
+        int inp=0, outp=0;
+        
+        if(absolute) {
+            do { inp++; } while(in[inp] == '/');
+        } else if(cwdl != 0) {
+            	cwd.getChars(0,cwdl,out,0);
+            	outp = cwdl;
         }
-        return false;
-    }
-    
-    // FIXME: This is probably still buggy
-    // FEATURE: Remove some of the "should never happen checks"
-    protected String cleanupPath(String p) throws ErrnoException {
-        if(p.length() == 0) throw new ErrnoException(ENOENT);
-        if(needsCleanup(p)) {
-            char[] in = p.toCharArray();
-            char[] out;
-            int outp ;
-            if(in[0] == '/') {
-                out = new char[in.length];
-                outp = 0;
-            } else {
-                out = new char[cwd.length() + in.length + 1];
-                outp = cwd.length();
-                for(int i=0;i<outp;i++) out[i] = cwd.charAt(i);
-                if(outp == 0 || out[0] != '/') throw new Error("should never happen");
+            
+        path.getChars(0,path.length(),in,0);
+        while(in[inp] != 0) {
+            if(inp != 0) {
+            	    if(in[inp] != '/') { out[outp++] = in[inp++]; continue; }
+            	    while(in[inp] == '/') inp++;
             }
-            int inLength = in.length;
-            int inp = 0;
-            while(inp<inLength) {
-                if(inp == 0 || in[inp] == '/') {
-                    while(inp < inLength && in[inp] == '/') inp++;
-                    if(inp == inLength) break;
-                    if(in[inp] == '.') {
-                        if(inp+1 == inLength) break;
-                        if(in[inp+1] == '.' && (inp+2 == inLength || in[inp+2] == '/')) {
-                            inp+=2;
-                            if(outp == 0) continue;
-                            do { outp--; } while(outp > 0 && out[outp] != '/');
-                        } else if(in[inp+1] == '/') {
-                            inp++;
-                        } else {
-                            out[outp++] = '/';
-                        }
-                    } else {
-                        out[outp++] = '/';
-                        out[outp++] = in[inp++];
-                    }
-                } else {
-                    out[outp++] = in[inp++];
-                }
+            if(in[inp] == '\0') continue;
+            if(in[inp] != '.') { out[outp++] = '/'; out[outp++] = in[inp++]; continue; }
+            if(in[inp+1] == '\0' || in[inp+1] == '/') { inp++; continue; }
+            if(in[inp+1] == '.' && (in[inp+2] == '\0' || in[inp+2] == '/')) { // ..
+                inp += 2;
+                if(outp > 0) outp--;
+                while(outp > 0 && out[outp] != '/') outp--;
+                System.err.println("After ..: " + new String(out,0,outp));
+                continue;
             }
-            if(outp == 0) out[outp++] = '/';
-            return new String(out,0,outp);
-        } else {
-            if(p.startsWith("/")) return p;
-            StringBuffer sb = new StringBuffer(cwd);
-            if(!cwd.equals("/")) sb.append('/');
-            return sb.append(p).toString();
-        }
-    }
-    
-    // FEATURE: Probably should make this more general - support mountpoints, etc
-    public class UnixOverlayFS extends FS {
-        private final FS root;
-        private final FS dev = new DevFS();
-        public UnixOverlayFS(FS root) {
-            this.root = root;
-        }
-        private String devPath(String path) {
-            if(path.startsWith("/dev")) {
-                if(path.length() == 4) return "/";
-                if(path.charAt(4) == '/') return path.substring(4);
-            }
-            return null;
-        }
-        public FD open(String path, int flags, int mode) throws IOException{
-            String dp = devPath(path);
-            return dp == null ? root.open(path,flags,mode) : dev.open(dp,flags,mode);
-        }
-        public FStat stat(String path) throws IOException {
-            String dp = devPath(path);
-            return dp == null ? root.stat(path) : dev.stat(dp);
-        }
-        public void mkdir(String path) throws IOException {
-            String dp = devPath(path);
-            if(dp == null) root.mkdir(path);
-            else dev.mkdir(dp);
+            inp++;
+            out[outp++] = '/';
+            out[outp++] = '.';
         }
+        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);
     }
+         
+    // FEATURE: override Runtime.hostFStat to add executable type checking
+    // hostFStat
+    /*             try {
+                FileInputStream fis = new FileInputStream(f);
+                switch(fis.read()) {
+                    case '\177': _executable = fis.read() == 'E' && fis.read() == 'L' && fis.read() == 'F'; break;
+                    case '#': _executable = fis.read() == '!';
+                }
+                fis.close();
+            } catch(IOException e) { }
+    */
+
+    // FEATURE: inode stuff
+    FD hostFSDirFD(File f) { return FS.directoryFD(f.list(),f.hashCode()); }
     
-    // FIXME: This is totally broken on non-unix hosts - need to do some kind of cygwin type mapping
     public static class HostFS extends FS {
-        public static String fixPath(String path) throws FileNotFoundException {
-            return path;
-        }
+        protected File root;
+        public File getRoot() { return root; }
         
-        public String hostCWD() {
-            return getSystemProperty("user.dir");
+        private static File hostRootDir() {
+            String cwd = getSystemProperty("user.dir");
+            File f = new File(cwd != null ? cwd : ".");
+            f = new File(f.getAbsolutePath());
+            while(f.getParent() != null) f = new File(f.getParent());
+            return f;
         }
         
-        // FEATURE: This shares a lot with Runtime.open
-        public FD open(String path, int flags, int mode) throws IOException {
-            path = fixPath(path);
-            final File f = new File(path);
-            // NOTE: createNewFile is a Java2 function
-            if((flags & (O_EXCL|O_CREAT)) == (O_EXCL|O_CREAT))
-                if(!f.createNewFile()) throw new ErrnoException(EEXIST);
-            if(!f.exists() && (flags&O_CREAT) == 0) return null;
-            if(f.isDirectory()) {
-                if((flags&3)!=RD_ONLY) throw new ErrnoException(EACCES);
-                return directoryFD(f.list(),path.hashCode());
+        private File hostFile(String path) {
+            char sep = File.separatorChar;
+            if(sep != '/') {
+                char buf[] = path.toCharArray();
+                for(int i=0;i<buf.length;i++) {
+                	    char c = buf[i];
+                    if(c == '/') buf[i] = sep;
+                    else if(c == sep) buf[i] = '/';
+                }
+                path = new String(buf);
             }
-            final Seekable.File sf = new Seekable.File(path,(flags&3)!=RD_ONLY);
-            if((flags&O_TRUNC)!=0) sf.setLength(0);
-            return new SeekableFD(sf,mode) {
-                protected FStat _fstat() { return new HostFStat(f) {
-                    public int size() {
-                        try { return sf.length(); } catch(IOException e) { return 0; }
-                    }
-                };}
-            };
+            return new File(root,path);
         }
         
-        public FStat stat(String path) throws FileNotFoundException {
-            File f = new File(fixPath(path));
-            if(!f.exists()) throw new FileNotFoundException();
-            return new HostFStat(f);
+        public HostFS() { this(hostRootDir()); }
+        public HostFS(String root) { this(new File(root)); }
+        public HostFS(File root) { this.root = root; }
+        
+        
+        public FD open(UnixRuntime r, String path, int flags, int mode) throws ErrnoException {
+            final File f = hostFile(path);
+            return r.hostFSOpen(f,flags,mode);
+        }
+        
+        public FStat stat(UnixRuntime r, String path) throws ErrnoException {
+            File f = hostFile(path);
+            if(r.sm != null && !r.sm.allowStat(f)) throw new ErrnoException(EACCES);
+            if(!f.exists()) return null;
+            return r.hostFStat(f);
         }
         
-        public void mkdir(String path) throws IOException {
-            File f = new File(fixPath(path));
+        public void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException {
+            File f = hostFile(path);
+            if(r.sm != null && !r.sm.allowWrite(f)) throw new ErrnoException(EACCES);
             if(f.exists() && f.isDirectory()) throw new ErrnoException(EEXIST);
             if(f.exists()) throw new ErrnoException(ENOTDIR);
             File parent = f.getParentFile();
@@ -532,79 +772,79 @@ public abstract class UnixRuntime extends Runtime {
             if(!f.mkdir()) throw new ErrnoException(EIO);            
         }
     }
-    
-    private static class DevFStat extends FStat {
-        public int dev() { return 1; }
-        public int mode() { return 0666; }
-        public int type() { return S_IFCHR; }
-        public int nlink() { return 1; }
-    }
-    private static FD devZeroFD = new FD() {
-        public boolean readable() { return true; }
-        public boolean writable() { return true; }
-        public int read(byte[] a, int off, int length) { Arrays.fill(a,off,off+length,(byte)0); return length; }
-        public int write(byte[] a, int off, int length) { return length; }
-        public int seek(int n, int whence) { return 0; }
-        public FStat _fstat() { return new DevFStat(); }
-    };
-    private static FD devNullFD = new FD() {
-        public boolean readable() { return true; }
-        public boolean writable() { return true; }
-        public int read(byte[] a, int off, int length) { return 0; }
-        public int write(byte[] a, int off, int length) { return length; }
-        public int seek(int n, int whence) { return 0; }
-        public FStat _fstat() { return new DevFStat(); }
-    };    
-    
-    public class DevFS extends FS {
-        public FD open(String path, int mode, int flags) throws IOException {
-            if(path.equals("/null")) return devNullFD;
-            if(path.equals("/zero")) return devZeroFD;
-            if(path.startsWith("/fd/")) {
+        
+    public static class DevFS extends FS {
+        private static class DevFStat extends FStat {
+            public int dev() { return 1; }
+            public int mode() { return 0666; }
+            public int type() { return S_IFCHR; }
+            public int nlink() { return 1; }
+        }
+        private static FD devZeroFD = new FD() {
+            public boolean readable() { return true; }
+            public boolean writable() { return true; }
+            public int read(byte[] a, int off, int length) { Arrays.fill(a,off,off+length,(byte)0); return length; }
+            public int write(byte[] a, int off, int length) { return length; }
+            public int seek(int n, int whence) { return 0; }
+            public FStat _fstat() { return new DevFStat(); }
+        };
+        private static FD devNullFD = new FD() {
+            public boolean readable() { return true; }
+            public boolean writable() { return true; }
+            public int read(byte[] a, int off, int length) { return 0; }
+            public int write(byte[] a, int off, int length) { return length; }
+            public int seek(int n, int whence) { return 0; }
+            public FStat _fstat() { return new DevFStat(); }
+        }; 
+        
+        public FD open(UnixRuntime r, String path, int mode, int flags) throws ErrnoException {
+            if(path.equals("null")) return devNullFD;
+            if(path.equals("zero")) return devZeroFD;
+            if(path.startsWith("fd/")) {
                 int n;
                 try {
                     n = Integer.parseInt(path.substring(4));
                 } catch(NumberFormatException e) {
-                    throw new FileNotFoundException();
+                    return null;
                 }
-                if(n < 0 || n >= OPEN_MAX) throw new FileNotFoundException();
-                if(fds[n] == null) throw new FileNotFoundException();
-                return fds[n].dup();
+                if(n < 0 || n >= OPEN_MAX) return null;
+                if(r.fds[n] == null) return null;
+                return r.fds[n].dup();
             }
-            if(path.equals("/fd")) {
+            if(path.equals("fd")) {
                 int count=0;
-                for(int i=0;i<OPEN_MAX;i++) if(fds[i] != null) count++; 
+                for(int i=0;i<OPEN_MAX;i++) if(r.fds[i] != null) count++; 
                 String[] files = new String[count];
                 count = 0;
-                for(int i=0;i<OPEN_MAX;i++) if(fds[i] != null) files[count++] = Integer.toString(i);
+                for(int i=0;i<OPEN_MAX;i++) if(r.fds[i] != null) files[count++] = Integer.toString(i);
                 return directoryFD(files,hashCode());
             }
-            if(path.equals("/")) {
+            if(path.equals("")) {
                 String[] files = { "null", "zero", "fd" };
                 return directoryFD(files,hashCode());
             }
-            throw new FileNotFoundException();
+            return null;
         }
         
-        public FStat stat(String path) throws IOException {
-            if(path.equals("/null")) return devNullFD.fstat();
-            if(path.equals("/zero")) return devZeroFD.fstat();            
-            if(path.startsWith("/fd/")) {
+        public FStat stat(UnixRuntime r,String path) throws ErrnoException {
+            if(path.equals("null")) return devNullFD.fstat();
+            if(path.equals("zero")) return devZeroFD.fstat();            
+            if(path.startsWith("fd/")) {
                 int n;
                 try {
                     n = Integer.parseInt(path.substring(4));
                 } catch(NumberFormatException e) {
-                    throw new FileNotFoundException();
+                    return null;
                 }
-                if(n < 0 || n >= OPEN_MAX) throw new FileNotFoundException();
-                if(fds[n] == null) throw new FileNotFoundException();
-                return fds[n].fstat();
+                if(n < 0 || n >= OPEN_MAX) return null;
+                if(r.fds[n] == null) return null;
+                return r.fds[n].fstat();
             }
-            if(path.equals("/fd")) return new FStat() { public int type() { return S_IFDIR; } public int mode() { return 0444; }};
-            if(path.equals("/")) return new FStat() { public int type() { return S_IFDIR; } public int mode() { return 0444; }};
-            throw new FileNotFoundException();
+            if(path.equals("fd")) return new FStat() { public int type() { return S_IFDIR; } public int mode() { return 0444; }};
+            if(path.equals("")) return new FStat() { public int type() { return S_IFDIR; } public int mode() { return 0444; }};
+            return null;
         }
         
-        public void mkdir(String path) throws IOException { throw new ErrnoException(EACCES); }
+        public void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException { throw new ErrnoException(EACCES); }
     }
 }