ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

x

Browse source
This commit is contained in:
Frans Kaashoek 2018-10-07 18:14:53 -04:00
parent 704775b63d
commit f241e67d91
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
syscall.c
View file

@ -25,6 +25,17 @@ fetchint(uint64 addr, int *ip)
return 0; return 0;
} }
// Fetch the uint64 at addr from the current process.
int
fetchaddr(uint64 addr, uint64 *ip)
{
struct proc *curproc = myproc();
if(addr >= curproc->sz || addr+sizeof(uint64) > curproc->sz)
return -1;
*ip = *(uint64*)(addr);
return 0;
}
// Fetch the nul-terminated string at addr from the current process. // Fetch the nul-terminated string at addr from the current process.
// Doesn't actually copy the string - just sets *pp to point at it. // Doesn't actually copy the string - just sets *pp to point at it.
// Returns length of string, not including nul. // Returns length of string, not including nul.
@ -67,16 +78,6 @@ fetcharg(int n)
return -1; return -1;
} }
int
fetchaddr(uint64 addr, uint64 *ip)
{
struct proc *curproc = myproc();
if(addr >= curproc->sz || addr+sizeof(uint64) > curproc->sz)
return -1;
*ip = *(uint64*)(addr);
return 0;
}
// Fetch the nth 32-bit system call argument. // Fetch the nth 32-bit system call argument.
int int
argint(int n, int *ip) argint(int n, int *ip)
@ -116,8 +117,8 @@ argptr(int n, char **pp, int size)
int int
argstr(int n, char **pp) argstr(int n, char **pp)
{ {
int addr; uint64 addr;
if(argint(n, &addr) < 0) if(argaddr(n, &addr) < 0)
return -1; return -1;
return fetchstr(addr, pp); return fetchstr(addr, pp);
} }