package org.ibex.nestedvm;
import org.ibex.nestedvm.util.*;
-// FEATURE: This is ugly, this stuff needs to be in org.ibex.util or something
+// HACK: This is ugly, this stuff needs to be in org.ibex.util or something
import org.ibex.classgen.util.Sort;
import java.io.*;
import java.util.*;
case SYS_accept: return sys_accept(a,b,c);
case SYS_shutdown: return sys_shutdown(a,b);
case SYS_sysctl: return sys_sysctl(a,b,c,d,e,f);
+ case SYS_sendto: return sys_sendto(a,b,c,d,e,f);
+ case SYS_recvfrom: return sys_recvfrom(a,b,c,d,e,f);
+ case SYS_select: return sys_select(a,b,c,d,e);
default: return super._syscall(syscall,a,b,c,d,e,f);
}
exitedChildren.removeElementAt(exitedChildren.size() - 1);
}
} else if(pid > 0) {
+ if(pid >= gs.tasks.length) return -ECHILD;
UnixRuntime t = gs.tasks[pid];
if(t.parent != this) return -ECHILD;
if(t.state == EXITED) {
}
private int sys_fork() {
- CPUState state = new CPUState();
- getCPUState(state);
- int sp = state.r[SP];
final UnixRuntime r;
try {
}
activeChildren.addElement(r);
+ CPUState state = new CPUState();
+ getCPUState(state);
state.r[V0] = 0; // return 0 to child
state.pc += 4; // skip over syscall instruction
r.setCPUState(state);
return n;
}
- // FEATURE: UDP is totally broken
-
static class SocketFD extends FD {
public static final int TYPE_STREAM = 0;
public static final int TYPE_DGRAM = 1;
int flags;
int options;
- Object o;
+
+ Socket s;
+ ServerSocket ss;
+ DatagramSocket ds;
+
InetAddress bindAddr;
int bindPort = -1;
+ InetAddress connectAddr;
+ int connectPort = -1;
+
DatagramPacket dp;
InputStream is;
OutputStream os;
- public SocketFD(int type) { flags = type; }
+ private static final byte[] EMPTY = new byte[0];
+ public SocketFD(int type) {
+ flags = type;
+ if(type == TYPE_DGRAM)
+ dp = new DatagramPacket(EMPTY,0);
+ }
public void setOptions() {
try {
- if(o != null && type() == TYPE_STREAM && !listen()) {
- Platform.socketSetKeepAlive((Socket)o,(options & SO_KEEPALIVE) != 0);
+ if(s != null && type() == TYPE_STREAM && !listen()) {
+ Platform.socketSetKeepAlive(s,(options & SO_KEEPALIVE) != 0);
}
} catch(SocketException e) {
if(STDERR_DIAG) e.printStackTrace();
}
public void _close() {
- if(o != null) {
- try {
- if(type() == TYPE_STREAM) {
- if(listen()) ((ServerSocket)o).close();
- else ((Socket)o).close();
- } else {
- ((DatagramSocket)o).close();
- }
- } catch(IOException e) {
- /* ignore */
- }
+ try {
+ if(s != null) s.close();
+ if(ss != null) ss.close();
+ if(ds != null) ds.close();
+ } catch(IOException e) {
+ /* ignore */
}
}
public int read(byte[] a, int off, int length) throws ErrnoException {
- if(type() == TYPE_STREAM) {
- if(is == null) throw new ErrnoException(EPIPE);
- try {
- int n = is.read(a,off,length);
- return n < 0 ? 0 : n;
- } catch(IOException e) {
- throw new ErrnoException(EIO);
- }
- } else {
- if(off != 0) throw new IllegalArgumentException("off must be 0");
- DatagramSocket ds = (DatagramSocket) o;
- dp.setData(a);
- dp.setLength(length);
- try {
- ds.receive(dp);
- } catch(IOException e) {
- throw new ErrnoException(EIO);
- }
- return dp.getLength();
+ if(type() == TYPE_DGRAM) return recvfrom(a,off,length,null,null);
+ if(is == null) throw new ErrnoException(EPIPE);
+ try {
+ int n = is.read(a,off,length);
+ return n < 0 ? 0 : n;
+ } catch(IOException e) {
+ throw new ErrnoException(EIO);
}
}
+ public int recvfrom(byte[] a, int off, int length, InetAddress[] sockAddr, int[] port) throws ErrnoException {
+ if(type() == TYPE_STREAM) return read(a,off,length);
+
+ if(off != 0) throw new IllegalArgumentException("off must be 0");
+ dp.setData(a);
+ dp.setLength(length);
+ try {
+ if(ds == null) ds = new DatagramSocket();
+ ds.receive(dp);
+ } catch(IOException e) {
+ if(STDERR_DIAG) e.printStackTrace();
+ throw new ErrnoException(EIO);
+ }
+ if(sockAddr != null) {
+ sockAddr[0] = dp.getAddress();
+ port[0] = dp.getPort();
+ }
+ return dp.getLength();
+ }
+
public int write(byte[] a, int off, int length) throws ErrnoException {
- if(type() == TYPE_STREAM) {
- if(os == null) throw new ErrnoException(EPIPE);
- try {
- os.write(a,off,length);
- return length;
- } catch(IOException e) {
- throw new ErrnoException(EIO);
- }
- } else {
- if(off != 0) throw new IllegalArgumentException("off must be 0");
- DatagramSocket ds = (DatagramSocket) o;
- dp.setData(a);
- dp.setLength(length);
- try {
- ds.send(dp);
- } catch(IOException e) {
- throw new ErrnoException(EIO);
- }
- return dp.getLength();
+ if(type() == TYPE_DGRAM) return sendto(a,off,length,null,-1);
+
+ if(os == null) throw new ErrnoException(EPIPE);
+ try {
+ os.write(a,off,length);
+ return length;
+ } catch(IOException e) {
+ throw new ErrnoException(EIO);
}
}
+
+ public int sendto(byte[] a, int off, int length, InetAddress destAddr, int destPort) throws ErrnoException {
+ if(off != 0) throw new IllegalArgumentException("off must be 0");
+ if(type() == TYPE_STREAM) return write(a,off,length);
+
+ if(destAddr == null) {
+ destAddr = connectAddr;
+ destPort = connectPort;
+
+ if(destAddr == null) throw new ErrnoException(ENOTCONN);
+ }
+
+ dp.setAddress(destAddr);
+ dp.setPort(destPort);
+ dp.setData(a);
+ dp.setLength(length);
+
+ try {
+ if(ds == null) ds = new DatagramSocket();
+ ds.send(dp);
+ } catch(IOException e) {
+ if(STDERR_DIAG) e.printStackTrace();
+ if("Network is unreachable".equals(e.getMessage())) throw new ErrnoException(EHOSTUNREACH);
+ throw new ErrnoException(EIO);
+ }
+ return dp.getLength();
+ }
public int flags() { return O_RDWR; }
public FStat _fstat() { return new SocketFStat(); }
private int sys_connect(int fdn, int addr, int namelen) throws ErrnoException, FaultException {
SocketFD fd = getSocketFD(fdn);
- if(fd.type() == SocketFD.TYPE_STREAM && fd.o != null) return -EISCONN;
+ if(fd.type() == SocketFD.TYPE_STREAM && (fd.s != null || fd.ss != null)) return -EISCONN;
int word1 = memRead(addr);
if( ((word1 >>> 16)&0xff) != AF_INET) return -EAFNOSUPPORT;
int port = word1 & 0xffff;
return -EADDRNOTAVAIL;
}
+ fd.connectAddr = inetAddr;
+ fd.connectPort = port;
+
try {
switch(fd.type()) {
case SocketFD.TYPE_STREAM: {
Socket s = new Socket(inetAddr,port);
- fd.o = s;
+ fd.s = s;
fd.setOptions();
fd.is = s.getInputStream();
fd.os = s.getOutputStream();
break;
}
- case SocketFD.TYPE_DGRAM: {
- if(fd.dp == null) fd.dp = new DatagramPacket(null,0);
- fd.dp.setAddress(inetAddr);
- fd.dp.setPort(port);
+ case SocketFD.TYPE_DGRAM:
break;
- }
default:
throw new Error("should never happen");
}
private int sys_bind(int fdn, int addr, int namelen) throws FaultException, ErrnoException {
SocketFD fd = getSocketFD(fdn);
- if(fd.type() == SocketFD.TYPE_STREAM && fd.o != null) return -EISCONN;
+ if(fd.type() == SocketFD.TYPE_STREAM && (fd.s != null || fd.ss != null)) return -EISCONN;
int word1 = memRead(addr);
if( ((word1 >>> 16)&0xff) != AF_INET) return -EAFNOSUPPORT;
int port = word1 & 0xffff;
return 0;
}
case SocketFD.TYPE_DGRAM: {
- DatagramSocket s = (DatagramSocket) fd.o;
- if(s != null) s.close();
+ if(fd.ds != null) fd.ds.close();
try {
- fd.o = inetAddr != null ? new DatagramSocket(port,inetAddr) : new DatagramSocket(port);
+ fd.ds = inetAddr != null ? new DatagramSocket(port,inetAddr) : new DatagramSocket(port);
} catch(IOException e) {
return -EADDRINUSE;
}
private int sys_listen(int fdn, int backlog) throws ErrnoException {
SocketFD fd = getSocketFD(fdn);
if(fd.type() != SocketFD.TYPE_STREAM) return -EOPNOTSUPP;
- if(fd.o != null) return -EISCONN;
+ if(fd.ss != null || fd.s != null) return -EISCONN;
if(fd.bindPort < 0) return -EOPNOTSUPP;
try {
- fd.o = new ServerSocket(fd.bindPort,backlog,fd.bindAddr);
+ fd.ss = new ServerSocket(fd.bindPort,backlog,fd.bindAddr);
fd.flags |= SocketFD.LISTEN;
return 0;
} catch(IOException e) {
int size = memRead(lenaddr);
- ServerSocket s = (ServerSocket) fd.o;
+ ServerSocket s = fd.ss;
Socket client;
try {
client = s.accept();
}
SocketFD clientFD = new SocketFD(SocketFD.TYPE_STREAM);
- clientFD.o = client;
+ clientFD.s = client;
try {
clientFD.is = client.getInputStream();
clientFD.os = client.getOutputStream();
private int sys_shutdown(int fdn, int how) throws ErrnoException {
SocketFD fd = getSocketFD(fdn);
if(fd.type() != SocketFD.TYPE_STREAM || fd.listen()) return -EOPNOTSUPP;
- if(fd.o == null) return -ENOTCONN;
+ if(fd.s == null) return -ENOTCONN;
- Socket s = (Socket) fd.o;
+ Socket s = fd.s;
try {
if(how == SHUT_RD || how == SHUT_RDWR) Platform.socketHalfClose(s,false);
return 0;
}
+ private int sys_sendto(int fdn, int addr, int count, int flags, int destAddr, int socklen) throws ErrnoException,ReadFaultException {
+ SocketFD fd = getSocketFD(fdn);
+ if(flags != 0) throw new ErrnoException(EINVAL);
+
+ int word1 = memRead(destAddr);
+ if( ((word1 >>> 16)&0xff) != AF_INET) return -EAFNOSUPPORT;
+ int port = word1 & 0xffff;
+ InetAddress inetAddr;
+ byte[] ip = new byte[4];
+ copyin(destAddr+4,ip,4);
+ try {
+ inetAddr = Platform.inetAddressFromBytes(ip);
+ } catch(UnknownHostException e) {
+ return -EADDRNOTAVAIL;
+ }
+
+ count = Math.min(count,MAX_CHUNK);
+ byte[] buf = byteBuf(count);
+ copyin(addr,buf,count);
+ try {
+ return fd.sendto(buf,0,count,inetAddr,port);
+ } catch(ErrnoException e) {
+ if(e.errno == EPIPE) exit(128+13,true);
+ throw e;
+ }
+ }
+
+ private int sys_recvfrom(int fdn, int addr, int count, int flags, int sourceAddr, int socklenAddr) throws ErrnoException, FaultException {
+ SocketFD fd = getSocketFD(fdn);
+ if(flags != 0) throw new ErrnoException(EINVAL);
+
+ InetAddress[] inetAddr = sourceAddr == 0 ? null : new InetAddress[1];
+ int[] port = sourceAddr == 0 ? null : new int[1];
+
+ count = Math.min(count,MAX_CHUNK);
+ byte[] buf = byteBuf(count);
+ int n = fd.recvfrom(buf,0,count,inetAddr,port);
+ copyout(buf,addr,n);
+
+ if(sourceAddr != 0) {
+ memWrite(sourceAddr,(AF_INET << 16) | port[0]);
+ byte[] ip = inetAddr[0].getAddress();
+ copyout(ip,sourceAddr+4,4);
+ }
+
+ return n;
+ }
+
+ private int sys_select(int n, int readFDs, int writeFDs, int exceptFDs, int timevalAddr) throws ReadFaultException, ErrnoException {
+ return -ENOSYS;
+ }
+
private static String hostName() {
try {
return InetAddress.getLocalHost().getHostName();
return 0;
}
- // FEATURE: Run through the fork/wait stuff one more time
- public static class GlobalState {
- protected static final int OPEN = 1;
- protected static final int STAT = 2;
- protected static final int LSTAT = 3;
- protected static final int MKDIR = 4;
- protected static final int UNLINK = 5;
-
+ public static class GlobalState {
final UnixRuntime[] tasks;
int nextPID = 1;
mps = newMPS;
}
- // FEATURE: We shouldn't need to special case the root dir, it should work in the MP array
private Object fsop(int op, UnixRuntime r, String normalizedPath, int arg1, int arg2) throws ErrnoException {
int pl = normalizedPath.length();
if(pl != 0) {
MP mp = list[i];
int mpl = mp.path.length();
if(normalizedPath.startsWith(mp.path) && (pl == mpl || normalizedPath.charAt(mpl) == '/'))
- return dispatch(mp.fs,op,r,pl == mpl ? "" : normalizedPath.substring(mpl+1),arg1,arg2);
+ return mp.fs.dispatch(op,r,pl == mpl ? "" : normalizedPath.substring(mpl+1),arg1,arg2);
}
}
- return dispatch(root,op,r,normalizedPath,arg1,arg2);
- }
-
- // FEATURE: move this into FS so some filesystem can override it directly (devfs)
- private static Object dispatch(FS fs, int op, UnixRuntime r, String path, int arg1, int arg2) throws ErrnoException {
- switch(op) {
- case OPEN: return fs.open(r,path,arg1,arg2);
- case STAT: return fs.stat(r,path);
- case LSTAT: return fs.lstat(r,path);
- case MKDIR: fs.mkdir(r,path,arg1); return null;
- case UNLINK: fs.unlink(r,path); return null;
- default: throw new Error("should never happen");
- }
+ return root.dispatch(op,r,normalizedPath,arg1,arg2);
}
- public final FD open(UnixRuntime r, String path, int flags, int mode) throws ErrnoException { return (FD) fsop(OPEN,r,path,flags,mode); }
- public final FStat stat(UnixRuntime r, String path) throws ErrnoException { return (FStat) fsop(STAT,r,path,0,0); }
- public final FStat lstat(UnixRuntime r, String path) throws ErrnoException { return (FStat) fsop(LSTAT,r,path,0,0); }
- public final void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException { fsop(MKDIR,r,path,mode,0); }
- public final void unlink(UnixRuntime r, String path) throws ErrnoException { fsop(UNLINK,r,path,0,0); }
+ public final FD open(UnixRuntime r, String path, int flags, int mode) throws ErrnoException { return (FD) fsop(FS.OPEN,r,path,flags,mode); }
+ public final FStat stat(UnixRuntime r, String path) throws ErrnoException { return (FStat) fsop(FS.STAT,r,path,0,0); }
+ public final FStat lstat(UnixRuntime r, String path) throws ErrnoException { return (FStat) fsop(FS.LSTAT,r,path,0,0); }
+ public final void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException { fsop(FS.MKDIR,r,path,mode,0); }
+ public final void unlink(UnixRuntime r, String path) throws ErrnoException { fsop(FS.UNLINK,r,path,0,0); }
private Hashtable execCache = new Hashtable();
private static class CacheEnt {
}
public abstract static class FS {
+ static final int OPEN = 1;
+ static final int STAT = 2;
+ static final int LSTAT = 3;
+ static final int MKDIR = 4;
+ static final int UNLINK = 5;
+
GlobalState owner;
int devno;
+ Object dispatch(int op, UnixRuntime r, String path, int arg1, int arg2) throws ErrnoException {
+ switch(op) {
+ case OPEN: return open(r,path,arg1,arg2);
+ case STAT: return stat(r,path);
+ case LSTAT: return lstat(r,path);
+ case MKDIR: mkdir(r,path,arg1); return null;
+ case UNLINK: unlink(r,path); return null;
+ default: throw new Error("should never happen");
+ }
+ }
+
public FStat lstat(UnixRuntime r, String path) throws ErrnoException { return stat(r,path); }
// If this returns null it'll be truned into an ENOENT
if(!f.exists()) throw new Error("Couldn't get File for cwd");
f = new File(f.getAbsolutePath());
while(f.getParent() != null) f = new File(f.getParent());
- // HACK: This works around a bug in some versions of ClassPath
+ // This works around a bug in some versions of ClassPath
if(f.getPath().length() == 0) f = new File("/");
return f;
}
public int inode(int n) { return inodes.get(children[n].getAbsolutePath()); }
public int parentInode() {
File parent = getParentFile(f);
- return parent == null ? -1 : inodes.get(parent.getAbsolutePath());
+ // HACK: myInode() isn't really correct if we're not the root
+ return parent == null ? myInode() : inodes.get(parent.getAbsolutePath());
}
public int myInode() { return inodes.get(f.getAbsolutePath()); }
public int myDev() { return devno; }
if(path.equals("")) {
return new DevDirFD() {
public int myInode() { return ROOT_INODE; }
- // FEATURE: Get the real parent inode somehow
- public int parentInode() { return -1; }
+ // HACK: We don't have any clean way to get the parent inode
+ public int parentInode() { return ROOT_INODE; }
public int inode(int n) {
switch(n) {
case 0: return NULL_INODE;