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

1 files changed, 6 insertions, 24 deletions

diff --git a/src/arch/x86/linux/process.cc b/src/arch/x86/linux/process.cc
index 8beaf150b..da22d9851 100644
--- a/src/arch/x86/linux/process.cc
+++ b/src/arch/x86/linux/process.cc
@@ -64,34 +64,16 @@
 #include "kern/linux/linux.hh"
 
 #include "sim/process.hh"
-#include "sim/syscall_emul.hh"
 
 using namespace std;
 using namespace X86ISA;
 
-SyscallDesc*
-X86LinuxProcess::getDesc(int callnum)
-{
-    if (callnum < 0 || callnum > Num_Syscall_Descs)
-        return NULL;
-    return &syscallDescs[callnum];
-}
-
-X86LinuxProcess::X86LinuxProcess(LiveProcessParams * params,
+X86_64LinuxProcess::X86_64LinuxProcess(LiveProcessParams * params,
         ObjectFile *objFile)
-    : X86LiveProcess(params, objFile),
-    Num_Syscall_Descs(273)
+    : X86_64LiveProcess(params, objFile, syscallDescs, 273)
 {}
 
-void X86LinuxProcess::handleTrap(int trapNum, ThreadContext *tc)
-{
-    switch(trapNum)
-    {
-      //This implementation is from SPARC
-      case 0x10: //Linux 32 bit syscall trap
-        tc->syscall(tc->readIntReg(1));
-        break;
-      default:
-        X86LiveProcess::handleTrap(trapNum, tc);
-    }
-}
+I386LinuxProcess::I386LinuxProcess(LiveProcessParams * params,
+        ObjectFile *objFile)
+    : I386LiveProcess(params, objFile, syscallDescs, 324)
+{}