summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorMarc Orr <marc.orr@gmail.com>2012-08-06 19:52:56 -0700
committerMarc Orr <marc.orr@gmail.com>2012-08-06 19:52:56 -0700
commit7cef6b9befea7e4cc4138eb1b01d45dd777bd72f (patch)
tree0423fbf850dfb629b1f4d52fa56365bd136a55b8 /src/arch/x86
parentf4b424cd539eed26de18e81fd9d433cd6ae6295b (diff)
downloadgem5-7cef6b9befea7e4cc4138eb1b01d45dd777bd72f.tar.xz
syscall emulation: Enabled getrlimit and getrusage for x86.
Added/moved rlimit constants to base linux header file. This patch is a revised version of Vince Weaver's earlier patch.
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/linux/syscalls.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/x86/linux/syscalls.cc b/src/arch/x86/linux/syscalls.cc
index 322868ee1..4319ff9a8 100644
--- a/src/arch/x86/linux/syscalls.cc
+++ b/src/arch/x86/linux/syscalls.cc
@@ -310,8 +310,8 @@ SyscallDesc X86_64LinuxProcess::syscallDescs[] = {
/* 94 */ SyscallDesc("lchown", unimplementedFunc),
/* 95 */ SyscallDesc("umask", unimplementedFunc),
/* 96 */ SyscallDesc("gettimeofday", unimplementedFunc),
- /* 97 */ SyscallDesc("getrlimit", unimplementedFunc),
- /* 98 */ SyscallDesc("getrusage", unimplementedFunc),
+ /* 97 */ SyscallDesc("getrlimit", getrlimitFunc<X86Linux64>),
+ /* 98 */ SyscallDesc("getrusage", getrusageFunc<X86Linux64>),
/* 99 */ SyscallDesc("sysinfo", sysinfoFunc<X86Linux64>),
/* 100 */ SyscallDesc("times", timesFunc<X86Linux64>),
/* 101 */ SyscallDesc("ptrace", unimplementedFunc),
@@ -568,8 +568,8 @@ SyscallDesc I386LinuxProcess::syscallDescs[] = {
/* 73 */ SyscallDesc("sigpending", unimplementedFunc),
/* 74 */ SyscallDesc("sethostname", unimplementedFunc),
/* 75 */ SyscallDesc("setrlimit", ignoreFunc),
- /* 76 */ SyscallDesc("getrlimit", unimplementedFunc),
- /* 77 */ SyscallDesc("getrusage", unimplementedFunc),
+ /* 76 */ SyscallDesc("getrlimit", getrlimitFunc<X86Linux32>),
+ /* 77 */ SyscallDesc("getrusage", getrusageFunc<X86Linux32>),
/* 78 */ SyscallDesc("gettimeofday", unimplementedFunc),
/* 79 */ SyscallDesc("settimeofday", unimplementedFunc),
/* 80 */ SyscallDesc("getgroups", unimplementedFunc),