Merge ARM into the head. ARM will compile but may not actually work.

1 files changed, 13 insertions, 9 deletions

diff --git a/src/arch/x86/linux/process.hh b/src/arch/x86/linux/process.hh
index e224374d4..ca3606ef0 100644
--- a/src/arch/x86/linux/process.hh
+++ b/src/arch/x86/linux/process.hh
@@ -60,26 +60,30 @@
 
 #include "sim/process.hh"
 #include "arch/x86/linux/linux.hh"
-#include "arch/x86/syscallreturn.hh"
 #include "arch/x86/process.hh"
 
 namespace X86ISA {
 
-/// A process with emulated x86/Linux syscalls.
-class X86LinuxProcess : public X86LiveProcess
+class X86_64LinuxProcess : public X86_64LiveProcess
 {
+  protected:
+     /// Array of syscall descriptors, indexed by call number.
+    static SyscallDesc syscallDescs[];
+
   public:
     /// Constructor.
-    X86LinuxProcess(LiveProcessParams * params, ObjectFile *objFile);
+    X86_64LinuxProcess(LiveProcessParams * params, ObjectFile *objFile);
+};
 
+class I386LinuxProcess : public I386LiveProcess
+{
+  protected:
      /// Array of syscall descriptors, indexed by call number.
     static SyscallDesc syscallDescs[];
 
-    SyscallDesc* getDesc(int callnum);
-
-    const int Num_Syscall_Descs;
-
-    void handleTrap(int trapNum, ThreadContext *tc);
+  public:
+    /// Constructor.
+    I386LinuxProcess(LiveProcessParams * params, ObjectFile *objFile);
 };
 
 } // namespace X86ISA