diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-03-09 15:56:42 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-03-09 15:56:42 -0500 |
| commit | 56cc760f6f53138c133c5d4e1f9d3e3199965d99 (patch) | |
| tree | 991271751791743eb9db33508fd3d183e61772be /arch/alpha/tru64/process.cc | |
| parent | 91545ac2bf5ac47ecbfc403ef6e2b2ce340ae551 (diff) | |
| parent | ce3a6343b6c54e95d63403d46c9ddea384e49476 (diff) | |
| download | gem5-56cc760f6f53138c133c5d4e1f9d3e3199965d99.tar.xz | |
Merge zizzer:/bk/multiarch
into zeep.eecs.umich.edu:/z/saidi/work/m5.ma2
arch/alpha/isa_traits.hh:
arch/alpha/linux/process.cc:
arch/sparc/isa_traits.hh:
arch/sparc/linux/process.cc:
sim/process.cc:
merge
--HG--
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision : fea0155c8e23abbd0d5d5251abbd0f4d223fe935
Diffstat (limited to 'arch/alpha/tru64/process.cc')
| -rw-r--r-- | arch/alpha/tru64/process.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/alpha/tru64/process.cc b/arch/alpha/tru64/process.cc index 3d9b2aeca..c3a203587 100644 --- a/arch/alpha/tru64/process.cc +++ b/arch/alpha/tru64/process.cc @@ -27,7 +27,6 @@ */ #include "arch/alpha/isa_traits.hh" -#include "arch/alpha/common_syscall_emul.hh" #include "arch/alpha/tru64/process.hh" #include "cpu/exec_context.hh" #include "kern/tru64/tru64.hh" @@ -179,11 +178,11 @@ SyscallDesc AlphaTru64Process::syscallDescs[] = { /* 17 */ SyscallDesc("obreak", obreakFunc), /* 18 */ SyscallDesc("pre_F64_getfsstat", unimplementedFunc), /* 19 */ SyscallDesc("lseek", lseekFunc), - /* 20 */ SyscallDesc("getpid", getpidFunc), + /* 20 */ SyscallDesc("getpid", getpidPseudoFunc), /* 21 */ SyscallDesc("mount", unimplementedFunc), /* 22 */ SyscallDesc("unmount", unimplementedFunc), /* 23 */ SyscallDesc("setuid", setuidFunc), - /* 24 */ SyscallDesc("getuid", getuidFunc), + /* 24 */ SyscallDesc("getuid", getuidPseudoFunc), /* 25 */ SyscallDesc("exec_with_loader", unimplementedFunc), /* 26 */ SyscallDesc("ptrace", unimplementedFunc), /* 27 */ SyscallDesc("recvmsg", unimplementedFunc), @@ -206,7 +205,7 @@ SyscallDesc AlphaTru64Process::syscallDescs[] = { /* 44 */ SyscallDesc("profil", unimplementedFunc), /* 45 */ SyscallDesc("open", openFunc<Tru64>), /* 46 */ SyscallDesc("obsolete osigaction", unimplementedFunc), - /* 47 */ SyscallDesc("getgid", getgidFunc), + /* 47 */ SyscallDesc("getgid", getgidPseudoFunc), /* 48 */ SyscallDesc("sigprocmask", ignoreFunc), /* 49 */ SyscallDesc("getlogin", unimplementedFunc), /* 50 */ SyscallDesc("setlogin", unimplementedFunc), |