556c556
< int fd = process->getSyscallArg(tc, index);
---
> int tgt_fd = process->getSyscallArg(tc, index);
559c559
< DPRINTF(SyscallVerbose, "ioctl(%d, 0x%x, ...)\n", fd, req);
---
> DPRINTF(SyscallVerbose, "ioctl(%d, 0x%x, ...)\n", tgt_fd, req);
561c561
< Process::FdMap *fdObj = process->sim_fd_obj(fd);
---
> FDEntry *fde = process->get_fd_entry(tgt_fd);
563c563
< if (fdObj == NULL) {
---
> if (fde == NULL) {
568,569c568,569
< if (fdObj->driver != NULL) {
< return fdObj->driver->ioctl(process, tc, req);
---
> if (fde->driver != NULL) {
> return fde->driver->ioctl(process, tc, req);
577c577
< fd, req, tc->pcState());
---
> tgt_fd, req, tc->pcState());
1238,1239c1238,1239
< Process::FdMap *fd_map = p->sim_fd_obj(tgt_fd);
< if (!fd_map || fd_map->fd < 0) {
---
> FDEntry *fde = p->get_fd_entry(tgt_fd);
> if (!fde || fde->fd < 0) {
1244c1244
< if (fd_map->filename != "/dev/zero") {
---
> if (fde->filename != "/dev/zero") {
1249c1249
< " other than /dev/zero\n", fd_map->filename);
---
> " other than /dev/zero\n", fde->filename);