de-eclipseify

darcs-hash:20040505030857-24bed-6e015f821835edd9fcb16037a1ff0630bf0954a7.gz

diff --git a/src/org/ibex/nestedvm/ClassFileCompiler.java b/src/org/ibex/nestedvm/ClassFileCompiler.java
index 931f1b9..a7f035c 100644 (file)
--- a/src/org/ibex/nestedvm/ClassFileCompiler.java
+++ b/src/org/ibex/nestedvm/ClassFileCompiler.java
@@ -391,7 +391,7 @@ public class ClassFileCompiler extends Compiler implements org.apache.bcel.Const
                     new Type[]{Type.getType("Lorg/ibex/nestedvm/UnixRuntime;"),Type.STRING,new ArrayType(Type.STRING,1)},
                     INVOKESTATIC));
         else
                     new Type[]{Type.getType("Lorg/ibex/nestedvm/UnixRuntime;"),Type.STRING,new ArrayType(Type.STRING,1)},
                     INVOKESTATIC));
         else

-                   a(fac.createInvoke(fullClassName,"run",Type.INT,new Type[]{Type.STRING,new ArrayType(Type.STRING,1)},INVOKEVIRTUAL));
+                a(fac.createInvoke(fullClassName,"run",Type.INT,new Type[]{Type.STRING,new ArrayType(Type.STRING,1)},INVOKEVIRTUAL));

         a(fac.createInvoke("java.lang.System","exit",Type.VOID,new Type[]{Type.INT},INVOKESTATIC));
         a(InstructionConstants.RETURN);
         main.setMaxLocals();
         a(fac.createInvoke("java.lang.System","exit",Type.VOID,new Type[]{Type.INT},INVOKESTATIC));
         a(InstructionConstants.RETURN);
         main.setMaxLocals();

@@ -404,7 +404,7 @@ public class ClassFileCompiler extends Compiler implements org.apache.bcel.Const
     }
     
     private void addConstReturnMethod(String name, int val) {
     }
     
     private void addConstReturnMethod(String name, int val) {

-           MethodGen method = newMethod(ACC_PROTECTED,Type.INT, Type.NO_ARGS,name);
+            MethodGen method = newMethod(ACC_PROTECTED,Type.INT, Type.NO_ARGS,name);

         selectMethod(method);
         pushConst(val);
         a(InstructionConstants.IRETURN);
         selectMethod(method);
         pushConst(val);
         a(InstructionConstants.IRETURN);

diff --git a/src/org/ibex/nestedvm/Runtime.java b/src/org/ibex/nestedvm/Runtime.java
index 2f23d1c..b790374 100644 (file)
--- a/src/org/ibex/nestedvm/Runtime.java
+++ b/src/org/ibex/nestedvm/Runtime.java
@@ -102,7 +102,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
     protected abstract void setCPUState(CPUState state);
     
     protected Object clone() throws CloneNotSupportedException {
     protected abstract void setCPUState(CPUState state);
     
     protected Object clone() throws CloneNotSupportedException {

-           Runtime r = (Runtime) super.clone();
+        Runtime r = (Runtime) super.clone();

         r._byteBuf = null;
         r.startTime = 0;
         r.fds = new FD[OPEN_MAX];
         r._byteBuf = null;
         r.startTime = 0;
         r.fds = new FD[OPEN_MAX];

@@ -111,7 +111,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         r.readPages = new int[totalPages][];
         r.writePages = new int[totalPages][];
         for(int i=0;i<totalPages;i++) {
         r.readPages = new int[totalPages][];
         r.writePages = new int[totalPages][];
         for(int i=0;i<totalPages;i++) {

-                   if(readPages[i] == null) continue;
+            if(readPages[i] == null) continue;

             if(writePages[i] == null) r.readPages[i] = readPages[i];
             else r.readPages[i] = r.writePages[i] = (int[])writePages[i].clone();
         }
             if(writePages[i] == null) r.readPages[i] = readPages[i];
             else r.readPages[i] = r.writePages[i] = (int[])writePages[i].clone();
         }

@@ -152,8 +152,8 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         if(totalPages == 1) {
             readPages[0] = writePages[0] = new int[pageSize>>2];
         } else {
         if(totalPages == 1) {
             readPages[0] = writePages[0] = new int[pageSize>>2];
         } else {

-                   for(int i=(stackBottom >>> pageShift);i<writePages.length;i++) {
-                           readPages[i] = writePages[i] = new int[pageSize>>2];
+            for(int i=(stackBottom >>> pageShift);i<writePages.length;i++) {
+                readPages[i] = writePages[i] = new int[pageSize>>2];

             }
         }
     
             }
         }
     

@@ -505,8 +505,8 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
     }
     
     static String[] concatArgv(String argv0, String[] rest) {
     }
     
     static String[] concatArgv(String argv0, String[] rest) {

-           String[] argv = new String[rest.length+1];
-           System.arraycopy(rest,0,argv,1,rest.length);
+        String[] argv = new String[rest.length+1];
+        System.arraycopy(rest,0,argv,1,rest.length);

         argv[0] = argv0;
         return argv;
     }
         argv[0] = argv0;
         return argv;
     }

@@ -539,8 +539,8 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         
         sp = top = writePages.length*(1<<pageShift);
         try {
         
         sp = top = writePages.length*(1<<pageShift);
         try {

-                   sp = argsAddr = addStringArray(args,sp);
-                   sp = envAddr = addStringArray(createEnv(environ),sp);
+            sp = argsAddr = addStringArray(args,sp);
+            sp = envAddr = addStringArray(createEnv(environ),sp);

         } catch(FaultException e) {
             throw new IllegalArgumentException("args/environ too big");
         }
         } catch(FaultException e) {
             throw new IllegalArgumentException("args/environ too big");
         }

@@ -573,17 +573,17 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         int sp = state.r[SP];
         int[] ia = new int[args.length];
         for(int i=0;i<args.length;i++) {
         int sp = state.r[SP];
         int[] ia = new int[args.length];
         for(int i=0;i<args.length;i++) {

-                   Object o = args[i];
+            Object o = args[i];

             byte[] buf = null;
             if(o instanceof String) {
             byte[] buf = null;
             if(o instanceof String) {

-                   buf = getBytes((String)o);
+                buf = getBytes((String)o);

             } else if(o instanceof byte[]) {
             } else if(o instanceof byte[]) {

-                   buf = (byte[]) o;
+                buf = (byte[]) o;

             } else if(o instanceof Number) {
             } else if(o instanceof Number) {

-                   ia[i] = ((Number)o).intValue();
+                ia[i] = ((Number)o).intValue();

             }
             if(buf != null) {
             }
             if(buf != null) {

-                   sp -= buf.length;
+                sp -= buf.length;

                 copyout(buf,sp,buf.length);
                 ia[i] = sp;
             }
                 copyout(buf,sp,buf.length);
                 ia[i] = sp;
             }

@@ -675,10 +675,10 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
     
     /** Duplicates the file descriptor <i>fdn</i> and returns the new fs */
     public final int dupFD(int fdn) {
     
     /** Duplicates the file descriptor <i>fdn</i> and returns the new fs */
     public final int dupFD(int fdn) {

-               int i;
-               if(fdn < 0 || fdn >= OPEN_MAX) return -1;
-               if(fds[fdn] == null) return -1;
-               for(i=0;i<OPEN_MAX;i++) if(fds[i] == null) break;
+        int i;
+        if(fdn < 0 || fdn >= OPEN_MAX) return -1;
+        if(fds[fdn] == null) return -1;
+        for(i=0;i<OPEN_MAX;i++) if(fds[i] == null) break;

         if(i==OPEN_MAX) return -1;
         fds[i] = fds[fdn].dup();
         return i;
         if(i==OPEN_MAX) return -1;
         fds[i] = fds[fdn].dup();
         return i;

@@ -753,9 +753,9 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         byte[] buf = byteBuf(count);
         copyin(addr,buf,count);
         try {
         byte[] buf = byteBuf(count);
         copyin(addr,buf,count);
         try {

-                   return fds[fdn].write(buf,0,count);
+            return fds[fdn].write(buf,0,count);

         } catch(ErrnoException e) {
         } catch(ErrnoException e) {

-                   if(e.errno == EPIPE) sys_exit(128+13);
+            if(e.errno == EPIPE) sys_exit(128+13);

             throw e;
         }
     }
             throw e;
         }
     }

@@ -916,14 +916,14 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
                 ret = callJavaCB.call(a,b,c,d);
             } catch(RuntimeException e) {
                 System.err.println("Error while executing callJavaCB");
                 ret = callJavaCB.call(a,b,c,d);
             } catch(RuntimeException e) {
                 System.err.println("Error while executing callJavaCB");

-                   e.printStackTrace();
+                    e.printStackTrace();

                 ret = 0;
             }
             state = RUNNING;
             return ret;
         } else {
                 ret = 0;
             }
             state = RUNNING;
             return ret;
         } else {

-                       if(STDERR_DIAG) System.err.println("WARNING: calljava syscall invoked without a calljava callback set");
-                       return 0;
+            if(STDERR_DIAG) System.err.println("WARNING: calljava syscall invoked without a calljava callback set");
+            return 0;

         }
     }
         
         }
     }
         

@@ -962,7 +962,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
             case F_GETFL:
                 return fd.flags();
             case F_SETFD:
             case F_GETFL:
                 return fd.flags();
             case F_SETFD:

-                   closeOnExec[fdn] = arg != 0;
+                closeOnExec[fdn] = arg != 0;

                 return 0;
             case F_GETFD:
                 return closeOnExec[fdn] ? 1 : 0;
                 return 0;
             case F_GETFD:
                 return closeOnExec[fdn] ? 1 : 0;

@@ -979,14 +979,14 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         @see Runtime#state state */
     protected final int syscall(int syscall, int a, int b, int c, int d) {
         try {
         @see Runtime#state state */
     protected final int syscall(int syscall, int a, int b, int c, int d) {
         try {

-                   return _syscall(syscall,a,b,c,d);
+            return _syscall(syscall,a,b,c,d);

         } catch(ErrnoException e) {
         } catch(ErrnoException e) {

-                   return -e.errno;
+            return -e.errno;

         } catch(FaultException e) {
         } catch(FaultException e) {

-                   return -EFAULT;
+            return -EFAULT;

         } catch(RuntimeException e) {
             e.printStackTrace();
         } catch(RuntimeException e) {
             e.printStackTrace();

-                   throw new Error("Internal Error in _syscall()");
+            throw new Error("Internal Error in _syscall()");

         }
     }
     
         }
     }
     

@@ -1118,16 +1118,16 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         
         public int seek(int n, int whence) throws ErrnoException {
             try {
         
         public int seek(int n, int whence) throws ErrnoException {
             try {

-                   switch(whence) {
-                           case SEEK_SET: break;
-                           case SEEK_CUR: n += data.pos(); break;
-                           case SEEK_END: n += data.length(); break;
-                           default: return -1;
-                   }
-                   data.seek(n);
-                   return n;
+                switch(whence) {
+                        case SEEK_SET: break;
+                        case SEEK_CUR: n += data.pos(); break;
+                        case SEEK_END: n += data.length(); break;
+                        default: return -1;
+                }
+                data.seek(n);
+                return n;

             } catch(IOException e) {
             } catch(IOException e) {

-                   throw new ErrnoException(ESPIPE);
+                throw new ErrnoException(ESPIPE);

             }
         }
         
             }
         }
         

@@ -1136,19 +1136,19 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
             // NOTE: There is race condition here but we can't fix it in pure java
             if((flags&O_APPEND) != 0) seek(0,SEEK_END);
             try {
             // NOTE: There is race condition here but we can't fix it in pure java
             if((flags&O_APPEND) != 0) seek(0,SEEK_END);
             try {

-                   return data.write(a,off,length);
+                return data.write(a,off,length);

             } catch(IOException e) {
             } catch(IOException e) {

-                   throw new ErrnoException(EIO);
+                throw new ErrnoException(EIO);

             }
         }
         
         public int read(byte[] a, int off, int length) throws ErrnoException {
             if((flags&3) == WR_ONLY) throw new ErrnoException(EBADFD);
             try {
             }
         }
         
         public int read(byte[] a, int off, int length) throws ErrnoException {
             if((flags&3) == WR_ONLY) throw new ErrnoException(EBADFD);
             try {

-                   int n = data.read(a,off,length);
-                   return n < 0 ? 0 : n;
+                int n = data.read(a,off,length);
+                return n < 0 ? 0 : n;

             } catch(IOException e) {
             } catch(IOException e) {

-                   throw new ErrnoException(EIO);
+                throw new ErrnoException(EIO);

             }
         }
         
             }
         }
         

@@ -1161,10 +1161,10 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         public OutputStreamFD(OutputStream os) { this.os = os; }
         public int write(byte[] a, int off, int length) throws ErrnoException {
             try {
         public OutputStreamFD(OutputStream os) { this.os = os; }
         public int write(byte[] a, int off, int length) throws ErrnoException {
             try {

-                   os.write(a,off,length);
-                   return length;
+                os.write(a,off,length);
+                return length;

             } catch(IOException e) {
             } catch(IOException e) {

-                   throw new ErrnoException(EIO);
+                throw new ErrnoException(EIO);

             }
         }
         public void _close() { try { os.close(); } catch(IOException e) { /*ignore*/ }  }
             }
         }
         public void _close() { try { os.close(); } catch(IOException e) { /*ignore*/ }  }

@@ -1286,13 +1286,13 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         public int pc;
         
         public CPUState dup() {
         public int pc;
         
         public CPUState dup() {

-                   CPUState c = new CPUState();
+                CPUState c = new CPUState();

             c.hi = hi;
             c.lo = lo;
             c.fcsr = fcsr;
             c.pc = pc;
             for(int i=0;i<32;i++) {
             c.hi = hi;
             c.lo = lo;
             c.fcsr = fcsr;
             c.pc = pc;
             for(int i=0;i<32;i++) {

-                   c.r[i] = r[i];
+                    c.r[i] = r[i];

                 c.f[i] = f[i];
             }
             return c;
                 c.f[i] = f[i];
             }
             return c;

@@ -1300,7 +1300,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
     }
     
     public static class SecurityManager {
     }
     
     public static class SecurityManager {

-           public boolean allowRead(File f) { return true; }
+        public boolean allowRead(File f) { return true; }

         public boolean allowWrite(File f) { return true; }
         public boolean allowStat(File f) { return true; }
     }
         public boolean allowWrite(File f) { return true; }
         public boolean allowStat(File f) { return true; }
     }

diff --git a/src/org/ibex/nestedvm/RuntimeCompiler.java b/src/org/ibex/nestedvm/RuntimeCompiler.java
index 80f56ac..78b4e9a 100644 (file)
--- a/src/org/ibex/nestedvm/RuntimeCompiler.java
+++ b/src/org/ibex/nestedvm/RuntimeCompiler.java
@@ -27,7 +27,7 @@ public class RuntimeCompiler {
     
     private static class SingleClassLoader extends ClassLoader {
         public Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
     
     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); }
             return super.loadClass(name,resolve);
         }
         public Class fromBytes(String name, byte[] b) { return fromBytes(name,b,0,b.length); }

@@ -39,8 +39,8 @@ public class RuntimeCompiler {
     }
     
     public static void main(String[] args) throws Exception {
     }
     
     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.exit(1);
         }
         UnixRuntime r = (UnixRuntime) compile(new Seekable.File(args[0])).newInstance();

diff --git a/src/org/ibex/nestedvm/UnixRuntime.java b/src/org/ibex/nestedvm/UnixRuntime.java
index 11d1093..32a3c75 100644 (file)
--- a/src/org/ibex/nestedvm/UnixRuntime.java
+++ b/src/org/ibex/nestedvm/UnixRuntime.java
@@ -64,7 +64,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         if(extra == null) extra = new String[0];
         if(!envHas("USER",extra) && getSystemProperty("user.name") != null)
             defaults[n++] = "USER=" + getSystemProperty("user.name");
         if(extra == null) extra = new String[0];
         if(!envHas("USER",extra) && getSystemProperty("user.name") != null)
             defaults[n++] = "USER=" + getSystemProperty("user.name");

-        if(!envHas("HOME",extra) && getSystemProperty("user.name") != null)
+        if(!envHas("HOME",extra) && getSystemProperty("user.home") != null)

             defaults[n++] = "HOME=" + getSystemProperty("user.home");
         if(!envHas("SHELL",extra)) defaults[n++] = "SHELL=/bin/sh";
         if(!envHas("TERM",extra))  defaults[n++] = "TERM=vt100";
             defaults[n++] = "HOME=" + getSystemProperty("user.home");
         if(!envHas("SHELL",extra)) defaults[n++] = "SHELL=/bin/sh";
         if(!envHas("TERM",extra))  defaults[n++] = "TERM=vt100";

@@ -85,10 +85,10 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
             } else {
                 int newpid = -1;
                 int nextPID = gs.nextPID;
             } else {
                 int newpid = -1;
                 int nextPID = gs.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;
+                    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;

                 gs.nextPID = newpid + 1;
             }
             tasks[pid] = this;
                 gs.nextPID = newpid + 1;
             }
             tasks[pid] = this;

@@ -173,7 +173,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
                     }
                 } else {
                     // process group stuff, EINVAL returned above
                     }
                 } else {
                     // process group stuff, EINVAL returned above

-                           throw new Error("should never happen");
+                        throw new Error("should never happen");

                 }
                 if(done == null) {
                     if(!blocking) return 0;
                 }
                 if(done == null) {
                     if(!blocking) return 0;

@@ -194,7 +194,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         if(children != null) synchronized(children) {
             for(Enumeration e = exitedChildren.elements(); e.hasMoreElements(); ) {
                 UnixRuntime child = (UnixRuntime) e.nextElement();
         if(children != null) synchronized(children) {
             for(Enumeration e = exitedChildren.elements(); e.hasMoreElements(); ) {
                 UnixRuntime child = (UnixRuntime) e.nextElement();

-                    gs.tasks[child.pid] = null;
+                gs.tasks[child.pid] = null;

             }
             exitedChildren.clear();
             for(Enumeration e = activeChildren.elements(); e.hasMoreElements(); ) {
             }
             exitedChildren.clear();
             for(Enumeration e = activeChildren.elements(); e.hasMoreElements(); ) {

@@ -221,7 +221,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
     }
     
     protected Object clone() throws CloneNotSupportedException {
     }
     
     protected Object clone() throws CloneNotSupportedException {

-           UnixRuntime r = (UnixRuntime) super.clone();
+        UnixRuntime r = (UnixRuntime) super.clone();

         r.pid = 0;
         r.parent = null;
         r.children = null;
         r.pid = 0;
         r.parent = null;
         r.children = null;

@@ -247,7 +247,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         try {
             r._started();
         } catch(ProcessTableFullExn e) {
         try {
             r._started();
         } catch(ProcessTableFullExn e) {

-                   return -ENOMEM;
+            return -ENOMEM;

         }
 
         //System.err.println("fork " + pid + " -> " + r.pid + " tasks[" + r.pid + "] = " + gd.tasks[r.pid]);
         }
 
         //System.err.println("fork " + pid + " -> " + r.pid + " tasks[" + r.pid + "] = " + gd.tasks[r.pid]);

@@ -278,7 +278,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
     public static int runAndExec(UnixRuntime r, String[] argv) { r.start(argv); return executeAndExec(r); }
     
     public static int executeAndExec(UnixRuntime r) {
     public static int runAndExec(UnixRuntime r, String[] argv) { r.start(argv); return executeAndExec(r); }
     
     public static int executeAndExec(UnixRuntime r) {

-           for(;;) {
+        for(;;) {

             for(;;) {
                 if(r.execute()) break;
                 if(STDERR_DIAG) System.err.println("WARNING: Pause requested while executing runAndExec()");
             for(;;) {
                 if(r.execute()) break;
                 if(STDERR_DIAG) System.err.println("WARNING: Pause requested while executing runAndExec()");

@@ -289,7 +289,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
     }
      
     private String[] readStringArray(int addr) throws ReadFaultException {
     }
      
     private String[] readStringArray(int addr) throws ReadFaultException {

-           int count = 0;
+        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));
         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));

@@ -297,7 +297,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
     }
     
     private int sys_exec(int cpath, int cargv, int cenvp) throws ErrnoException, FaultException {
     }
     
     private int sys_exec(int cpath, int cargv, int cenvp) throws ErrnoException, FaultException {

-           return exec(normalizePath(cstring(cpath)),readStringArray(cargv),readStringArray(cenvp));
+        return exec(normalizePath(cstring(cpath)),readStringArray(cargv),readStringArray(cenvp));

     }
         
     private int exec(String normalizedPath, String[] argv, String[] envp) throws ErrnoException {
     }
         
     private int exec(String normalizedPath, String[] argv, String[] envp) throws ErrnoException {

@@ -309,9 +309,9 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         if(o instanceof Class) {
             Class c = (Class) o;
             try {
         if(o instanceof Class) {
             Class c = (Class) o;
             try {

-                   return exec((UnixRuntime) c.newInstance(),argv,envp);
+                    return exec((UnixRuntime) c.newInstance(),argv,envp);

             } catch(Exception e) {
             } catch(Exception e) {

-                   e.printStackTrace();
+                    e.printStackTrace();

                 return -ENOEXEC;
             }
         } else {
                 return -ENOEXEC;
             }
         } else {

@@ -362,7 +362,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         public final FD writer = new Writer();
         
         public class Reader extends FD {
         public final FD writer = new Writer();
         
         public class Reader extends FD {

-                       protected FStat _fstat() { return new FStat(); }
+            protected FStat _fstat() { return new FStat(); }

             public int read(byte[] buf, int off, int len) throws ErrnoException {
                 if(len == 0) return 0;
                 synchronized(Pipe.this) {
             public int read(byte[] buf, int off, int len) throws ErrnoException {
                 if(len == 0) return 0;
                 synchronized(Pipe.this) {

@@ -370,7 +370,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
                         try { Pipe.this.wait(); } catch(InterruptedException e) { /* ignore */ }
                     }
                     if(writePos == -1) return 0; // eof
                         try { Pipe.this.wait(); } catch(InterruptedException e) { /* ignore */ }
                     }
                     if(writePos == -1) return 0; // eof

-                           len = Math.min(len,writePos-readPos);
+                    len = Math.min(len,writePos-readPos);

                     System.arraycopy(pipebuf,readPos,buf,off,len);
                     readPos += len;
                     if(readPos == writePos) Pipe.this.notify();
                     System.arraycopy(pipebuf,readPos,buf,off,len);
                     readPos += len;
                     if(readPos == writePos) Pipe.this.notify();

@@ -388,9 +388,9 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
                     if(readPos == -1) throw new ErrnoException(EPIPE);
                     if(pipebuf.length - writePos < Math.min(len,PIPE_BUF)) {
                         // not enough space to atomicly write the data
                     if(readPos == -1) throw new ErrnoException(EPIPE);
                     if(pipebuf.length - writePos < Math.min(len,PIPE_BUF)) {
                         // not enough space to atomicly write the data

-                           while(readPos != -1 && readPos != writePos) {
-                                   try { Pipe.this.wait(); } catch(InterruptedException e) { /* ignore */ }
-                           }
+                        while(readPos != -1 && readPos != writePos) {
+                            try { Pipe.this.wait(); } catch(InterruptedException e) { /* ignore */ }
+                        }

                         if(readPos == -1) throw new ErrnoException(EPIPE);
                         readPos = writePos = 0;
                     }
                         if(readPos == -1) throw new ErrnoException(EPIPE);
                         readPos = writePos = 0;
                     }

@@ -498,7 +498,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         public GlobalState(int maxProcs, boolean defaultMounts) {
             tasks = new UnixRuntime[maxProcs+1];
             if(defaultMounts) {
         public GlobalState(int maxProcs, boolean defaultMounts) {
             tasks = new UnixRuntime[maxProcs+1];
             if(defaultMounts) {

-                   addMount("/",new HostFS());
+                addMount("/",new HostFS());

                 addMount("/dev",new DevFS());
             }
         }
                 addMount("/dev",new DevFS());
             }
         }

@@ -550,13 +550,13 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         public synchronized void removeMount(String path) {
             if(!path.startsWith("/")) throw new IllegalArgumentException("Mount point doesn't start with a /");
             if(path.equals("/")) {
         public synchronized void removeMount(String path) {
             if(!path.startsWith("/")) throw new IllegalArgumentException("Mount point doesn't start with a /");
             if(path.equals("/")) {

-                   removeMount(-1);
+                removeMount(-1);

             } else {
                 path = path.substring(1);
                 int p;
                 for(p=0;p<mps.length;p++) if(mps[p].path.equals(path)) break;
                 if(p == mps.length) throw new IllegalArgumentException("mount point doesn't exist");
             } else {
                 path = path.substring(1);
                 int p;
                 for(p=0;p<mps.length;p++) if(mps[p].path.equals(path)) break;
                 if(p == mps.length) throw new IllegalArgumentException("mount point doesn't exist");

-               removeMount(p);
+                removeMount(p);

             }
         }
         
             }
         }
         

@@ -571,13 +571,13 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         private Object fsop(int op, UnixRuntime r, String normalizedPath, int arg1, int arg2) throws ErrnoException {
             int pl = normalizedPath.length();
             if(pl != 0) {
         private Object fsop(int op, UnixRuntime r, String normalizedPath, int arg1, int arg2) throws ErrnoException {
             int pl = normalizedPath.length();
             if(pl != 0) {

-                   MP[] list;
+                MP[] list;

                 synchronized(this) { list = mps; }
                 for(int i=0;i<list.length;i++) {
                 synchronized(this) { list = mps; }
                 for(int i=0;i<list.length;i++) {

-                           MP mp = list[i];
-                           int mpl = mp.path.length();
+                    MP mp = list[i];
+                    int mpl = mp.path.length();

                     if(normalizedPath.startsWith(mp.path) && (pl == mpl || (pl < mpl && normalizedPath.charAt(mpl) == '/')))
                     if(normalizedPath.startsWith(mp.path) && (pl == mpl || (pl < mpl && normalizedPath.charAt(mpl) == '/')))

-                           return dispatch(mp.fs,op,r,pl == mpl ? "" : normalizedPath.substring(mpl+1),arg1,arg2);
+                        return dispatch(mp.fs,op,r,pl == mpl ? "" : normalizedPath.substring(mpl+1),arg1,arg2);

                 }
             }
             return dispatch(root,op,r,normalizedPath,arg1,arg2);
                 }
             }
             return dispatch(root,op,r,normalizedPath,arg1,arg2);

@@ -585,7 +585,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         
         private static Object dispatch(FS fs, int op, UnixRuntime r, String path, int arg1, int arg2) throws ErrnoException {
             switch(op) {
         
         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 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;
                 case STAT: return fs.stat(r,path);
                 case LSTAT: return fs.lstat(r,path);
                 case MKDIR: fs.mkdir(r,path,arg1); return null;

@@ -614,7 +614,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
             CacheEnt ent = (CacheEnt) execCache.get(path);
             if(ent != null) {
                 //System.err.println("Found cached entry for " + path);
             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;
+                if(ent.time == mtime && ent.size == size) return ent.o;

                 //System.err.println("Cache was out of date");
                 execCache.remove(path);
             }
                 //System.err.println("Cache was out of date");
                 execCache.remove(path);
             }

@@ -638,7 +638,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
                         break;
                     case '#':
                         if(n == 1) {
                         break;
                     case '#':
                         if(n == 1) {

-                                   int n2 = s.read(buf,1,buf.length-1);
+                            int n2 = s.read(buf,1,buf.length-1);

                             if(n2 == -1) throw new ErrnoException(ENOEXEC);
                             n += n2;
                         }
                             if(n2 == -1) throw new ErrnoException(ENOEXEC);
                             n += n2;
                         }

@@ -646,7 +646,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
                         int p = 2;
                         n -= 2;
                         OUTER: for(;;) {
                         int p = 2;
                         n -= 2;
                         OUTER: for(;;) {

-                                   for(int i=p;i<p+n;i++) if(buf[i] == '\n') { p = i; break OUTER; }
+                            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);
                             p += n;
                             if(p == buf.length) break OUTER;
                             n = s.read(buf,p,buf.length-p);

@@ -656,11 +656,11 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
                         for(arg=2;arg<p;arg++) if(buf[arg] == ' ') break;
                         if(arg < p) {
                             int cmdEnd = arg;
                         for(arg=2;arg<p;arg++) if(buf[arg] == ' ') break;
                         if(arg < p) {
                             int cmdEnd = arg;

-                                   while(arg < p && buf[arg] == ' ') 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,cmdEnd);
                             command[1] = arg < p ? new String(buf,arg,p-arg) : null;
                         } else {

-                                   command[0] = new String(buf,2,p-2);
+                            command[0] = new String(buf,2,p-2);

                         }
                         //System.err.println("command[0]: " + command[0] + " command[1]: " + command[1]);
                         break;
                         }
                         //System.err.println("command[0]: " + command[0] + " command[1]: " + command[1]);
                         break;

@@ -669,14 +669,14 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
                 }
             } catch(IOException e) {
                 fd.close();
                 }
             } catch(IOException e) {
                 fd.close();

-                   throw new ErrnoException(EIO);
+                throw new ErrnoException(EIO);

             }
                         
             if(command == null) {
                 // its an elf binary
                 try {
                     s.seek(0);
             }
                         
             if(command == null) {
                 // its an elf binary
                 try {
                     s.seek(0);

-                           Class c = RuntimeCompiler.compile(s);
+                    Class c = RuntimeCompiler.compile(s);

                     //System.err.println("Compile succeeded: " + c);
                     ent = new CacheEnt(mtime,size,c);
                 } catch(Compiler.Exn e) {
                     //System.err.println("Compile succeeded: " + c);
                     ent = new CacheEnt(mtime,size,c);
                 } catch(Compiler.Exn e) {

@@ -684,10 +684,10 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
                     throw new ErrnoException(ENOEXEC);
                 } catch(IOException e) {
                     if(STDERR_DIAG) e.printStackTrace();
                     throw new ErrnoException(ENOEXEC);
                 } catch(IOException e) {
                     if(STDERR_DIAG) e.printStackTrace();

-                           throw new ErrnoException(EIO);
+                    throw new ErrnoException(EIO);

                 }
             } else {
                 }
             } else {

-                   ent = new CacheEnt(mtime,size,command);
+                ent = new CacheEnt(mtime,size,command);

             }
             
             fd.close();
             }
             
             fd.close();

@@ -725,15 +725,15 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         if(absolute) {
             do { inp++; } while(in[inp] == '/');
         } else if(cwdl != 0) {
         if(absolute) {
             do { inp++; } while(in[inp] == '/');
         } else if(cwdl != 0) {

-               cwd.getChars(0,cwdl,out,0);
-               outp = cwdl;
+            cwd.getChars(0,cwdl,out,0);
+            outp = cwdl;

         }
             
         path.getChars(0,path.length(),in,0);
         while(in[inp] != 0) {
             if(inp != 0) {
         }
             
         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++;
+                if(in[inp] != '/') { out[outp++] = in[inp++]; continue; }
+                while(in[inp] == '/') inp++;

             }
             if(in[inp] == '\0') continue;
             if(in[inp] != '.') { out[outp++] = '/'; out[outp++] = in[inp++]; continue; }
             }
             if(in[inp] == '\0') continue;
             if(in[inp] != '.') { out[outp++] = '/'; out[outp++] = in[inp++]; continue; }

@@ -796,7 +796,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
             if(sep != '/') {
                 char buf[] = path.toCharArray();
                 for(int i=0;i<buf.length;i++) {
             if(sep != '/') {
                 char buf[] = path.toCharArray();
                 for(int i=0;i<buf.length;i++) {

-                           char c = buf[i];
+                    char c = buf[i];

                     if(c == '/') buf[i] = sep;
                     else if(c == sep) buf[i] = '/';
                 }
                     if(c == '/') buf[i] = sep;
                     else if(c == sep) buf[i] = '/';
                 }

@@ -871,9 +871,9 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
             int reclen;
             OUTER: for(;len > 0 && pos < size();pos++){
                 switch(pos) {
             int reclen;
             OUTER: for(;len > 0 && pos < size();pos++){
                 switch(pos) {

-                           case -2:
+                    case -2:

                     case -1:
                     case -1:

-                                   ino = pos == -1 ? parentInode() : myInode();
+                        ino = pos == -1 ? parentInode() : myInode();

                         if(ino == -1) continue;
                         reclen = 9 + (pos == -1 ? 2 : 1);
                         if(reclen > len) break OUTER;
                         if(ino == -1) continue;
                         reclen = 9 + (pos == -1 ? 2 : 1);
                         if(reclen > len) break OUTER;

@@ -987,7 +987,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
                     
                     public String name(int n) {
                         switch(n) {
                     
                     public String name(int n) {
                         switch(n) {

-                                   case 0: return "null";
+                            case 0: return "null";

                             case 1: return "zero";
                             case 2: return "fd";
                             default: return null;
                             case 1: return "zero";
                             case 2: return "fd";
                             default: return null;

diff --git a/src/org/ibex/nestedvm/util/InodeCache.java b/src/org/ibex/nestedvm/util/InodeCache.java
index 99d2a98..c4cedb9 100644 (file)
--- a/src/org/ibex/nestedvm/util/InodeCache.java
+++ b/src/org/ibex/nestedvm/util/InodeCache.java
@@ -56,7 +56,7 @@ public class InodeCache {
         
         while((k = keys[dest]) != null) {
             if(k == PLACEHOLDER) {
         
         while((k = keys[dest]) != null) {
             if(k == PLACEHOLDER) {

-                   if(placeholder == -1) placeholder = dest;
+                if(placeholder == -1) placeholder = dest;

             } else if(k.equals(key)) {
                 short inode = inodes[dest];
                 if(dest == mru) return inode;
             } else if(k.equals(key)) {
                 short inode = inodes[dest];
                 if(dest == mru) return inode;

@@ -130,8 +130,8 @@ public class InodeCache {
         reverse[dest] = (short) slot;
         inodes[slot] = (short) inode;
         if(mru != -1) {
         reverse[dest] = (short) slot;
         inodes[slot] = (short) inode;
         if(mru != -1) {

-                   prev[slot] = mru;
-                   next[mru] = (short) slot;
+            prev[slot] = mru;
+            next[mru] = (short) slot;

         }
         mru = (short) slot;
         return (short) inode;
         }
         mru = (short) slot;
         return (short) inode;

@@ -152,7 +152,7 @@ public class InodeCache {
         return null;
     }
     
         return null;
     }
     

-    private void dump() {
+    /*private void dump() {

         System.err.println("Size " + size);
         System.err.println("UsedSlots " + usedSlots);
         System.err.println("MRU " + mru);
         System.err.println("Size " + size);
         System.err.println("UsedSlots " + usedSlots);
         System.err.println("MRU " + mru);

@@ -184,20 +184,20 @@ public class InodeCache {
         String s;
         boolean good = false;
         try {
         String s;
         boolean good = false;
         try {

-                   while((s = br.readLine()) != null) {
+            while((s = br.readLine()) != null) {

                 if(s.charAt(0) == '#') {
                     short n = Short.parseShort(s.substring(1));
                 if(s.charAt(0) == '#') {
                     short n = Short.parseShort(s.substring(1));

-                           System.err.println("" + n + " -> " + c.reverse(n));
+                        System.err.println("" + n + " -> " + c.reverse(n));

                 } else {
                 } else {

-                           //System.err.println("Adding " + s);
-                               short n = c.get(s);
-                               System.err.println("Added " + s + " -> " + n);
-                               //c.dump();
+                    //System.err.println("Adding " + s);
+                    short n = c.get(s);
+                    System.err.println("Added " + s + " -> " + n);
+                    //c.dump();

                 }
             }
             good = true;
         } finally {
             if(!good) c.stats();
         }
                 }
             }
             good = true;
         } finally {
             if(!good) c.stats();
         }

-    }
+    }*/

 }
 }

diff --git a/src/org/ibex/nestedvm/util/Seekable.java b/src/org/ibex/nestedvm/util/Seekable.java
index 2e48a7d..cf8cca7 100644 (file)
--- a/src/org/ibex/nestedvm/util/Seekable.java
+++ b/src/org/ibex/nestedvm/util/Seekable.java
@@ -19,10 +19,10 @@ public abstract class Seekable {
     public int tryReadFully(byte[] buf, int off, int len) throws IOException {
         int total = 0;
         while(len > 0) {
     public int tryReadFully(byte[] buf, int off, int len) throws IOException {
         int total = 0;
         while(len > 0) {

-                   int n = read(buf,off,len);
-                   if(n == -1) break;
-                   off += n;
-                   len -= n;
+                int n = read(buf,off,len);
+                if(n == -1) break;
+                off += n;
+                len -= n;

             total += n;
         }
         return total == 0 ? -1 : total;
             total += n;
         }
         return total == 0 ? -1 : total;