X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fnestedvm%2FRuntime.java;h=ff33ba967a525e226a23036ba3dbcbd3f95dd772;hp=0543fd0aff3ec0aabc137c5c3ba54ac324d39ca2;hb=a70d242f5b4d0c7bc97e305cd5825a85a4d5bda6;hpb=94617ade62211d11c80b1e87b2a4c822297dd43f
diff --git a/src/org/ibex/nestedvm/Runtime.java b/src/org/ibex/nestedvm/Runtime.java
index 0543fd0..ff33ba9 100644
--- a/src/org/ibex/nestedvm/Runtime.java
+++ b/src/org/ibex/nestedvm/Runtime.java
@@ -9,6 +9,8 @@ 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;
@@ -157,9 +159,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 src to addr initializing uninitialized pages if required.
@@ -356,7 +359,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;isyscall should be the contents of V0 and a, b, c, and d 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; } }; }
+ }
+
+ // 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 b ? a : b; }