sim, syscall_emul: Add mmap to EmulatedDriver

Add support for calling mmap on an EmulatedDriver file descriptor.
This commit is contained in:
Michael LeBeane 2016-09-13 23:12:46 -04:00
parent 6a668d0c0c
commit f17a5faf44
2 changed files with 24 additions and 3 deletions

View file

@ -46,8 +46,8 @@ class ThreadContext;
* hardware inside gem5 can be created by deriving from this class and * hardware inside gem5 can be created by deriving from this class and
* overriding the abstract virtual methods. * overriding the abstract virtual methods.
* *
* Currently only open() and ioctl() calls are supported, but other calls * Currently only open(), ioctl(), and mmap() calls are supported, but other
* (e.g., read(), write(), mmap()) could be added as needed. * calls (e.g., read(), write()) could be added as needed.
*/ */
class EmulatedDriver : public SimObject class EmulatedDriver : public SimObject
{ {
@ -85,6 +85,17 @@ class EmulatedDriver : public SimObject
* (see the SyscallReturn class). * (see the SyscallReturn class).
*/ */
virtual int ioctl(LiveProcess *p, ThreadContext *tc, unsigned req) = 0; virtual int ioctl(LiveProcess *p, ThreadContext *tc, unsigned req) = 0;
/**
* Virtual method, invoked when the user program calls mmap() on
* the file descriptor returned by a previous open(). The parameters
* are the same as those passed in to mmapFunc() (q.v.).
* @return The return ptr for the mmap, or the negation of the errno
* (see the SyscallReturn class).
*/
virtual Addr mmap(LiveProcess *p, ThreadContext *tc, Addr start,
uint64_t length, int prot, int tgtFlags, int tgtFd,
int offset) { return -EBADF; }
}; };
#endif // __SIM_EMUL_DRIVER_HH #endif // __SIM_EMUL_DRIVER_HH

View file

@ -1284,7 +1284,17 @@ mmapImpl(SyscallDesc *desc, int num, LiveProcess *p, ThreadContext *tc,
int sim_fd = -1; int sim_fd = -1;
uint8_t *pmap = nullptr; uint8_t *pmap = nullptr;
if (!(tgt_flags & OS::TGT_MAP_ANONYMOUS)) { if (!(tgt_flags & OS::TGT_MAP_ANONYMOUS)) {
sim_fd = p->getSimFD(tgt_fd); // Check for EmulatedDriver mmap
FDEntry *fde = p->getFDEntry(tgt_fd);
if (fde == NULL)
return -EBADF;
if (fde->driver != NULL) {
return fde->driver->mmap(p, tc, start, length, prot,
tgt_flags, tgt_fd, offset);
}
sim_fd = fde->fd;
if (sim_fd < 0) if (sim_fd < 0)
return -EBADF; return -EBADF;