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);
-
+ case SYS_access: return sys_access(a,b);
+ case SYS_realpath: return sys_realpath(a,b);
+ case SYS_chown: return sys_chown(a,b,c);
+ case SYS_lchown: return sys_chown(a,b,c);
+ case SYS_fchown: return sys_fchown(a,b,c);
+ case SYS_chmod: return sys_chmod(a,b,c);
+ case SYS_fchmod: return sys_fchmod(a,b,c);
+ case SYS_umask: return sys_umask(a);
+
default: return super._syscall(syscall,a,b,c,d,e,f);
}
}
private int sys_getppid() {
return parent == null ? 1 : parent.pid;
}
+
+ private int sys_chown(int fileAddr, int uid, int gid) {
+ return 0;
+ }
+ private int sys_lchown(int fileAddr, int uid, int gid) {
+ return 0;
+ }
+ private int sys_fchown(int fd, int uid, int gid) {
+ return 0;
+ }
+ private int sys_chmod(int fileAddr, int uid, int gid) {
+ return 0;
+ }
+ private int sys_fchmod(int fd, int uid, int gid) {
+ return 0;
+ }
+ private int sys_umask(int mask) {
+ return 0;
+ }
+
+ private int sys_access(int cstring, int mode) throws ErrnoException, ReadFaultException {
+ // FEATURE: sys_access
+ return gs.stat(this,cstring(cstring)) == null ? -ENOENT : 0;
+ }
+
+ private int sys_realpath(int inAddr, int outAddr) throws FaultException {
+ String s = normalizePath(cstring(inAddr));
+ byte[] b = getNullTerminatedBytes(s);
+ if(b.length > PATH_MAX) return -ERANGE;
+ copyout(b,outAddr,b.length);
+ return 0;
+ }
// FEATURE: Signal handling
// check flag only on backwards jumps to basic blocks without compulsatory checks
static {
Method m;
try {
- m = Class.forName("org.ibex.nestedvm.RuntimeCompiler").getMethod("compile",new Class[]{Seekable.class,String.class});
+ m = Class.forName("org.ibex.nestedvm.RuntimeCompiler").getMethod("compile",new Class[]{Seekable.class,String.class,String.class});
} catch(NoSuchMethodException e) {
m = null;
} catch(ClassNotFoundException e) {
runtimeCompilerCompile = m;
}
- public Class runtimeCompile(Seekable s) throws IOException {
+ public Class runtimeCompile(Seekable s, String sourceName) throws IOException {
if(runtimeCompilerCompile == null) {
if(STDERR_DIAG) System.err.println("WARNING: Exec attempted but RuntimeCompiler not found!");
return null;
}
try {
- return (Class) runtimeCompilerCompile.invoke(null,new Object[]{s,"unixruntime"});
+ return (Class) runtimeCompilerCompile.invoke(null,new Object[]{s,"unixruntime,maxinsnpermethod=256,lessconstants",sourceName});
} catch(IllegalAccessException e) {
e.printStackTrace();
return null;
if(n < 4) s.tryReadFully(buf,n,4-n);
if(buf[1] != 'E' || buf[2] != 'L' || buf[3] != 'F') return -ENOEXEC;
s.seek(0);
- Class c = runtimeCompile(s);
+ if(STDERR_DIAG) System.err.println("Running RuntimeCompiler for " + path);
+ Class c = runtimeCompile(s,path);
+ if(STDERR_DIAG) System.err.println("RuntimeCompiler finished for " + path);
if(c == null) throw new ErrnoException(ENOEXEC);
gs.execCache.put(path,new GlobalState.CacheEnt(mtime,size,c));
return execClass(c,argv,envp);
if(p == buf.length) break OUTER;
n = s.read(buf,p,buf.length-p);
}
- int arg;
- for(arg=2;arg<p;arg++) if(buf[arg] == ' ') break;
- int cmdEnd = arg;
- while(arg < p && buf[arg] == ' ') arg++;
+ int cmdStart = 2;
+ for(;cmdStart<p;cmdStart++) if(buf[cmdStart]!=' ') break;
+ if(cmdStart == p) throw new ErrnoException(ENOEXEC);
+ int argStart = cmdStart;
+ for(;argStart<p;argStart++) if(buf[argStart] == ' ') break;
+ int cmdEnd = argStart;
+ while(argStart < p && buf[argStart] == ' ') argStart++;
String[] command = new String[] {
- new String(buf,2,cmdEnd),
- arg < p ? new String(buf,arg,p-arg) : null
+ new String(buf,cmdStart,cmdEnd-cmdStart),
+ argStart < p ? new String(buf,argStart,p-argStart) : null
};
gs.execCache.put(path,new GlobalState.CacheEnt(mtime,size,command));
return execScript(path,command,argv,envp);
}
public int execScript(String path, String[] command, String[] argv, String[] envp) throws ErrnoException {
- String[] newArgv = new String[argv.length + command[1] != null ? 2 : 1];
+ String[] newArgv = new String[argv.length-1 + (command[1] != null ? 3 : 2)];
int p = command[0].lastIndexOf('/');
newArgv[0] = p == -1 ? command[0] : command[0].substring(p+1);
- p = 1;
+ newArgv[1] = "/" + path;
+ p = 2;
if(command[1] != null) newArgv[p++] = command[1];
- newArgv[p++] = "/" + path;
for(int i=1;i<argv.length;i++) newArgv[p++] = argv[i];
+ if(p != newArgv.length) throw new Error("p != newArgv.length");
+ System.err.println("Execing: " + command[0]);
+ for(int i=0;i<newArgv.length;i++) System.err.println("execing [" + i + "] " + newArgv[i]);
return exec(command[0],newArgv,envp);
}
char[] in = new char[path.length()+1];
char[] out = new char[in.length + (absolute ? -1 : cwd.length())];
+ path.getChars(0,path.length(),in,0);
int inp=0, outp=0;
if(absolute) {
outp = cwdl;
}
- path.getChars(0,path.length(),in,0);
while(in[inp] != 0) {
if(inp != 0) {
while(in[inp] != 0 && in[inp] != '/') { out[outp++] = in[inp++]; }
}
if(outp > 0 && out[outp-1] == '/') outp--;
//System.err.println("normalize: " + path + " -> " + new String(out,0,outp) + " (cwd: " + cwd + ")");
- return new String(out,0,outp);
+ int outStart = out[0] == '/' ? 1 : 0;
+ return new String(out,outStart,outp - outStart);
}
FStat hostFStat(final File f, Object data) {
private static File getParentFile(File f) {
String p = f.getParent();
- return p == null ? null : new File(f,p);
+ return p == null ? null : new File(p);
}
public class HostDirFD extends DirFD {
projects / nestedvm.git / blobdiff