X86: Distinguish the width of values on the stack between 32 and 64 bit processes.

1 files changed, 7 insertions, 24 deletions

diff --git a/src/arch/x86/linux/process.hh b/src/arch/x86/linux/process.hh
index e80b86537..2f37692e3 100644
--- a/src/arch/x86/linux/process.hh
+++ b/src/arch/x86/linux/process.hh
@@ -65,43 +65,26 @@
 
 namespace X86ISA {
 
-/// A process with emulated x86/Linux syscalls.
-class X86LinuxProcess : public X86LiveProcess
+class X86_64LinuxProcess : public X86_64LiveProcess
 {
   protected:
-    SyscallDesc *syscallDescs;
-
-    const int Num_Syscall_Descs;
-
-    /// Constructor.
-    X86LinuxProcess(LiveProcessParams * params, ObjectFile *objFile,
-            SyscallDesc *_syscallDescs, int numSyscallDescs) :
-        X86LiveProcess(params, objFile), syscallDescs(_syscallDescs),
-        Num_Syscall_Descs(numSyscallDescs)
-    {}
-
-  public:
-    SyscallDesc* getDesc(int callnum);
-};
+     /// Array of syscall descriptors, indexed by call number.
+    static SyscallDesc syscallDescs[];
 
-class X86_64LinuxProcess : public X86LinuxProcess
-{
   public:
     /// Constructor.
     X86_64LinuxProcess(LiveProcessParams * params, ObjectFile *objFile);
+};
 
+class I386LinuxProcess : public I386LiveProcess
+{
+  protected:
      /// Array of syscall descriptors, indexed by call number.
     static SyscallDesc syscallDescs[];
-};
 
-class I386LinuxProcess : public X86LinuxProcess
-{
   public:
     /// Constructor.
     I386LinuxProcess(LiveProcessParams * params, ObjectFile *objFile);
-
-     /// Array of syscall descriptors, indexed by call number.
-    static SyscallDesc syscallDescs[];
 };
 
 } // namespace X86ISA