X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fnestedvm%2FRuntime.java;h=8b577372a11aa9d2fc589d32d652ed451bab84ef;hb=b5282b0a1a8ca5212c75623610be6d0483fd35bd;hp=c501d0dc82246492e50131adf4796838cc2e5cb2;hpb=7ee9c4231f8e74adfde9679bc60783a715f69c2a;p=nestedvm.git
diff --git a/src/org/ibex/nestedvm/Runtime.java b/src/org/ibex/nestedvm/Runtime.java
index c501d0d..8b57737 100644
--- a/src/org/ibex/nestedvm/Runtime.java
+++ b/src/org/ibex/nestedvm/Runtime.java
@@ -1,3 +1,7 @@
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the Apache Public Source License 2.0 ("the License").
+// You may not use this file except in compliance with the License.
+
// Copyright 2003 Brian Alliet
// Based on org.xwt.imp.MIPS by Adam Megacz
// Portions Copyright 2003 Adam Megacz
@@ -6,9 +10,10 @@ 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 +50,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 */
@@ -69,8 +74,8 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
public ExecutionException exitException;
/** Table containing all open file descriptors. (Entries are null if the fd is not in use */
- FD[] fds = new FD[OPEN_MAX]; // package-private for UnixRuntime
- boolean closeOnExec[] = new boolean[OPEN_MAX];
+ FD[] fds; // package-private for UnixRuntime
+ boolean closeOnExec[];
/** Pointer to a SecurityManager for this process */
SecurityManager sm;
@@ -101,6 +106,16 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
/** Subclasses should set the CPUState to the state held in state */
protected abstract void setCPUState(CPUState state);
+ /** True to enabled a few hacks to better support the win32 console */
+ final static boolean win32Hacks;
+
+ static {
+ String os = Platform.getProperty("os.name");
+ String prop = Platform.getProperty("nestedvm.win32hacks");
+ if(prop != null) { win32Hacks = Boolean.valueOf(prop).booleanValue(); }
+ else { win32Hacks = os != null && os.toLowerCase().indexOf("windows") != -1; }
+ }
+
protected Object clone() throws CloneNotSupportedException {
Runtime r = (Runtime) super.clone();
r._byteBuf = null;
@@ -118,7 +133,8 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
return r;
}
- protected Runtime(int pageSize, int totalPages) {
+ protected Runtime(int pageSize, int totalPages) { this(pageSize, totalPages,false); }
+ protected Runtime(int pageSize, int totalPages, boolean exec) {
if(pageSize <= 0) throw new IllegalArgumentException("pageSize <= 0");
if(totalPages <= 0) throw new IllegalArgumentException("totalPages <= 0");
if((pageSize&(pageSize-1)) != 0) throw new IllegalArgumentException("pageSize not a power of two");
@@ -156,11 +172,16 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
readPages[i] = writePages[i] = new int[pageSize>>2];
}
}
-
- 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));
+
+ if(!exec) {
+ fds = new FD[OPEN_MAX];
+ closeOnExec = new boolean[OPEN_MAX];
+
+ InputStream stdin = win32Hacks ? new Win32ConsoleIS(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.
@@ -357,7 +378,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= 0) throw new ErrnoException(EACCES);
return null;
@@ -752,8 +771,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; }
@@ -803,12 +827,11 @@ 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
- 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
@@ -935,7 +958,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;
@@ -956,11 +979,21 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
/** Hook for subclasses to do something when the process exits */
void _exited() { }
- private int sys_exit(int status) {
+ void exit(int status, boolean fromSignal) {
+ if(fromSignal && fds[2] != null) {
+ try {
+ byte[] msg = getBytes("Process exited on signal " + (status - 128) + "\n");
+ fds[2].write(msg,0,msg.length);
+ } catch(ErrnoException e) { }
+ }
exitStatus = status;
for(int i=0;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);
@@ -1029,6 +1065,10 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
case SYS_getpagesize: return sys_getpagesize();
case SYS_fcntl: return sys_fcntl(a,b,c);
case SYS_sysconf: return sys_sysconf(a);
+ case SYS_getuid: return sys_getuid();
+ case SYS_geteuid: return sys_geteuid();
+ case SYS_getgid: return sys_getgid();
+ case SYS_getegid: return sys_getegid();
case SYS_memcpy: memcpy(a,b,c); return a;
case SYS_memset: memset(a,b,c); return a;
@@ -1050,6 +1090,11 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
}
}
+ private int sys_getuid() { return 0; }
+ private int sys_geteuid() { return 0; }
+ private int sys_getgid() { return 0; }
+ private int sys_getegid() { return 0; }
+
public int xmalloc(int size) { int p=malloc(size); if(p==0) throw new RuntimeException("malloc() failed"); return p; }
public int xrealloc(int addr,int newsize) { int p=realloc(addr,newsize); if(p==0) throw new RuntimeException("realloc() failed"); return p; }
public int realloc(int addr, int newsize) { try { return call("realloc",addr,newsize); } catch(CallException e) { return 0; } }
@@ -1102,8 +1147,6 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
public int getdents(byte[] a, int off, int length) throws ErrnoException { throw new ErrnoException(EBADFD); }
- public int flags() { return O_RDONLY; }
-
/** Return a Seekable object representing this file descriptor (can be read only)
This is required for exec() */
Seekable seekable() { return null; }
@@ -1115,6 +1158,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
}
protected abstract FStat _fstat();
+ public abstract int flags();
/** Closes the fd */
public final void close() { if(--refCount==0) _close(); }
@@ -1194,8 +1238,8 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
}
public void _close() {
- try {is.close(); } catch(IOException e) { /*ignore*/ }
- try {os.close(); } catch(IOException e) { /*ignore*/ }
+ 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 {
@@ -1218,7 +1262,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
}
}
- public FStat _fstat() { return new FStat(); }
+ public FStat _fstat() { return new SocketFStat(); }
}
static class TerminalFD extends InputOutputStreamFD {
@@ -1226,14 +1270,14 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
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; } }; }
+ public FStat _fstat() { return new SocketFStat() { 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 {
+ // This is pretty inefficient but it is only used for reading from the console on win32
+ static class Win32ConsoleIS extends InputStream {
private int pushedBack = -1;
private final InputStream parent;
- public TextInputStream(InputStream parent) { this.parent = parent; }
+ public Win32ConsoleIS(InputStream parent) { this.parent = parent; }
public int read() throws IOException {
if(pushedBack != -1) { int c = pushedBack; pushedBack = -1; return c; }
int c = parent.read();
@@ -1265,16 +1309,14 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
}
}
- public static class FStat {
- public static final int S_IFIFO = 0010000;
- public static final int S_IFCHR = 0020000;
- public static final int S_IFDIR = 0040000;
- public static final int S_IFREG = 0100000;
+ public abstract static class FStat {
+ public static final int S_IFIFO = 0010000;
+ public static final int S_IFCHR = 0020000;
+ public static final int S_IFDIR = 0040000;
+ public static final int S_IFREG = 0100000;
+ public static final int S_IFSOCK = 0140000;
- public int dev() { return 1; }
- public int inode() { return hashCode() & 0x7fff; }
public int mode() { return 0; }
- public int type() { return S_IFIFO; }
public int nlink() { return 0; }
public int uid() { return 0; }
public int gid() { return 0; }
@@ -1284,6 +1326,16 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
public int ctime() { return 0; }
public int blksize() { return 512; }
public int blocks() { return (size()+blksize()-1)/blksize(); }
+
+ public abstract int dev();
+ public abstract int type();
+ public abstract int inode();
+ }
+
+ public static class SocketFStat extends FStat {
+ public int dev() { return -1; }
+ public int type() { return S_IFSOCK; }
+ public int inode() { return hashCode() & 0x7fff; }
}
static class HostFStat extends FStat {
@@ -1295,7 +1347,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
this.executable = executable;
}
public int dev() { return 1; }
- public int inode() { return f.getName().hashCode() & 0xffff; }
+ public int inode() { return f.getAbsolutePath().hashCode() & 0x7fff; }
public int type() { return f.isDirectory() ? S_IFDIR : S_IFREG; }
public int nlink() { return 1; }
public int mode() {
@@ -1386,14 +1438,6 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
return _byteBuf;
}
- static String getSystemProperty(String key) {
- try {
- return System.getProperty(key);
- } catch(SecurityException e) {
- return null;
- }
- }
-
/** Decode a packed string */
protected static final int[] decodeData(String s, int words) {
if(s.length() % 8 != 0) throw new IllegalArgumentException("string length must be a multiple of 8");
@@ -1419,6 +1463,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; }