From c5384366b6e5fa487e0a25db6c539b5a9d54ca7b Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Mon, 28 Aug 2006 07:39:56 -0700 Subject: [PATCH] Add dup() support (from Antti Miettinen). --HG-- extra : convert_revision : 72c834666afa3c353da026617ad5e7a762eb645f --- src/arch/alpha/linux/process.cc | 2 +- src/sim/syscall_emul.cc | 13 +++++++++++++ src/sim/syscall_emul.hh | 4 ++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/arch/alpha/linux/process.cc b/src/arch/alpha/linux/process.cc index 997c78ac9..357ebdada 100644 --- a/src/arch/alpha/linux/process.cc +++ b/src/arch/alpha/linux/process.cc @@ -162,7 +162,7 @@ SyscallDesc AlphaLinuxProcess::syscallDescs[] = { /* 38 */ SyscallDesc("osf_old_stat", unimplementedFunc), /* 39 */ SyscallDesc("setpgid", unimplementedFunc), /* 40 */ SyscallDesc("osf_old_lstat", unimplementedFunc), - /* 41 */ SyscallDesc("dup", unimplementedFunc), + /* 41 */ SyscallDesc("dup", dupFunc), /* 42 */ SyscallDesc("pipe", pipePseudoFunc), /* 43 */ SyscallDesc("osf_set_program_attributes", unimplementedFunc), /* 44 */ SyscallDesc("osf_profil", unimplementedFunc), diff --git a/src/sim/syscall_emul.cc b/src/sim/syscall_emul.cc index e72890612..cf90d8f84 100644 --- a/src/sim/syscall_emul.cc +++ b/src/sim/syscall_emul.cc @@ -300,6 +300,19 @@ fchownFunc(SyscallDesc *desc, int num, Process *process, ThreadContext *tc) } +SyscallReturn +dupFunc(SyscallDesc *desc, int num, Process *process, ThreadContext *tc) +{ + int fd = process->sim_fd(tc->getSyscallArg(0)); + + if (fd < 0) + return -EBADF; + + int result = dup(fd); + return (result == -1) ? -errno : process->alloc_fd(result); +} + + SyscallReturn fcntlFunc(SyscallDesc *desc, int num, Process *process, ThreadContext *tc) diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh index a3ff006ef..69ef31421 100644 --- a/src/sim/syscall_emul.hh +++ b/src/sim/syscall_emul.hh @@ -245,6 +245,10 @@ SyscallReturn chownFunc(SyscallDesc *desc, int num, SyscallReturn fchownFunc(SyscallDesc *desc, int num, Process *p, ThreadContext *tc); +/// Target dup() handler. +SyscallReturn dupFunc(SyscallDesc *desc, int num, + Process *process, ThreadContext *tc); + /// Target fnctl() handler. SyscallReturn fcntlFunc(SyscallDesc *desc, int num, Process *process, ThreadContext *tc);