From 3886c4a8f2e1bfe17cbf7a5a76ba0fc978c6bb48 Mon Sep 17 00:00:00 2001 From: Brandon Potter Date: Wed, 9 Nov 2016 14:27:40 -0600 Subject: syscall_emul: [patch 5/22] remove LiveProcess class and use Process instead The EIOProcess class was removed recently and it was the only other class which derived from Process. Since every Process invocation is also a LiveProcess invocation, it makes sense to simplify the organization by combining the fields from LiveProcess into Process. --- src/gpu-compute/cl_driver.cc | 4 ++-- src/gpu-compute/cl_driver.hh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gpu-compute') diff --git a/src/gpu-compute/cl_driver.cc b/src/gpu-compute/cl_driver.cc index d6d1b1334..41ae3ab9a 100644 --- a/src/gpu-compute/cl_driver.cc +++ b/src/gpu-compute/cl_driver.cc @@ -91,7 +91,7 @@ ClDriver::handshake(GpuDispatcher *_dispatcher) } int -ClDriver::open(LiveProcess *p, ThreadContext *tc, int mode, int flags) +ClDriver::open(Process *p, ThreadContext *tc, int mode, int flags) { int fd = p->allocFD(-1, filename, 0, 0, false); FDEntry *fde = p->getFDEntry(fd); @@ -101,7 +101,7 @@ ClDriver::open(LiveProcess *p, ThreadContext *tc, int mode, int flags) } int -ClDriver::ioctl(LiveProcess *process, ThreadContext *tc, unsigned req) +ClDriver::ioctl(Process *process, ThreadContext *tc, unsigned req) { int index = 2; Addr buf_addr = process->getSyscallArg(tc, index); diff --git a/src/gpu-compute/cl_driver.hh b/src/gpu-compute/cl_driver.hh index 03567bab5..595aa029a 100644 --- a/src/gpu-compute/cl_driver.hh +++ b/src/gpu-compute/cl_driver.hh @@ -43,7 +43,7 @@ class GpuDispatcher; class HsaCode; -class LiveProcess; +class Process; class ThreadContext; struct ClDriverParams; @@ -53,8 +53,8 @@ class ClDriver final : public EmulatedDriver public: ClDriver(ClDriverParams *p); void handshake(GpuDispatcher *_dispatcher); - int open(LiveProcess *p, ThreadContext *tc, int mode, int flags); - int ioctl(LiveProcess *p, ThreadContext *tc, unsigned req); + int open(Process *p, ThreadContext *tc, int mode, int flags); + int ioctl(Process *p, ThreadContext *tc, unsigned req); const char* codeOffToKernelName(uint64_t code_ptr); private: -- cgit v1.2.3