diff options
| author | Brandon Potter <brandon.potter@amd.com> | 2016-11-09 14:27:40 -0600 |
|---|---|---|
| committer | Brandon Potter <brandon.potter@amd.com> | 2016-11-09 14:27:40 -0600 |
| commit | 3886c4a8f2e1bfe17cbf7a5a76ba0fc978c6bb48 (patch) | |
| tree | 5a1ce6cbf42009fc9199c7ecfb068890ca74dbd4 /src/arch/x86/process.hh | |
| parent | 7b6cf951e2f0fa70d6599f1e1d03f664b674a75e (diff) | |
| download | gem5-3886c4a8f2e1bfe17cbf7a5a76ba0fc978c6bb48.tar.xz | |
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.
Diffstat (limited to 'src/arch/x86/process.hh')
| -rw-r--r-- | src/arch/x86/process.hh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/arch/x86/process.hh b/src/arch/x86/process.hh index ab513d839..34a275095 100644 --- a/src/arch/x86/process.hh +++ b/src/arch/x86/process.hh @@ -55,7 +55,7 @@ namespace X86ISA M5_AT_SYSINFO_EHDR = 33 }; - class X86LiveProcess : public LiveProcess + class X86Process : public Process { protected: Addr _gdtStart; @@ -64,8 +64,8 @@ namespace X86ISA SyscallDesc *syscallDescs; const int numSyscallDescs; - X86LiveProcess(LiveProcessParams * params, ObjectFile *objFile, - SyscallDesc *_syscallDescs, int _numSyscallDescs); + X86Process(ProcessParams * params, ObjectFile *objFile, + SyscallDesc *_syscallDescs, int _numSyscallDescs); template<class IntType> void argsInit(int pageSize, @@ -83,11 +83,11 @@ namespace X86ISA void setSyscallReturn(ThreadContext *tc, SyscallReturn return_value); }; - class X86_64LiveProcess : public X86LiveProcess + class X86_64Process : public X86Process { protected: - X86_64LiveProcess(LiveProcessParams *params, ObjectFile *objFile, - SyscallDesc *_syscallDescs, int _numSyscallDescs); + X86_64Process(ProcessParams *params, ObjectFile *objFile, + SyscallDesc *_syscallDescs, int _numSyscallDescs); class VSyscallPage { @@ -105,15 +105,15 @@ namespace X86ISA X86ISA::IntReg getSyscallArg(ThreadContext *tc, int &i); /// Explicitly import the otherwise hidden getSyscallArg - using LiveProcess::getSyscallArg; + using Process::getSyscallArg; void setSyscallArg(ThreadContext *tc, int i, X86ISA::IntReg val); }; - class I386LiveProcess : public X86LiveProcess + class I386Process : public X86Process { protected: - I386LiveProcess(LiveProcessParams *params, ObjectFile *objFile, - SyscallDesc *_syscallDescs, int _numSyscallDescs); + I386Process(ProcessParams *params, ObjectFile *objFile, + SyscallDesc *_syscallDescs, int _numSyscallDescs); class VSyscallPage { |