From: Gabe Black Date: Sat, 7 Dec 2019 11:23:18 +0000 (-0800) Subject: sim: Convert ftruncate64 to GuestABI. X-Git-Tag: v20.0.0.0~374 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0c00e7851603cbe93a08801fcb69e221866fb0f8;p=gem5.git sim: Convert ftruncate64 to GuestABI. This function was specifying a particular width to getSyscallArg. The new ISA specific ABIs now handle that automatically. Change-Id: I141655d3bcb78f56c2a9278d140dfbc0d69e1ff4 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23454 Reviewed-by: Bobby R. Bruce Maintainer: Gabe Black Tested-by: kokoro --- diff --git a/src/sim/syscall_emul.cc b/src/sim/syscall_emul.cc index 4ab472aaf..731cf247e 100644 --- a/src/sim/syscall_emul.cc +++ b/src/sim/syscall_emul.cc @@ -613,12 +613,10 @@ truncate64Func(SyscallDesc *desc, int num, ThreadContext *tc, } SyscallReturn -ftruncate64Func(SyscallDesc *desc, int num, ThreadContext *tc) +ftruncate64Func(SyscallDesc *desc, int num, ThreadContext *tc, + int tgt_fd, int64_t length) { - int index = 0; auto p = tc->getProcessPtr(); - int tgt_fd = p->getSyscallArg(tc, index); - int64_t length = p->getSyscallArg(tc, index, 64); auto ffdp = std::dynamic_pointer_cast((*p->fds)[tgt_fd]); if (!ffdp) diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh index 6be574ac8..74ffd761f 100644 --- a/src/sim/syscall_emul.hh +++ b/src/sim/syscall_emul.hh @@ -235,8 +235,8 @@ SyscallReturn truncate64Func(SyscallDesc *desc, int num, ThreadContext *tc, Addr pathname, int64_t length); /// Target ftruncate64() handler. -SyscallReturn ftruncate64Func(SyscallDesc *desc, int num, ThreadContext *tc); - +SyscallReturn ftruncate64Func(SyscallDesc *desc, int num, ThreadContext *tc, + int tgt_fd, int64_t length); /// Target umask() handler. SyscallReturn umaskFunc(SyscallDesc *desc, int num, ThreadContext *tc);