X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fnestedvm%2FRuntime.java;h=bfe1aaba8c3393f582dcd97da78ce458781d1a6c;hp=0543fd0aff3ec0aabc137c5c3ba54ac324d39ca2;hb=ab9be117467f7459965c61e49749b333678b6e4c;hpb=94617ade62211d11c80b1e87b2a4c822297dd43f

diff --git a/src/org/ibex/nestedvm/Runtime.java b/src/org/ibex/nestedvm/Runtime.java
index 0543fd0..bfe1aab 100644
--- a/src/org/ibex/nestedvm/Runtime.java
+++ b/src/org/ibex/nestedvm/Runtime.java
@@ -2,13 +2,17 @@
 // Based on org.xwt.imp.MIPS by Adam Megacz
 // Portions Copyright 2003 Adam Megacz
 
+// FEATURE: Add a patch to gcc that enabled -Wall -Werror by default
+// FIXME: Get a hotel for IVME :)
+
 package org.ibex.nestedvm;
 
 import org.ibex.nestedvm.util.*;
 import java.io.*;
-import java.util.Arrays;
 
 public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
+    public static final String VERSION = "1.0";
+    
     /** True to write useful diagnostic information to stderr when things go wrong */
     final static boolean STDERR_DIAG = true;
     
@@ -45,10 +49,10 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
     /** When the process started */
     private long startTime;
     
-    /**  Text/Data loaded in memory  */
-    public final static int STOPPED = 0;
     /** Program is executing instructions */
-    public final static int RUNNING = 1;
+    public final static int RUNNING = 0; // Horrible things will happen if this isn't 0
+    /**  Text/Data loaded in memory  */
+    public final static int STOPPED = 1;
     /** Prgram has been started but is paused */
     public final static int PAUSED = 2;
     /** Program is executing a callJava() method */
@@ -157,9 +161,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. 
@@ -356,7 +361,8 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
                 if(page == null) throw new WriteFaultException(a<<2);
                 int index = a&pageWordMask;
                 int n = min(c,pageWords-index);
-                Arrays.fill(page,index,index+n,fourBytes);
+                /* Arrays.fill(page,index,index+n,fourBytes);*/
+                for(int i=index;i<index+n;i++) page[i] = fourBytes;
                 a += n; c -= n;
             }
             addr = a<<2; count&=3;
@@ -718,8 +724,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         
         if((flags & (O_EXCL|O_CREAT)) == (O_EXCL|O_CREAT)) {
             try {
-                // NOTE: createNewFile is a Java2 function
-                if(!f.createNewFile()) throw new ErrnoException(EEXIST);
+                if(Platform.atomicCreateFile(f)) throw new ErrnoException(EEXIST);
             } catch(IOException e) {
                 throw new ErrnoException(EIO);
             }
@@ -731,7 +736,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         
         final Seekable.File sf;
         try {
-            sf = new Seekable.File(f,write);
+            sf = new Seekable.File(f,write,(flags & O_TRUNC) != 0);
         } catch(FileNotFoundException e) {
             if(e.getMessage() != null && e.getMessage().indexOf("Permission denied") >= 0) throw new ErrnoException(EACCES);
             return null;
@@ -750,8 +755,13 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
     
     /** The open syscall */
     private int sys_open(int addr, int flags, int mode) throws ErrnoException, FaultException {
+        String name = cstring(addr);
+        
+        // HACK: TeX, or GPC, or something really sucks
+        if(name.length() == 1024 && getClass().getName().equals("tests.TeX")) name = name.trim();
+        
         flags &= ~O_NOCTTY; // this is meaningless under nestedvm
-        FD fd = _open(cstring(addr),flags,mode);
+        FD fd = _open(name,flags,mode);
         if(fd == null) return -ENOENT;
         int fdn = addFD(fd);
         if(fdn == -1) { fd.close(); return -ENFILE; }
@@ -804,8 +814,8 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
     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
-        memWrite(addr+8,1<<16); // st_nlink (top 16) // st_uid (bottom 16)
-        memWrite(addr+12,0); // st_gid (top 16) // st_rdev (bottom 16)
+        memWrite(addr+8,fs.nlink()<<16|fs.uid()&0xffff); // st_nlink (top 16) // st_uid (bottom 16)
+        memWrite(addr+12,fs.gid()<<16|0); // st_gid (top 16) // st_rdev (bottom 16)
         memWrite(addr+16,fs.size()); // st_size
         memWrite(addr+20,fs.atime()); // st_atime
         // memWrite(addr+24,0) // st_spare1
@@ -932,7 +942,7 @@ 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");
-                    e.printStackTrace();
+                e.printStackTrace();
                 ret = 0;
             }
             state = RUNNING;
@@ -974,7 +984,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
                 for(i=arg;i<OPEN_MAX;i++) if(fds[i]==null) break;
                 if(i==OPEN_MAX) return -EMFILE;
                 fds[i] = fd.dup();
-                return 0;
+                return i;
             case F_GETFL:
                 return fd.flags();
             case F_SETFD:
@@ -993,20 +1003,23 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         <i>syscall</i> should be the contents of V0 and <i>a</i>, <i>b</i>, <i>c</i>, and <i>d</i> should be 
         the contenst of A0, A1, A2, and A3. The call MAY change the state
         @see Runtime#state state */
-    protected final int syscall(int syscall, int a, int b, int c, int d) {
+    protected final int syscall(int syscall, int a, int b, int c, int d, int e, int f) {
         try {
-            return _syscall(syscall,a,b,c,d);
-        } catch(ErrnoException e) {
-            return -e.errno;
-        } catch(FaultException e) {
+            int n = _syscall(syscall,a,b,c,d,e,f);
+            //if(n < 0) System.err.println("syscall: " + syscall + " returned " + n);
+            return n;
+        } catch(ErrnoException ex) {
+            //ex.printStackTrace();
+            return -ex.errno;
+        } catch(FaultException ex) {
             return -EFAULT;
-        } catch(RuntimeException e) {
-            e.printStackTrace();
+        } catch(RuntimeException ex) {
+            ex.printStackTrace();
             throw new Error("Internal Error in _syscall()");
         }
     }
     
-    int _syscall(int syscall, int a, int b, int c, int d) throws ErrnoException, FaultException {
+    int _syscall(int syscall, int a, int b, int c, int d, int e, int f) throws ErrnoException, FaultException {
         switch(syscall) {
             case SYS_null: return 0;
             case SYS_exit: return sys_exit(a);
@@ -1171,48 +1184,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() {
+            if(is != null) try { is.close(); } catch(IOException e) { /*ignore*/ }
+            if(os != null) 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; } }; }
+        public FStat _fstat() { return new FStat() { public int type() { return S_IFCHR; } public int mode() { return 0600; } }; }
+    }
+    
+    // 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 {
@@ -1302,7 +1362,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;
@@ -1369,6 +1429,13 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
         }
     }
     
+    static byte[] getNullTerminatedBytes(String s) {
+        byte[] buf1 = getBytes(s);
+        byte[] buf2 = new byte[buf1.length+1];
+        System.arraycopy(buf1,0,buf2,0,buf1.length);
+        return buf2;
+    }
+    
     final static String toHex(int n) { return "0x" + Long.toString(n & 0xffffffffL, 16); }
     final static int min(int a, int b) { return a < b ? a : b; }
     final static int max(int a, int b) { return a > b ? a : b; }