X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fnestedvm%2FRuntime.java;h=c501d0dc82246492e50131adf4796838cc2e5cb2;hb=abe7c48fc6762412703430702e60db9cd834b55a;hp=9ba3dd00d400884210676f3b324c6e0bc30e4faa;hpb=cc4469a3b4c4fc1c5070e539f53a3e4cca0b8c75;p=nestedvm.git

diff --git a/src/org/ibex/nestedvm/Runtime.java b/src/org/ibex/nestedvm/Runtime.java
index 9ba3dd0..c501d0d 100644
--- 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,9 +157,10 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
             }
         }
     
-        addFD(new StdinFD(System.in));
-        addFD(new StdoutFD(System.out));
-        addFD(new StdoutFD(System.err));
+        InputStream stdin = Boolean.valueOf(getSystemProperty("nestedvm.textstdin")).booleanValue() ? new TextInputStream(System.in) : System.in;
+        addFD(new TerminalFD(stdin));
+        addFD(new TerminalFD(System.out));
+        addFD(new TerminalFD(System.err));
     }
     
     /** Copy everything from <i>src</i> to <i>addr</i> initializing uninitialized pages if required. 
@@ -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;
@@ -720,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);
@@ -792,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
@@ -1162,48 +1174,95 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         protected void _close() { try { data.close(); } catch(IOException e) { /*ignore*/ } }        
     }
     
-    public static class OutputStreamFD extends FD {
-        private OutputStream os;
-        public int flags() { return O_WRONLY; }
-        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;
-            } catch(IOException e) {
-                throw new ErrnoException(EIO);
-            }
+    public static class InputOutputStreamFD extends FD {
+        private final InputStream is;
+        private final OutputStream os;
+        
+        public InputOutputStreamFD(InputStream is) { this(is,null); }
+        public InputOutputStreamFD(OutputStream os) { this(null,os); }
+        public InputOutputStreamFD(InputStream is, OutputStream os) {
+            this.is = is;
+            this.os = os;
+            if(is == null && os == null) throw new IllegalArgumentException("at least one stream must be supplied");
         }
-        public void _close() { try { os.close(); } catch(IOException e) { /*ignore*/ }  }
-        public FStat _fstat() { return new FStat(); }
-    }
-    
-    public static class InputStreamFD extends FD {
-        private InputStream is;
-        public int flags() { return O_RDONLY; }
-        public InputStreamFD(InputStream is) { this.is = is; }
+        
+        public int flags() {
+            if(is != null && os != null) return O_RDWR;
+            if(is != null) return O_RDONLY;
+            if(os != null) return O_WRONLY;
+            throw new Error("should never happen");
+        }
+        
+        public void _close() {
+            try {is.close(); } catch(IOException e) { /*ignore*/ }
+            try {os.close(); } catch(IOException e) { /*ignore*/ }
+        }
+        
         public int read(byte[] a, int off, int length) throws ErrnoException {
+            if(is == null) return super.read(a,off,length);
             try {
                 int n = is.read(a,off,length);
                 return n < 0 ? 0 : n;
             } catch(IOException e) {
                 throw new ErrnoException(EIO);
             }
+        }    
+        
+        public int write(byte[] a, int off, int length) throws ErrnoException {
+            if(os == null) return super.write(a,off,length);
+            try {
+                os.write(a,off,length);
+                return length;
+            } catch(IOException e) {
+                throw new ErrnoException(EIO);
+            }
         }
-        public void _close() { try { is.close(); } catch(IOException e) { /*ignore*/ } }
+        
         public FStat _fstat() { return new FStat(); }
     }
     
-    static class StdinFD extends InputStreamFD {
-        public StdinFD(InputStream is) { super(is); }
+    static class TerminalFD extends InputOutputStreamFD {
+        public TerminalFD(InputStream is) { this(is,null); }
+        public TerminalFD(OutputStream os) { this(null,os); }
+        public TerminalFD(InputStream is, OutputStream os) { super(is,os); }
         public void _close() { /* noop */ }
         public FStat _fstat() { return new FStat() { public int type() { return S_IFCHR; } }; }
     }
     
-    static class StdoutFD extends OutputStreamFD {
-        public StdoutFD(OutputStream os) { super(os); }
-        public void _close() { /* noop */ }
-        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 {
@@ -1293,7 +1352,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;
@@ -1310,6 +1369,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