X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fnestedvm%2FRuntime.java;h=201fde94894bf6023e5296dd9fa2b14a81036d77;hb=5b0cc721fd63727616d6e0bb8ec4e8f0dbc39f9b;hp=5c2cc6a271b57db0ff77284b4d1bff66f07e6227;hpb=d309b21d2ee150a9f426c7d22a5ce6d392b59d26;p=nestedvm.git
diff --git a/src/org/ibex/nestedvm/Runtime.java b/src/org/ibex/nestedvm/Runtime.java
index 5c2cc6a..201fde9 100644
--- a/src/org/ibex/nestedvm/Runtime.java
+++ b/src/org/ibex/nestedvm/Runtime.java
@@ -76,10 +76,6 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
/** Table containing all open file descriptors. (Entries are null if the fd is not in use */
FD[] fds; // package-private for UnixRuntime
boolean closeOnExec[];
-
- /** Table of all current file locks held by this process. */
- Seekable.Lock[] locks;
- public static final int LOCK_MAX = 8;
/** Pointer to a SecurityManager for this process */
SecurityManager sm;
@@ -102,7 +98,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
/** Subclasses should return the address of the symbol symbol or -1 it it doesn't exits in this method
This method is only required if the call() function is used */
- protected int lookupSymbol(String symbol) { return -1; }
+ public int lookupSymbol(String symbol) { return -1; }
/** Subclasses should populate a CPUState object representing the cpu state */
protected abstract void getCPUState(CPUState state);
@@ -126,7 +122,6 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
r.startTime = 0;
r.fds = new FD[OPEN_MAX];
for(int i=0;ifdn and removes it from the file descriptor table */
public final boolean closeFD(int fdn) {
if(state == EXITED || state == EXECED) throw new IllegalStateException("closeFD called in inappropriate state");
if(fdn < 0 || fdn >= OPEN_MAX) return false;
if(fds[fdn] == null) return false;
+
+ _closedFD(fds[fdn]);
+
fds[fdn].close();
fds[fdn] = null;
return true;
@@ -1012,7 +1017,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
return 0;
}
- private int sys_fcntl(int fdn, int cmd, int arg) throws FaultException {
+ final int sys_fcntl(int fdn, int cmd, int arg) throws FaultException {
int i;
if(fdn < 0 || fdn >= OPEN_MAX) return -EBADFD;
@@ -1035,123 +1040,30 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
return closeOnExec[fdn] ? 1 : 0;
case F_GETLK:
case F_SETLK:
- try {
- return sys_fcntl_lock(fd, cmd, arg);
- } catch (IOException e) { throw new RuntimeException(e);}
+ if(STDERR_DIAG) System.err.println("WARNING: file locking requires UnixRuntime");
+ return -ENOSYS;
default:
if(STDERR_DIAG) System.err.println("WARNING: Unknown fcntl command: " + cmd);
return -ENOSYS;
}
}
- /** Implements the F_GETLK and F_SETLK cases of fcntl syscall.
- * If l_start = 0 and l_len = 0 the lock refers to the entire file.
- struct flock {
- short l_type; // lock type: F_UNLCK, F_RDLCK, F_WRLCK
- short l_whence; // type of l_start: SEEK_SET, SEEK_CUR, SEEK_END
- long l_start; // starting offset, bytes
- long l_len; // len = 0 means until EOF
- short l_pid; // lock owner
- short l_xxx; // padding
- };
- */
- private int sys_fcntl_lock(FD fd, int cmd, int arg)
- throws FaultException, IOException {
- if (arg == 0) { System.out.println("BAD ARG"); return -EINVAL; }
- int word = memRead(arg);
- int l_start = memRead(arg+4);
- int l_len = memRead(arg+8);
- int l_type = word>>16;
- int l_whence = word&0x00ff;
+ final int fsync(int fdn) {
+ if(fdn < 0 || fdn >= OPEN_MAX) return -EBADFD;
+ if(fds[fdn] == null) return -EBADFD;
+ FD fd = fds[fdn];
Seekable s = fd.seekable();
if (s == null) return -EINVAL;
- switch (l_whence) {
- case SEEK_SET: break;
- case SEEK_CUR: l_start += s.pos(); break;
- case SEEK_END: l_start += s.length(); break;
- default: return -1;
- }
-
- if (cmd != F_GETLK && cmd != F_SETLK) return -EINVAL;
-
- if (cmd == F_GETLK) {
- // Check if an l_type lock can be aquired. The only way to
- // do this within the Java API is to try and create a lock.
- Seekable.Lock lock = s.lock(l_start, l_len, l_type == F_RDLCK);
-
- if (lock != null) {
- // no lock exists
- memWrite(arg, SEEK_SET|(F_UNLCK<<16));
- lock.release();
- }
-
- return 0;
- }
-
- // now processing F_SETLK
- if (cmd != F_SETLK) return -EINVAL;
-
- if (l_type == F_UNLCK) {
- // release all locks that fall within the boundaries given
- for (int i=0; i < LOCK_MAX; i++) {
- if (locks[i] == null || !s.equals(locks[i].seekable()))
- continue;
-
- int pos = (int)locks[i].position();
- if (pos < l_start) continue;
- if (l_start != 0 && l_len != 0) // start/len 0 means unlock all
- if (pos + locks[i].size() > l_start + l_len)
- continue;
-
- locks[i].release();
- locks[i] = null;
- }
- return 0;
-
- } else if (l_type == F_RDLCK || l_type == F_WRLCK) {
- // first see if a lock already exists
- for (int i=0; i < LOCK_MAX; i++) {
- if (locks[i] == null || !s.equals(locks[i].seekable()))
- continue;
- int pos = (int)locks[i].position();
- int size = (int)locks[i].size();
- if (l_start < pos && pos + size < l_start + l_len) {
- // found a lock contained in the new requested lock
- locks[i].release();
- locks[i] = null;
-
- } else if (l_start >= pos && pos + size >= l_start + l_len) {
- // found a lock that contains the requested lock
- if (locks[i].isShared() == (l_type == F_RDLCK)) {
- memWrite(arg+4, pos);
- memWrite(arg+8, size);
- return 0;
- } else {
- locks[i].release();
- locks[i] = null;
- }
- }
- }
-
- // create the lock
- Seekable.Lock lock = s.lock(l_start, l_len, l_type == F_RDLCK);
- if (lock == null) return -EAGAIN;
-
- int i;
- for (i=0; i < LOCK_MAX; i++)
- if (locks[i] == null) break;
- if (i == LOCK_MAX) return -ENOLCK;
- locks[i] = lock;
+ try {
+ s.sync();
return 0;
-
- } else {
- return -EINVAL;
+ } catch (IOException e) {
+ return -EIO;
}
}
-
/** The syscall dispatcher.
The should be called by subclasses when the syscall instruction is invoked.
syscall should be the contents of V0 and a, b, c, and d should be
@@ -1201,6 +1113,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
case SYS_getgid: return sys_getgid();
case SYS_getegid: return sys_getegid();
+ case SYS_fsync: return fsync(a);
case SYS_memcpy: memcpy(a,b,c); return a;
case SYS_memset: memset(a,b,c); return a;
@@ -1249,7 +1162,35 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
}
return addr;
}
-
+
+ // TODO: less memory copying (custom utf-8 reader)
+ // or at least roll strlen() into copyin()
+ public final String utfstring(int addr) throws ReadFaultException {
+ if (addr == 0) return null;
+
+ // determine length
+ int i=addr;
+ for(int word = 1; word != 0; i++) {
+ word = memRead(i&~3);
+ switch(i&3) {
+ case 0: word = (word>>>24)&0xff; break;
+ case 1: word = (word>>>16)&0xff; break;
+ case 2: word = (word>>> 8)&0xff; break;
+ case 3: word = (word>>> 0)&0xff; break;
+ }
+ }
+ if (i > addr) i--; // do not count null
+
+ byte[] bytes = new byte[i-addr];
+ copyin(addr, bytes, bytes.length);
+
+ try {
+ return new String(bytes, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e); // should never happen with UTF-8
+ }
+ }
+
/** Helper function to read a cstring from main memory */
public final String cstring(int addr) throws ReadFaultException {
if (addr == 0) return null;
@@ -1589,7 +1530,7 @@ public abstract class Runtime implements UsermodeConstants,Registers,Cloneable {
static byte[] getBytes(String s) {
try {
- return s.getBytes("ISO-8859-1");
+ return s.getBytes("UTF-8");
} catch(UnsupportedEncodingException e) {
return null; // should never happen
}