cleanup

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

diff --git a/src/org/ibex/nestedvm/Runtime.java b/src/org/ibex/nestedvm/Runtime.java
index b790374..a758a50 100644 (file)
--- a/src/org/ibex/nestedvm/Runtime.java
+++ b/src/org/ibex/nestedvm/Runtime.java
@@ -135,7 +135,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
             stackSize = max(stackSize,pageSize);
             stackSize = (stackSize + pageSize - 1) & ~(pageSize-1);
             stackPages = stackSize >>> pageShift;
-            heapStart = (heapStart + pageSize) & ~(pageSize-1);
+            heapStart = (heapStart + pageSize - 1) & ~(pageSize-1);
             if(stackPages + STACK_GUARD_PAGES + (heapStart >>> pageShift) >= totalPages)
                 throw new IllegalArgumentException("total pages too small");
         } else {
@@ -157,7 +157,8 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
             }
         }
     
-        addFD(new StdinFD(System.in));
+        InputStream stdin = Boolean.valueOf(getSystemProperty("nestedvm.textstdin")).booleanValue() ? new TextInputStream(System.in) : System.in;
+        addFD(new StdinFD(stdin));
         addFD(new StdoutFD(System.out));
         addFD(new StdoutFD(System.err));
     }
@@ -547,6 +548,15 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         sp &= ~15;
         if(top - sp > ARG_MAX) throw new IllegalArgumentException("args/environ too big");
 
+        // HACK: heapStart() isn't always available when the constructor
+        // is run and this sometimes doesn't get initialized
+        if(heapEnd == 0) {
+            heapEnd = heapStart();
+            if(heapEnd == 0) throw new Error("heapEnd == 0");
+            int pageSize = writePages.length == 1 ? 4096 : (1<<pageShift);
+            heapEnd = (heapEnd + pageSize - 1) & ~(pageSize-1);
+        }
+
         CPUState cpuState = new CPUState();
         cpuState.r[A0] = argsAddr;
         cpuState.r[A1] = envAddr;
@@ -693,10 +703,14 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
     public static final int O_APPEND = 0x0008;
     public static final int O_TRUNC = 0x0400;
     public static final int O_NONBLOCK = 0x4000;
+    public static final int O_NOCTTY = 0x8000;
+    
     
     FD hostFSOpen(final File f, int flags, int mode, final Object data) throws ErrnoException {
         if((flags & ~(3|O_CREAT|O_EXCL|O_APPEND|O_TRUNC)) != 0) {
-            if(STDERR_DIAG) System.err.println("WARNING: Unsupported flags passed to open(): " + toHex(flags & ~(3|O_CREAT|O_EXCL|O_APPEND|O_TRUNC)));
+            if(STDERR_DIAG)
+                System.err.println("WARNING: Unsupported flags passed to open(\"" + f + "\"): " + toHex(flags & ~(3|O_CREAT|O_EXCL|O_APPEND|O_TRUNC)));
+           
             throw new ErrnoException(ENOTSUP);
         }
         boolean write = (flags&3) != RD_ONLY;
@@ -716,6 +730,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
             return hostFSDirFD(f,data);
         }
         
+        // FIXME: Truncate
         final Seekable.File sf;
         try {
             sf = new Seekable.File(f,write);
@@ -737,6 +752,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
     
     /** The open syscall */
     private int sys_open(int addr, int flags, int mode) throws ErrnoException, FaultException {
+        flags &= ~O_NOCTTY; // this is meaningless under nestedvm
         FD fd = _open(cstring(addr),flags,mode);
         if(fd == null) return -ENOENT;
         int fdn = addFD(fd);
@@ -787,6 +803,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
     }
     
     /** The stat/fstat syscall helper */
+    // FIXME: Populate uid/gid/nlink
     int stat(FStat fs, int addr) throws FaultException {
         memWrite(addr+0,(fs.dev()<<16)|(fs.inode()&0xffff)); // st_dev (top 16), // st_ino (bottom 16)
         memWrite(addr+4,((fs.type()&0xf000))|(fs.mode()&0xfff)); // st_mode
@@ -869,6 +886,8 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
     private int sys_sysconf(int n) {
         switch(n) {
             case _SC_CLK_TCK: return 1000;
+            case _SC_PAGESIZE: return  writePages.length == 1 ? 4096 : (1<<pageShift);
+            case _SC_PHYS_PAGES: return writePages.length == 1 ? (1<<pageShift)/4096 : writePages.length;
             default:
                 if(STDERR_DIAG) System.err.println("WARNING: Attempted to use unknown sysconf key: " + n);
                 return -EINVAL;
@@ -1199,6 +1218,42 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         public FStat _fstat() { return new FStat() { public int type() { return S_IFCHR; } }; }
     }
     
+    // FEATURE: TextInputStream: This is pretty inefficient but it is only used for reading from the console on win32
+    static class TextInputStream extends InputStream {
+        private int pushedBack = -1;
+        private final InputStream parent;
+        public TextInputStream(InputStream parent) { this.parent = parent; }
+        public int read() throws IOException {
+            if(pushedBack != -1) { int c = pushedBack; pushedBack = -1; return c; }
+            int c = parent.read();
+            if(c == '\r' && (c = parent.read()) != '\n') { pushedBack = c; return '\r'; }
+            return c;
+        }
+        public int read(byte[] buf, int pos, int len) throws IOException {
+            boolean pb = false;
+            if(pushedBack != -1 && len > 0) {
+                buf[0] = (byte) pushedBack;
+                pushedBack = -1;
+                pos++; len--; pb = true;
+            }
+            int n = parent.read(buf,pos,len);
+            if(n == -1) return -1;
+            for(int i=0;i<n;i++) {
+                if(buf[pos+i] == '\r') {
+                    if(i==n-1) {
+                        int c = parent.read();
+                        if(c == '\n') buf[pos+i] = '\n';
+                        else pushedBack = c;
+                    } else if(buf[pos+i+1] == '\n') {
+                        System.arraycopy(buf,pos+i+1,buf,pos+i,len-i-1);
+                        n--;
+                    }
+                }
+            }
+            return n + (pb ? 1 : 0);
+        }
+    }
+    
     public static class FStat {
         public static final int S_IFIFO = 0010000;
         public static final int S_IFCHR = 0020000;
@@ -1286,7 +1341,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         public int pc;
         
         public CPUState dup() {
-                CPUState c = new CPUState();
+            CPUState c = new CPUState();
             c.hi = hi;
             c.lo = lo;
             c.fcsr = fcsr;
@@ -1303,6 +1358,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         public boolean allowRead(File f) { return true; }
         public boolean allowWrite(File f) { return true; }
         public boolean allowStat(File f) { return true; }
+        public boolean allowUnlink(File f) { return true; }
     }
     
     // Null pointer check helper function