Get X86 to load an elf and start a process for it.

src/arch/x86/SConscript:
    Add in process source files.
src/arch/x86/isa_traits.hh:
    Replace magic constant numbers with the x86 register names.
src/arch/x86/miscregfile.cc:
    Make clear the miscreg file succeed. There aren't any misc regs, so clearing them is very easy.
src/arch/x86/process.hh:
    An X86 process class.
src/base/loader/elf_object.cc:
    Add in code to recognize x86 as an architecture.
src/base/traceflags.py:
    Add an x86 traceflag
src/sim/process.cc:
    Add in code to create an x86 process.
src/arch/x86/intregs.hh:
    A file which declares names for the integer register indices.
src/arch/x86/linux/linux.cc:
src/arch/x86/linux/linux.hh:
    A very simple translation of SPARC's linux.cc and linux.hh. It's probably not correct for x86, but it might not be correct for SPARC either.
src/arch/x86/linux/process.cc:
src/arch/x86/linux/process.hh:
    An x86 linux process. The syscall table is split out into it's own file.
src/arch/x86/linux/syscalls.cc:
    The x86 Linux syscall table and the uname function.
src/arch/x86/process.cc:
    The x86 process base class.
tests/test-progs/hello/bin/x86/linux/hello:
    An x86 hello world test binary.

--HG--
extra : convert_revision : f22919e010c07aeaf5757dca054d9877a537fd08

15 files changed, 1281 insertions, 18 deletions

diff --git a/src/arch/x86/SConscript b/src/arch/x86/SConscript
index 36ead852d..fff29ba89 100644
--- a/src/arch/x86/SConscript
+++ b/src/arch/x86/SConscript
@@ -111,6 +111,10 @@ full_system_sources = Split('''
 
 # Syscall emulation (non-full-system) sources
 syscall_emulation_sources = Split('''
+	linux/linux.cc
+	linux/process.cc
+	linux/syscalls.cc
+	process.cc
 	''')
 
 sources = base_sources
diff --git a/src/arch/x86/intregs.hh b/src/arch/x86/intregs.hh
new file mode 100644
index 000000000..3fe25bd5f
--- /dev/null
+++ b/src/arch/x86/intregs.hh
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2007 The Hewlett-Packard Development Company
+ * All rights reserved.
+ *
+ * Redistribution and use of this software in source and binary forms,
+ * with or without modification, are permitted provided that the
+ * following conditions are met:
+ *
+ * The software must be used only for Non-Commercial Use which means any
+ * use which is NOT directed to receiving any direct monetary
+ * compensation for, or commercial advantage from such use.  Illustrative
+ * examples of non-commercial use are academic research, personal study,
+ * teaching, education and corporate research & development.
+ * Illustrative examples of commercial use are distributing products for
+ * commercial advantage and providing services using the software for
+ * commercial advantage.
+ *
+ * If you wish to use this software or functionality therein that may be
+ * covered by patents for commercial use, please contact:
+ *     Director of Intellectual Property Licensing
+ *     Office of Strategy and Technology
+ *     Hewlett-Packard Company
+ *     1501 Page Mill Road
+ *     Palo Alto, California  94304
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.  Redistributions
+ * in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.  Neither the name of
+ * the COPYRIGHT HOLDER(s), HEWLETT-PACKARD COMPANY, nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.  No right of
+ * sublicense is granted herewith.  Derivatives of the software and
+ * output created using the software may be prepared, but only for
+ * Non-Commercial Uses.  Derivatives of the software may be shared with
+ * others provided: (i) the others agree to abide by the list of
+ * conditions herein which includes the Non-Commercial Use restrictions;
+ * and (ii) such Derivatives of the software include the above copyright
+ * notice to acknowledge the contribution from this software where
+ * applicable, this list of conditions and the disclaimer below.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Gabe Black
+ */
+
+#ifndef __ARCH_X86_INTREGS_HH__
+#define __ARCH_X86_INTREGS_HH__
+
+namespace X86ISA
+{
+    enum IntRegIndex
+    {
+        INTREG_RAX,
+        INTREG_RCX,
+        INTREG_RDX,
+        INTREG_RBX,
+        INTREG_RSP,
+        INTREG_RBP,
+        INTREG_RSI,
+        INTREG_RDI,
+        INTREG_R8W,
+        INTREG_R9W,
+        INTREG_R10W,
+        INTREG_R11W,
+        INTREG_R12W,
+        INTREG_R13W,
+        INTREG_R14W,
+        INTREG_R15W
+    };
+};
+
+#endif // __ARCH_X86_INTERRUPTS_HH__
diff --git a/src/arch/x86/isa_traits.hh b/src/arch/x86/isa_traits.hh
index d5da8b420..5a625f741 100644
--- a/src/arch/x86/isa_traits.hh
+++ b/src/arch/x86/isa_traits.hh
@@ -58,6 +58,7 @@
 #ifndef __ARCH_X86_ISATRAITS_HH__
 #define __ARCH_X86_ISATRAITS_HH__
 
+#include "arch/x86/intregs.hh"
 #include "arch/x86/types.hh"
 #include "arch/x86/x86_traits.hh"
 
@@ -93,21 +94,21 @@ namespace X86ISA
     // semantically meaningful register indices
     //There is no such register in X86
     const int ZeroReg = 0;
-    const int StackPointerReg = 4; //RSP
+    const int StackPointerReg = INTREG_RSP;
     //X86 doesn't seem to have a link register
     const int ReturnAddressReg = 0;
-    const int ReturnValueReg = 0; //RAX
-    const int FramePointerReg = 5; //RBP
-    const int ArgumentReg0 = 7; //RDI
-    const int ArgumentReg1 = 6; //RSI
-    const int ArgumentReg2 = 2; //RDX
-    const int ArgumentReg3 = 1; //RCX
-    const int ArgumentReg4 = 8; //R8W
-    const int ArgumentReg5 = 9; //R9W
+    const int ReturnValueReg = INTREG_RAX;
+    const int FramePointerReg = INTREG_RBP;
+    const int ArgumentReg0 = INTREG_RDI;
+    const int ArgumentReg1 = INTREG_RSI;
+    const int ArgumentReg2 = INTREG_RDX;
+    const int ArgumentReg3 = INTREG_RCX;
+    const int ArgumentReg4 = INTREG_R8W;
+    const int ArgumentReg5 = INTREG_R9W;
 
     // Some OS syscalls use a second register (rdx) to return a second
     // value
-    const int SyscallPseudoReturnReg = 2; //RDX
+    const int SyscallPseudoReturnReg = INTREG_RDX;
 
     //XXX These numbers are bogus
     const int MaxInstSrcRegs = 10;
diff --git a/src/arch/x86/linux/linux.cc b/src/arch/x86/linux/linux.cc
new file mode 100644
index 000000000..59754d7b3
--- /dev/null
+++ b/src/arch/x86/linux/linux.cc
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2007 The Hewlett-Packard Development Company
+ * All rights reserved.
+ *
+ * Redistribution and use of this software in source and binary forms,
+ * with or without modification, are permitted provided that the
+ * following conditions are met:
+ *
+ * The software must be used only for Non-Commercial Use which means any
+ * use which is NOT directed to receiving any direct monetary
+ * compensation for, or commercial advantage from such use.  Illustrative
+ * examples of non-commercial use are academic research, personal study,
+ * teaching, education and corporate research & development.
+ * Illustrative examples of commercial use are distributing products for
+ * commercial advantage and providing services using the software for
+ * commercial advantage.
+ *
+ * If you wish to use this software or functionality therein that may be
+ * covered by patents for commercial use, please contact:
+ *     Director of Intellectual Property Licensing
+ *     Office of Strategy and Technology
+ *     Hewlett-Packard Company
+ *     1501 Page Mill Road
+ *     Palo Alto, California  94304
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.  Redistributions
+ * in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.  Neither the name of
+ * the COPYRIGHT HOLDER(s), HEWLETT-PACKARD COMPANY, nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.  No right of
+ * sublicense is granted herewith.  Derivatives of the software and
+ * output created using the software may be prepared, but only for
+ * Non-Commercial Uses.  Derivatives of the software may be shared with
+ * others provided: (i) the others agree to abide by the list of
+ * conditions herein which includes the Non-Commercial Use restrictions;
+ * and (ii) such Derivatives of the software include the above copyright
+ * notice to acknowledge the contribution from this software where
+ * applicable, this list of conditions and the disclaimer below.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Gabe Black
+ */
+
+#include "arch/x86/linux/linux.hh"
+#include <fcntl.h>
+
+// open(2) flags translation table
+OpenFlagTransTable X86Linux::openFlagTable[] = {
+#ifdef _MSC_VER
+  { TGT_O_RDONLY, _O_RDONLY },
+  { TGT_O_WRONLY, _O_WRONLY },
+  { TGT_O_RDWR, _O_RDWR },
+  { TGT_O_APPEND, _O_APPEND },
+  { TGT_O_CREAT, _O_CREAT },
+  { TGT_O_TRUNC, _O_TRUNC },
+  { TGT_O_EXCL, _O_EXCL },
+#ifdef _O_NONBLOCK
+  { TGT_O_NONBLOCK, _O_NONBLOCK },
+#endif
+#ifdef _O_NOCTTY
+  { TGT_O_NOCTTY, _O_NOCTTY },
+#endif
+#ifdef _O_SYNC
+  { TGT_O_SYNC, _O_SYNC },
+#endif
+#else /* !_MSC_VER */
+  { TGT_O_RDONLY, O_RDONLY },
+  { TGT_O_WRONLY, O_WRONLY },
+  { TGT_O_RDWR, O_RDWR },
+  { TGT_O_APPEND, O_APPEND },
+  { TGT_O_CREAT, O_CREAT },
+  { TGT_O_TRUNC, O_TRUNC },
+  { TGT_O_EXCL, O_EXCL },
+  { TGT_O_NONBLOCK, O_NONBLOCK },
+  { TGT_O_NOCTTY, O_NOCTTY },
+#ifdef O_SYNC
+  { TGT_O_SYNC, O_SYNC },
+#endif
+#endif /* _MSC_VER */
+};
+
+const int X86Linux::NUM_OPEN_FLAGS =
+        (sizeof(X86Linux::openFlagTable)/sizeof(X86Linux::openFlagTable[0]));
+
diff --git a/src/arch/x86/linux/linux.hh b/src/arch/x86/linux/linux.hh
new file mode 100644
index 000000000..a276d4c0c
--- /dev/null
+++ b/src/arch/x86/linux/linux.hh
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2007 The Hewlett-Packard Development Company
+ * All rights reserved.
+ *
+ * Redistribution and use of this software in source and binary forms,
+ * with or without modification, are permitted provided that the
+ * following conditions are met:
+ *
+ * The software must be used only for Non-Commercial Use which means any
+ * use which is NOT directed to receiving any direct monetary
+ * compensation for, or commercial advantage from such use.  Illustrative
+ * examples of non-commercial use are academic research, personal study,
+ * teaching, education and corporate research & development.
+ * Illustrative examples of commercial use are distributing products for
+ * commercial advantage and providing services using the software for
+ * commercial advantage.
+ *
+ * If you wish to use this software or functionality therein that may be
+ * covered by patents for commercial use, please contact:
+ *     Director of Intellectual Property Licensing
+ *     Office of Strategy and Technology
+ *     Hewlett-Packard Company
+ *     1501 Page Mill Road
+ *     Palo Alto, California  94304
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.  Redistributions
+ * in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.  Neither the name of
+ * the COPYRIGHT HOLDER(s), HEWLETT-PACKARD COMPANY, nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.  No right of
+ * sublicense is granted herewith.  Derivatives of the software and
+ * output created using the software may be prepared, but only for
+ * Non-Commercial Uses.  Derivatives of the software may be shared with
+ * others provided: (i) the others agree to abide by the list of
+ * conditions herein which includes the Non-Commercial Use restrictions;
+ * and (ii) such Derivatives of the software include the above copyright
+ * notice to acknowledge the contribution from this software where
+ * applicable, this list of conditions and the disclaimer below.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Gabe Black
+ */
+
+#ifndef __ARCH_X86_LINUX_LINUX_HH__
+#define __ARCH_X86_LINUX_LINUX_HH__
+
+#include "kern/linux/linux.hh"
+
+class X86Linux : public Linux
+{
+  public:
+
+    typedef struct {
+        uint32_t st_dev;
+        char __pad1[4];
+        uint64_t st_ino;
+        uint32_t st_mode;
+        uint16_t st_nlink;
+        uint32_t st_uid;
+        uint32_t st_gid;
+        uint32_t st_rdev;
+        char __pad2[4];
+        int64_t st_size;
+        int64_t st_atimeX;
+        int64_t st_mtimeX;
+        int64_t st_ctimeX;
+        int64_t st_blksize;
+        int64_t st_blocks;
+        uint64_t __unused4[2];
+    } tgt_stat;
+
+    static OpenFlagTransTable openFlagTable[];
+
+    static const int TGT_O_RDONLY	= 0x00000000;	//!< O_RDONLY
+    static const int TGT_O_WRONLY	= 0x00000001;	//!< O_WRONLY
+    static const int TGT_O_RDWR	        = 0x00000002;	//!< O_RDWR
+    static const int TGT_O_NONBLOCK     = 0x00004000;	//!< O_NONBLOCK
+    static const int TGT_O_APPEND	= 0x00000008;	//!< O_APPEND
+    static const int TGT_O_CREAT	= 0x00000200;	//!< O_CREAT
+    static const int TGT_O_TRUNC	= 0x00000400;	//!< O_TRUNC
+    static const int TGT_O_EXCL	        = 0x00000800;	//!< O_EXCL
+    static const int TGT_O_NOCTTY	= 0x00008000;	//!< O_NOCTTY
+    static const int TGT_O_SYNC	        = 0x00002000;	//!< O_SYNC
+//    static const int TGT_O_DRD	        = 0x00010000;	//!< O_DRD
+//    static const int TGT_O_DIRECTIO     = 0x00020000;	//!< O_DIRECTIO
+//    static const int TGT_O_CACHE	= 0x00002000;	//!< O_CACHE
+//    static const int TGT_O_DSYNC	= 0x00008000;	//!< O_DSYNC
+//    static const int TGT_O_RSYNC	= 0x00040000;	//!< O_RSYNC
+
+    static const int NUM_OPEN_FLAGS;
+
+    static const unsigned TGT_MAP_ANONYMOUS = 0x20;
+};
+
+#endif
diff --git a/src/arch/x86/linux/process.cc b/src/arch/x86/linux/process.cc
new file mode 100644
index 000000000..9ef591a1c
--- /dev/null
+++ b/src/arch/x86/linux/process.cc
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2007 The Hewlett-Packard Development Company
+ * All rights reserved.
+ *
+ * Redistribution and use of this software in source and binary forms,
+ * with or without modification, are permitted provided that the
+ * following conditions are met:
+ *
+ * The software must be used only for Non-Commercial Use which means any
+ * use which is NOT directed to receiving any direct monetary
+ * compensation for, or commercial advantage from such use.  Illustrative
+ * examples of non-commercial use are academic research, personal study,
+ * teaching, education and corporate research & development.
+ * Illustrative examples of commercial use are distributing products for
+ * commercial advantage and providing services using the software for
+ * commercial advantage.
+ *
+ * If you wish to use this software or functionality therein that may be
+ * covered by patents for commercial use, please contact:
+ *     Director of Intellectual Property Licensing
+ *     Office of Strategy and Technology
+ *     Hewlett-Packard Company
+ *     1501 Page Mill Road
+ *     Palo Alto, California  94304
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.  Redistributions
+ * in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.  Neither the name of
+ * the COPYRIGHT HOLDER(s), HEWLETT-PACKARD COMPANY, nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.  No right of
+ * sublicense is granted herewith.  Derivatives of the software and
+ * output created using the software may be prepared, but only for
+ * Non-Commercial Uses.  Derivatives of the software may be shared with
+ * others provided: (i) the others agree to abide by the list of
+ * conditions herein which includes the Non-Commercial Use restrictions;
+ * and (ii) such Derivatives of the software include the above copyright
+ * notice to acknowledge the contribution from this software where
+ * applicable, this list of conditions and the disclaimer below.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Gabe Black
+ */
+
+#include "arch/x86/isa_traits.hh"
+#include "arch/x86/linux/process.hh"
+#include "arch/x86/regfile.hh"
+
+#include "base/trace.hh"
+#include "cpu/thread_context.hh"
+#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(const std::string &name,
+                                       ObjectFile *objFile,
+                                       System * system,
+                                       int stdin_fd,
+                                       int stdout_fd,
+                                       int stderr_fd,
+                                       std::vector<std::string> &argv,
+                                       std::vector<std::string> &envp,
+                                       const std::string &cwd,
+                                       uint64_t _uid, uint64_t _euid,
+                                       uint64_t _gid, uint64_t _egid,
+                                       uint64_t _pid, uint64_t _ppid)
+    : X86LiveProcess(name, objFile, system,
+            stdin_fd, stdout_fd, stderr_fd, argv, envp, cwd,
+            _uid, _euid, _gid, _egid, _pid, _ppid),
+    Num_Syscall_Descs(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);
+    }
+}
diff --git a/src/arch/x86/linux/process.hh b/src/arch/x86/linux/process.hh
new file mode 100644
index 000000000..7e7236f0d
--- /dev/null
+++ b/src/arch/x86/linux/process.hh
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2007 The Hewlett-Packard Development Company
+ * All rights reserved.
+ *
+ * Redistribution and use of this software in source and binary forms,
+ * with or without modification, are permitted provided that the
+ * following conditions are met:
+ *
+ * The software must be used only for Non-Commercial Use which means any
+ * use which is NOT directed to receiving any direct monetary
+ * compensation for, or commercial advantage from such use.  Illustrative
+ * examples of non-commercial use are academic research, personal study,
+ * teaching, education and corporate research & development.
+ * Illustrative examples of commercial use are distributing products for
+ * commercial advantage and providing services using the software for
+ * commercial advantage.
+ *
+ * If you wish to use this software or functionality therein that may be
+ * covered by patents for commercial use, please contact:
+ *     Director of Intellectual Property Licensing
+ *     Office of Strategy and Technology
+ *     Hewlett-Packard Company
+ *     1501 Page Mill Road
+ *     Palo Alto, California  94304
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.  Redistributions
+ * in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.  Neither the name of
+ * the COPYRIGHT HOLDER(s), HEWLETT-PACKARD COMPANY, nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.  No right of
+ * sublicense is granted herewith.  Derivatives of the software and
+ * output created using the software may be prepared, but only for
+ * Non-Commercial Uses.  Derivatives of the software may be shared with
+ * others provided: (i) the others agree to abide by the list of
+ * conditions herein which includes the Non-Commercial Use restrictions;
+ * and (ii) such Derivatives of the software include the above copyright
+ * notice to acknowledge the contribution from this software where
+ * applicable, this list of conditions and the disclaimer below.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Gabe Black
+ */
+
+#ifndef __X86_LINUX_PROCESS_HH__
+#define __X86_LINUX_PROCESS_HH__
+
+#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
+{
+  public:
+    /// Constructor.
+    X86LinuxProcess(const std::string &name,
+                      ObjectFile *objFile,
+                      System * system,
+                      int stdin_fd, int stdout_fd, int stderr_fd,
+                      std::vector<std::string> &argv,
+                      std::vector<std::string> &envp,
+                      const std::string &cwd,
+                      uint64_t _uid, uint64_t _euid,
+                      uint64_t _gid, uint64_t _egid,
+                      uint64_t _pid, uint64_t _ppid);
+
+     /// 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);
+};
+
+} // namespace X86ISA
+#endif // __X86_LINUX_PROCESS_HH__
diff --git a/src/arch/x86/linux/syscalls.cc b/src/arch/x86/linux/syscalls.cc
new file mode 100644
index 000000000..809784635
--- /dev/null
+++ b/src/arch/x86/linux/syscalls.cc
@@ -0,0 +1,356 @@
+/*
+ * Copyright (c) 2007 The Hewlett-Packard Development Company
+ * All rights reserved.
+ *
+ * Redistribution and use of this software in source and binary forms,
+ * with or without modification, are permitted provided that the
+ * following conditions are met:
+ *
+ * The software must be used only for Non-Commercial Use which means any
+ * use which is NOT directed to receiving any direct monetary
+ * compensation for, or commercial advantage from such use.  Illustrative
+ * examples of non-commercial use are academic research, personal study,
+ * teaching, education and corporate research & development.
+ * Illustrative examples of commercial use are distributing products for
+ * commercial advantage and providing services using the software for
+ * commercial advantage.
+ *
+ * If you wish to use this software or functionality therein that may be
+ * covered by patents for commercial use, please contact:
+ *     Director of Intellectual Property Licensing
+ *     Office of Strategy and Technology
+ *     Hewlett-Packard Company
+ *     1501 Page Mill Road
+ *     Palo Alto, California  94304
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.  Redistributions
+ * in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.  Neither the name of
+ * the COPYRIGHT HOLDER(s), HEWLETT-PACKARD COMPANY, nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.  No right of
+ * sublicense is granted herewith.  Derivatives of the software and
+ * output created using the software may be prepared, but only for
+ * Non-Commercial Uses.  Derivatives of the software may be shared with
+ * others provided: (i) the others agree to abide by the list of
+ * conditions herein which includes the Non-Commercial Use restrictions;
+ * and (ii) such Derivatives of the software include the above copyright
+ * notice to acknowledge the contribution from this software where
+ * applicable, this list of conditions and the disclaimer below.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Gabe Black
+ */
+
+#include "arch/x86/linux/process.hh"
+#include "kern/linux/linux.hh"
+#include "sim/syscall_emul.hh"
+
+using namespace X86ISA;
+
+/// Target uname() handler.
+static SyscallReturn
+unameFunc(SyscallDesc *desc, int callnum, LiveProcess *process,
+          ThreadContext *tc)
+{
+    TypedBufferArg<Linux::utsname> name(tc->getSyscallArg(0));
+
+    strcpy(name->sysname, "Linux");
+    strcpy(name->nodename, "m5.eecs.umich.edu");
+    strcpy(name->release, "2.6.12");
+    strcpy(name->version, "#1 Mon Aug 18 11:32:15 EDT 2003");
+    strcpy(name->machine, "x86_64");
+
+    name.copyOut(tc->getMemPort());
+
+    return 0;
+}
+
+SyscallDesc X86LinuxProcess::syscallDescs[] = {
+    /*   0 */ SyscallDesc("read", unimplementedFunc),
+    /*   1 */ SyscallDesc("write", unimplementedFunc),
+    /*   2 */ SyscallDesc("open", unimplementedFunc),
+    /*   3 */ SyscallDesc("close", unimplementedFunc),
+    /*   4 */ SyscallDesc("stat", unimplementedFunc),
+    /*   5 */ SyscallDesc("fstat", unimplementedFunc),
+    /*   6 */ SyscallDesc("lstat", unimplementedFunc),
+    /*   7 */ SyscallDesc("poll", unimplementedFunc),
+    /*   8 */ SyscallDesc("lseek", unimplementedFunc),
+    /*   9 */ SyscallDesc("mmap", unimplementedFunc),
+    /*  10 */ SyscallDesc("mprotect", unimplementedFunc),
+    /*  11 */ SyscallDesc("munmap", unimplementedFunc),
+    /*  12 */ SyscallDesc("brk", unimplementedFunc),
+    /*  13 */ SyscallDesc("rt_sigaction", unimplementedFunc),
+    /*  14 */ SyscallDesc("rt_sigprocmask", unimplementedFunc),
+    /*  15 */ SyscallDesc("rt_sigreturn", unimplementedFunc),
+    /*  16 */ SyscallDesc("ioctl", unimplementedFunc),
+    /*  17 */ SyscallDesc("pread64", unimplementedFunc),
+    /*  18 */ SyscallDesc("pwrite64", unimplementedFunc),
+    /*  19 */ SyscallDesc("readv", unimplementedFunc),
+    /*  20 */ SyscallDesc("writev", unimplementedFunc),
+    /*  21 */ SyscallDesc("access", unimplementedFunc),
+    /*  22 */ SyscallDesc("pipe", unimplementedFunc),
+    /*  23 */ SyscallDesc("select", unimplementedFunc),
+    /*  24 */ SyscallDesc("sched_yield", unimplementedFunc),
+    /*  25 */ SyscallDesc("mremap", unimplementedFunc),
+    /*  26 */ SyscallDesc("msync", unimplementedFunc),
+    /*  27 */ SyscallDesc("mincore", unimplementedFunc),
+    /*  28 */ SyscallDesc("madvise", unimplementedFunc),
+    /*  29 */ SyscallDesc("shmget", unimplementedFunc),
+    /*  30 */ SyscallDesc("shmat", unimplementedFunc),
+    /*  31 */ SyscallDesc("shmctl", unimplementedFunc),
+    /*  32 */ SyscallDesc("dup", unimplementedFunc),
+    /*  33 */ SyscallDesc("dup2", unimplementedFunc),
+    /*  34 */ SyscallDesc("pause", unimplementedFunc),
+    /*  35 */ SyscallDesc("nanosleep", unimplementedFunc),
+    /*  36 */ SyscallDesc("getitimer", unimplementedFunc),
+    /*  37 */ SyscallDesc("alarm", unimplementedFunc),
+    /*  38 */ SyscallDesc("setitimer", unimplementedFunc),
+    /*  39 */ SyscallDesc("getpid", unimplementedFunc),
+    /*  40 */ SyscallDesc("sendfile", unimplementedFunc),
+    /*  41 */ SyscallDesc("socket", unimplementedFunc),
+    /*  42 */ SyscallDesc("connect", unimplementedFunc),
+    /*  43 */ SyscallDesc("accept", unimplementedFunc),
+    /*  44 */ SyscallDesc("sendto", unimplementedFunc),
+    /*  45 */ SyscallDesc("recvfrom", unimplementedFunc),
+    /*  46 */ SyscallDesc("sendmsg", unimplementedFunc),
+    /*  47 */ SyscallDesc("recvmsg", unimplementedFunc),
+    /*  48 */ SyscallDesc("shutdown", unimplementedFunc),
+    /*  49 */ SyscallDesc("bind", unimplementedFunc),
+    /*  50 */ SyscallDesc("listen", unimplementedFunc),
+    /*  51 */ SyscallDesc("getsockname", unimplementedFunc),
+    /*  52 */ SyscallDesc("getpeername", unimplementedFunc),
+    /*  53 */ SyscallDesc("socketpair", unimplementedFunc),
+    /*  54 */ SyscallDesc("setsockopt", unimplementedFunc),
+    /*  55 */ SyscallDesc("getsockopt", unimplementedFunc),
+    /*  56 */ SyscallDesc("clone", unimplementedFunc),
+    /*  57 */ SyscallDesc("fork", unimplementedFunc),
+    /*  58 */ SyscallDesc("vfork", unimplementedFunc),
+    /*  59 */ SyscallDesc("execve", unimplementedFunc),
+    /*  60 */ SyscallDesc("exit", unimplementedFunc),
+    /*  61 */ SyscallDesc("wait4", unimplementedFunc),
+    /*  62 */ SyscallDesc("kill", unimplementedFunc),
+    /*  63 */ SyscallDesc("uname", unameFunc),
+    /*  64 */ SyscallDesc("semget", unimplementedFunc),
+    /*  65 */ SyscallDesc("semop", unimplementedFunc),
+    /*  66 */ SyscallDesc("semctl", unimplementedFunc),
+    /*  67 */ SyscallDesc("shmdt", unimplementedFunc),
+    /*  68 */ SyscallDesc("msgget", unimplementedFunc),
+    /*  69 */ SyscallDesc("msgsnd", unimplementedFunc),
+    /*  70 */ SyscallDesc("msgrcv", unimplementedFunc),
+    /*  71 */ SyscallDesc("msgctl", unimplementedFunc),
+    /*  72 */ SyscallDesc("fcntl", unimplementedFunc),
+    /*  73 */ SyscallDesc("flock", unimplementedFunc),
+    /*  74 */ SyscallDesc("fsync", unimplementedFunc),
+    /*  75 */ SyscallDesc("fdatasync", unimplementedFunc),
+    /*  76 */ SyscallDesc("truncate", unimplementedFunc),
+    /*  77 */ SyscallDesc("ftruncate", unimplementedFunc),
+    /*  78 */ SyscallDesc("getdents", unimplementedFunc),
+    /*  79 */ SyscallDesc("getcwd", unimplementedFunc),
+    /*  80 */ SyscallDesc("chdir", unimplementedFunc),
+    /*  81 */ SyscallDesc("fchdir", unimplementedFunc),
+    /*  82 */ SyscallDesc("rename", unimplementedFunc),
+    /*  83 */ SyscallDesc("mkdir", unimplementedFunc),
+    /*  84 */ SyscallDesc("rmdir", unimplementedFunc),
+    /*  85 */ SyscallDesc("creat", unimplementedFunc),
+    /*  86 */ SyscallDesc("link", unimplementedFunc),
+    /*  87 */ SyscallDesc("unlink", unimplementedFunc),
+    /*  88 */ SyscallDesc("symlink", unimplementedFunc),
+    /*  89 */ SyscallDesc("readlink", unimplementedFunc),
+    /*  90 */ SyscallDesc("chmod", unimplementedFunc),
+    /*  91 */ SyscallDesc("fchmod", unimplementedFunc),
+    /*  92 */ SyscallDesc("chown", unimplementedFunc),
+    /*  93 */ SyscallDesc("fchown", unimplementedFunc),
+    /*  94 */ SyscallDesc("lchown", unimplementedFunc),
+    /*  95 */ SyscallDesc("umask", unimplementedFunc),
+    /*  96 */ SyscallDesc("gettimeofday", unimplementedFunc),
+    /*  97 */ SyscallDesc("getrlimit", unimplementedFunc),
+    /*  98 */ SyscallDesc("getrusage", unimplementedFunc),
+    /*  99 */ SyscallDesc("sysinfo", unimplementedFunc),
+    /* 100 */ SyscallDesc("times", unimplementedFunc),
+    /* 101 */ SyscallDesc("ptrace", unimplementedFunc),
+    /* 102 */ SyscallDesc("getuid", unimplementedFunc),
+    /* 103 */ SyscallDesc("syslog", unimplementedFunc),
+    /* 104 */ SyscallDesc("getgid", unimplementedFunc),
+    /* 105 */ SyscallDesc("setuid", unimplementedFunc),
+    /* 106 */ SyscallDesc("setgid", unimplementedFunc),
+    /* 107 */ SyscallDesc("geteuid", unimplementedFunc),
+    /* 108 */ SyscallDesc("getegid", unimplementedFunc),
+    /* 109 */ SyscallDesc("setpgid", unimplementedFunc),
+    /* 110 */ SyscallDesc("getppid", unimplementedFunc),
+    /* 111 */ SyscallDesc("getpgrp", unimplementedFunc),
+    /* 112 */ SyscallDesc("setsid", unimplementedFunc),
+    /* 113 */ SyscallDesc("setreuid", unimplementedFunc),
+    /* 114 */ SyscallDesc("setregid", unimplementedFunc),
+    /* 115 */ SyscallDesc("getgroups", unimplementedFunc),
+    /* 116 */ SyscallDesc("setgroups", unimplementedFunc),
+    /* 117 */ SyscallDesc("setresuid", unimplementedFunc),
+    /* 118 */ SyscallDesc("getresuid", unimplementedFunc),
+    /* 119 */ SyscallDesc("setresgid", unimplementedFunc),
+    /* 120 */ SyscallDesc("getresgid", unimplementedFunc),
+    /* 121 */ SyscallDesc("getpgid", unimplementedFunc),
+    /* 122 */ SyscallDesc("setfsuid", unimplementedFunc),
+    /* 123 */ SyscallDesc("setfsgid", unimplementedFunc),
+    /* 124 */ SyscallDesc("getsid", unimplementedFunc),
+    /* 125 */ SyscallDesc("capget", unimplementedFunc),
+    /* 126 */ SyscallDesc("capset", unimplementedFunc),
+    /* 127 */ SyscallDesc("rt_sigpending", unimplementedFunc),
+    /* 128 */ SyscallDesc("rt_sigtimedwait", unimplementedFunc),
+    /* 129 */ SyscallDesc("rt_sigqueueinfo", unimplementedFunc),
+    /* 130 */ SyscallDesc("rt_sigsuspend", unimplementedFunc),
+    /* 131 */ SyscallDesc("sigaltstack", unimplementedFunc),
+    /* 132 */ SyscallDesc("utime", unimplementedFunc),
+    /* 133 */ SyscallDesc("mknod", unimplementedFunc),
+    /* 134 */ SyscallDesc("uselib", unimplementedFunc),
+    /* 135 */ SyscallDesc("personality", unimplementedFunc),
+    /* 136 */ SyscallDesc("ustat", unimplementedFunc),
+    /* 137 */ SyscallDesc("statfs", unimplementedFunc),
+    /* 138 */ SyscallDesc("fstatfs", unimplementedFunc),
+    /* 139 */ SyscallDesc("sysfs", unimplementedFunc),
+    /* 140 */ SyscallDesc("getpriority", unimplementedFunc),
+    /* 141 */ SyscallDesc("setpriority", unimplementedFunc),
+    /* 142 */ SyscallDesc("sched_setparam", unimplementedFunc),
+    /* 143 */ SyscallDesc("sched_getparam", unimplementedFunc),
+    /* 144 */ SyscallDesc("sched_setscheduler", unimplementedFunc),
+    /* 145 */ SyscallDesc("sched_getscheduler", unimplementedFunc),
+    /* 146 */ SyscallDesc("sched_get_priority_max", unimplementedFunc),
+    /* 147 */ SyscallDesc("sched_get_priority_min", unimplementedFunc),
+    /* 148 */ SyscallDesc("sched_rr_get_interval", unimplementedFunc),
+    /* 149 */ SyscallDesc("mlock", unimplementedFunc),
+    /* 150 */ SyscallDesc("munlock", unimplementedFunc),
+    /* 151 */ SyscallDesc("mlockall", unimplementedFunc),
+    /* 152 */ SyscallDesc("munlockall", unimplementedFunc),
+    /* 153 */ SyscallDesc("vhangup", unimplementedFunc),
+    /* 154 */ SyscallDesc("modify_ldt", unimplementedFunc),
+    /* 155 */ SyscallDesc("pivot_root", unimplementedFunc),
+    /* 156 */ SyscallDesc("_sysctl", unimplementedFunc),
+    /* 157 */ SyscallDesc("prctl", unimplementedFunc),
+    /* 158 */ SyscallDesc("arch_prctl", unimplementedFunc),
+    /* 159 */ SyscallDesc("adjtimex", unimplementedFunc),
+    /* 160 */ SyscallDesc("setrlimit", unimplementedFunc),
+    /* 161 */ SyscallDesc("chroot", unimplementedFunc),
+    /* 162 */ SyscallDesc("sync", unimplementedFunc),
+    /* 163 */ SyscallDesc("acct", unimplementedFunc),
+    /* 164 */ SyscallDesc("settimeofday", unimplementedFunc),
+    /* 165 */ SyscallDesc("mount", unimplementedFunc),
+    /* 166 */ SyscallDesc("umount2", unimplementedFunc),
+    /* 167 */ SyscallDesc("swapon", unimplementedFunc),
+    /* 168 */ SyscallDesc("swapoff", unimplementedFunc),
+    /* 169 */ SyscallDesc("reboot", unimplementedFunc),
+    /* 170 */ SyscallDesc("sethostname", unimplementedFunc),
+    /* 171 */ SyscallDesc("setdomainname", unimplementedFunc),
+    /* 172 */ SyscallDesc("iopl", unimplementedFunc),
+    /* 173 */ SyscallDesc("ioperm", unimplementedFunc),
+    /* 174 */ SyscallDesc("create_module", unimplementedFunc),
+    /* 175 */ SyscallDesc("init_module", unimplementedFunc),
+    /* 176 */ SyscallDesc("delete_module", unimplementedFunc),
+    /* 177 */ SyscallDesc("get_kernel_syms", unimplementedFunc),
+    /* 178 */ SyscallDesc("query_module", unimplementedFunc),
+    /* 179 */ SyscallDesc("quotactl", unimplementedFunc),
+    /* 180 */ SyscallDesc("nfsservctl", unimplementedFunc),
+    /* 181 */ SyscallDesc("getpmsg", unimplementedFunc),
+    /* 182 */ SyscallDesc("putpmsg", unimplementedFunc),
+    /* 183 */ SyscallDesc("afs_syscall", unimplementedFunc),
+    /* 184 */ SyscallDesc("tuxcall", unimplementedFunc),
+    /* 185 */ SyscallDesc("security", unimplementedFunc),
+    /* 186 */ SyscallDesc("gettid", unimplementedFunc),
+    /* 187 */ SyscallDesc("readahead", unimplementedFunc),
+    /* 188 */ SyscallDesc("setxattr", unimplementedFunc),
+    /* 189 */ SyscallDesc("lsetxattr", unimplementedFunc),
+    /* 190 */ SyscallDesc("fsetxattr", unimplementedFunc),
+    /* 191 */ SyscallDesc("getxattr", unimplementedFunc),
+    /* 192 */ SyscallDesc("lgetxattr", unimplementedFunc),
+    /* 193 */ SyscallDesc("fgetxattr", unimplementedFunc),
+    /* 194 */ SyscallDesc("listxattr", unimplementedFunc),
+    /* 195 */ SyscallDesc("llistxattr", unimplementedFunc),
+    /* 196 */ SyscallDesc("flistxattr", unimplementedFunc),
+    /* 197 */ SyscallDesc("removexattr", unimplementedFunc),
+    /* 198 */ SyscallDesc("lremovexattr", unimplementedFunc),
+    /* 199 */ SyscallDesc("fremovexattr", unimplementedFunc),
+    /* 200 */ SyscallDesc("tkill", unimplementedFunc),
+    /* 201 */ SyscallDesc("time", unimplementedFunc),
+    /* 202 */ SyscallDesc("futex", unimplementedFunc),
+    /* 203 */ SyscallDesc("sched_setaffinity", unimplementedFunc),
+    /* 204 */ SyscallDesc("sched_getaffinity", unimplementedFunc),
+    /* 205 */ SyscallDesc("set_thread_area", unimplementedFunc),
+    /* 206 */ SyscallDesc("io_setup", unimplementedFunc),
+    /* 207 */ SyscallDesc("io_destroy", unimplementedFunc),
+    /* 208 */ SyscallDesc("io_getevents", unimplementedFunc),
+    /* 209 */ SyscallDesc("io_submit", unimplementedFunc),
+    /* 210 */ SyscallDesc("io_cancel", unimplementedFunc),
+    /* 211 */ SyscallDesc("get_thread_area", unimplementedFunc),
+    /* 212 */ SyscallDesc("lookup_dcookie", unimplementedFunc),
+    /* 213 */ SyscallDesc("epoll_create", unimplementedFunc),
+    /* 214 */ SyscallDesc("epoll_ctl_old", unimplementedFunc),
+    /* 215 */ SyscallDesc("epoll_wait_old", unimplementedFunc),
+    /* 216 */ SyscallDesc("remap_file_pages", unimplementedFunc),
+    /* 217 */ SyscallDesc("getdents64", unimplementedFunc),
+    /* 218 */ SyscallDesc("set_tid_address", unimplementedFunc),
+    /* 219 */ SyscallDesc("restart_syscall", unimplementedFunc),
+    /* 220 */ SyscallDesc("semtimedop", unimplementedFunc),
+    /* 221 */ SyscallDesc("fadvise64", unimplementedFunc),
+    /* 222 */ SyscallDesc("timer_create", unimplementedFunc),
+    /* 223 */ SyscallDesc("timer_settime", unimplementedFunc),
+    /* 224 */ SyscallDesc("timer_gettime", unimplementedFunc),
+    /* 225 */ SyscallDesc("timer_getoverrun", unimplementedFunc),
+    /* 226 */ SyscallDesc("timer_delete", unimplementedFunc),
+    /* 227 */ SyscallDesc("clock_settime", unimplementedFunc),
+    /* 228 */ SyscallDesc("clock_gettime", unimplementedFunc),
+    /* 229 */ SyscallDesc("clock_getres", unimplementedFunc),
+    /* 230 */ SyscallDesc("clock_nanosleep", unimplementedFunc),
+    /* 231 */ SyscallDesc("exit_group", unimplementedFunc),
+    /* 232 */ SyscallDesc("epoll_wait", unimplementedFunc),
+    /* 233 */ SyscallDesc("epoll_ctl", unimplementedFunc),
+    /* 234 */ SyscallDesc("tgkill", unimplementedFunc),
+    /* 235 */ SyscallDesc("utimes", unimplementedFunc),
+    /* 236 */ SyscallDesc("vserver", unimplementedFunc),
+    /* 237 */ SyscallDesc("mbind", unimplementedFunc),
+    /* 238 */ SyscallDesc("set_mempolicy", unimplementedFunc),
+    /* 239 */ SyscallDesc("get_mempolicy", unimplementedFunc),
+    /* 240 */ SyscallDesc("mq_open", unimplementedFunc),
+    /* 241 */ SyscallDesc("mq_unlink", unimplementedFunc),
+    /* 242 */ SyscallDesc("mq_timedsend", unimplementedFunc),
+    /* 243 */ SyscallDesc("mq_timedreceive", unimplementedFunc),
+    /* 244 */ SyscallDesc("mq_notify", unimplementedFunc),
+    /* 245 */ SyscallDesc("mq_getsetattr", unimplementedFunc),
+    /* 246 */ SyscallDesc("kexec_load", unimplementedFunc),
+    /* 247 */ SyscallDesc("waitid", unimplementedFunc),
+    /* 248 */ SyscallDesc("add_key", unimplementedFunc),
+    /* 249 */ SyscallDesc("request_key", unimplementedFunc),
+    /* 250 */ SyscallDesc("keyctl", unimplementedFunc),
+    /* 251 */ SyscallDesc("ioprio_set", unimplementedFunc),
+    /* 252 */ SyscallDesc("ioprio_get", unimplementedFunc),
+    /* 253 */ SyscallDesc("inotify_init", unimplementedFunc),
+    /* 254 */ SyscallDesc("inotify_add_watch", unimplementedFunc),
+    /* 255 */ SyscallDesc("inotify_rm_watch", unimplementedFunc),
+    /* 256 */ SyscallDesc("migrate_pages", unimplementedFunc),
+    /* 257 */ SyscallDesc("openat", unimplementedFunc),
+    /* 258 */ SyscallDesc("mkdirat", unimplementedFunc),
+    /* 259 */ SyscallDesc("mknodat", unimplementedFunc),
+    /* 260 */ SyscallDesc("fchownat", unimplementedFunc),
+    /* 261 */ SyscallDesc("futimesat", unimplementedFunc),
+    /* 262 */ SyscallDesc("newfstatat", unimplementedFunc),
+    /* 263 */ SyscallDesc("unlinkat", unimplementedFunc),
+    /* 264 */ SyscallDesc("renameat", unimplementedFunc),
+    /* 265 */ SyscallDesc("linkat", unimplementedFunc),
+    /* 266 */ SyscallDesc("symlinkat", unimplementedFunc),
+    /* 267 */ SyscallDesc("readlinkat", unimplementedFunc),
+    /* 268 */ SyscallDesc("fchmodat", unimplementedFunc),
+    /* 269 */ SyscallDesc("faccessat", unimplementedFunc),
+    /* 270 */ SyscallDesc("pselect6", unimplementedFunc),
+    /* 271 */ SyscallDesc("ppoll", unimplementedFunc),
+    /* 272 */ SyscallDesc("unshare", unimplementedFunc)
+};
diff --git a/src/arch/x86/miscregfile.cc b/src/arch/x86/miscregfile.cc
index bfd3ded5d..3d645644f 100644
--- a/src/arch/x86/miscregfile.cc
+++ b/src/arch/x86/miscregfile.cc
@@ -100,7 +100,7 @@ string X86ISA::getMiscRegName(RegIndex index)
 
 void MiscRegFile::clear()
 {
-    panic("No misc registers in x86 yet!\n");
+    //When there are actually misc regs implemented, this will clear them
 }
 
 MiscReg MiscRegFile::readReg(int miscReg)
diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc
new file mode 100644
index 000000000..e6d1e4921
--- /dev/null
+++ b/src/arch/x86/process.cc
@@ -0,0 +1,359 @@
+/*
+ * Copyright (c) 2003-2006 The Regents of The University of Michigan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Gabe Black
+ *          Ali Saidi
+ */
+
+/*
+ * Copyright (c) 2007 The Hewlett-Packard Development Company
+ * All rights reserved.
+ *
+ * Redistribution and use of this software in source and binary forms,
+ * with or without modification, are permitted provided that the
+ * following conditions are met:
+ *
+ * The software must be used only for Non-Commercial Use which means any
+ * use which is NOT directed to receiving any direct monetary
+ * compensation for, or commercial advantage from such use.  Illustrative
+ * examples of non-commercial use are academic research, personal study,
+ * teaching, education and corporate research & development.
+ * Illustrative examples of commercial use are distributing products for
+ * commercial advantage and providing services using the software for
+ * commercial advantage.
+ *
+ * If you wish to use this software or functionality therein that may be
+ * covered by patents for commercial use, please contact:
+ *     Director of Intellectual Property Licensing
+ *     Office of Strategy and Technology
+ *     Hewlett-Packard Company
+ *     1501 Page Mill Road
+ *     Palo Alto, California  94304
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.  Redistributions
+ * in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.  Neither the name of
+ * the COPYRIGHT HOLDER(s), HEWLETT-PACKARD COMPANY, nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.  No right of
+ * sublicense is granted herewith.  Derivatives of the software and
+ * output created using the software may be prepared, but only for
+ * Non-Commercial Uses.  Derivatives of the software may be shared with
+ * others provided: (i) the others agree to abide by the list of
+ * conditions herein which includes the Non-Commercial Use restrictions;
+ * and (ii) such Derivatives of the software include the above copyright
+ * notice to acknowledge the contribution from this software where
+ * applicable, this list of conditions and the disclaimer below.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Gabe Black
+ */
+
+#include "arch/x86/isa_traits.hh"
+#include "arch/x86/process.hh"
+#include "arch/x86/types.hh"
+#include "base/loader/object_file.hh"
+#include "base/loader/elf_object.hh"
+#include "base/misc.hh"
+#include "cpu/thread_context.hh"
+#include "mem/page_table.hh"
+#include "mem/translating_port.hh"
+#include "sim/system.hh"
+
+using namespace std;
+using namespace X86ISA;
+
+M5_64_auxv_t::M5_64_auxv_t(int64_t type, int64_t val)
+{
+    a_type = TheISA::htog(type);
+    a_val = TheISA::htog(val);
+}
+
+X86LiveProcess::X86LiveProcess(const std::string &nm, ObjectFile *objFile,
+        System *_system, int stdin_fd, int stdout_fd, int stderr_fd,
+        std::vector<std::string> &argv, std::vector<std::string> &envp,
+        const std::string &cwd,
+        uint64_t _uid, uint64_t _euid, uint64_t _gid, uint64_t _egid,
+        uint64_t _pid, uint64_t _ppid)
+    : LiveProcess(nm, objFile, _system, stdin_fd, stdout_fd, stderr_fd,
+        argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid)
+{
+    brk_point = objFile->dataBase() + objFile->dataSize() + objFile->bssSize();
+    brk_point = roundUp(brk_point, VMPageSize);
+
+    // Set pointer for next thread stack.  Reserve 8M for main stack.
+    next_thread_stack_base = stack_base - (8 * 1024 * 1024);
+
+    // Set up stack. On SPARC Linux, stack goes from the top of memory
+    // downward, less the hole for the kernel address space.
+    stack_base = (Addr)0x80000000000ULL;
+
+    // Set up region for mmaps.  Tru64 seems to start just above 0 and
+    // grow up from there.
+    mmap_start = mmap_end = 0xfffff80000000000ULL;
+}
+
+void X86LiveProcess::handleTrap(int trapNum, ThreadContext *tc)
+{
+    switch(trapNum)
+    {
+      default:
+        panic("Unimplemented trap to operating system: trap number %#x.\n", trapNum);
+    }
+}
+
+void
+X86LiveProcess::startup()
+{
+    argsInit(sizeof(IntReg), VMPageSize);
+
+    //The AMD64 abi says that only rsp and rdx are defined at process
+    //startup. rsp will be set by argsInit, and I don't understand what
+    //rdx should be set to. The other floating point and integer registers
+    //will be zeroed by the register file constructors, but control registers
+    //should be initialized here. Since none of those are implemented, there
+    //isn't anything here.
+}
+
+void
+X86LiveProcess::argsInit(int intSize, int pageSize)
+{
+    typedef M5_64_auxv_t auxv_t;
+    Process::startup();
+
+    string filename;
+    if(argv.size() < 1)
+        filename = "";
+    else
+        filename = argv[0];
+
+    Addr alignmentMask = ~(intSize - 1);
+
+    // load object file into target memory
+    objFile->loadSections(initVirtMem);
+
+    //These are the auxilliary vector types
+    enum auxTypes
+    {
+        X86_AT_NULL = 0,
+        X86_AT_IGNORE = 1,
+        X86_AT_EXECFD = 2,
+        X86_AT_PHDR = 3,
+        X86_AT_PHENT = 4,
+        X86_AT_PHNUM = 5,
+        X86_AT_PAGESZ = 6,
+        X86_AT_BASE = 7,
+        X86_AT_FLAGS = 8,
+        X86_AT_ENTRY = 9,
+        X86_AT_NOTELF = 10,
+        X86_AT_UID = 11,
+        X86_AT_EUID = 12,
+        X86_AT_GID = 13,
+        X86_AT_EGID = 14
+    };
+
+    //Setup the auxilliary vectors. These will already have endian conversion.
+    //Auxilliary vectors are loaded only for elf formatted executables.
+    ElfObject * elfObject = dynamic_cast<ElfObject *>(objFile);
+    if(elfObject)
+    {
+        /*
+        //Bits which describe the system hardware capabilities
+        auxv.push_back(auxv_t(SPARC_AT_HWCAP, hwcap));
+        //The system page size
+        auxv.push_back(auxv_t(SPARC_AT_PAGESZ, SparcISA::VMPageSize));
+        //Defined to be 100 in the kernel source.
+        //Frequency at which times() increments
+        auxv.push_back(auxv_t(SPARC_AT_CLKTCK, 100));
+        // For statically linked executables, this is the virtual address of the
+        // program header tables if they appear in the executable image
+        auxv.push_back(auxv_t(SPARC_AT_PHDR, elfObject->programHeaderTable()));
+        // This is the size of a program header entry from the elf file.
+        auxv.push_back(auxv_t(SPARC_AT_PHENT, elfObject->programHeaderSize()));
+        // This is the number of program headers from the original elf file.
+        auxv.push_back(auxv_t(SPARC_AT_PHNUM, elfObject->programHeaderCount()));
+        //This is the address of the elf "interpreter", It should be set
+        //to 0 for regular executables. It should be something else
+        //(not sure what) for dynamic libraries.
+        auxv.push_back(auxv_t(SPARC_AT_BASE, 0));
+        //This is hardwired to 0 in the elf loading code in the kernel
+        auxv.push_back(auxv_t(SPARC_AT_FLAGS, 0));
+        //The entry point to the program
+        auxv.push_back(auxv_t(SPARC_AT_ENTRY, objFile->entryPoint()));
+        //Different user and group IDs
+        auxv.push_back(auxv_t(SPARC_AT_UID, uid()));
+        auxv.push_back(auxv_t(SPARC_AT_EUID, euid()));
+        auxv.push_back(auxv_t(SPARC_AT_GID, gid()));
+        auxv.push_back(auxv_t(SPARC_AT_EGID, egid()));
+        //Whether to enable "secure mode" in the executable
+        auxv.push_back(auxv_t(SPARC_AT_SECURE, 0));*/
+    }
+
+    //Figure out how big the initial stack needs to be
+
+    // The unaccounted for 0 at the top of the stack
+    int mysterious_size = intSize;
+
+    //This is the name of the file which is present on the initial stack
+    //It's purpose is to let the user space linker examine the original file.
+    int file_name_size = filename.size() + 1;
+
+    int env_data_size = 0;
+    for (int i = 0; i < envp.size(); ++i) {
+        env_data_size += envp[i].size() + 1;
+    }
+    int arg_data_size = 0;
+    for (int i = 0; i < argv.size(); ++i) {
+        arg_data_size += argv[i].size() + 1;
+    }
+
+    //The info_block needs to be padded so it's size is a multiple of the
+    //alignment mask. Also, it appears that there needs to be at least some
+    //padding, so if the size is already a multiple, we need to increase it
+    //anyway.
+    int info_block_size =
+        (file_name_size +
+        env_data_size +
+        arg_data_size +
+        intSize) & alignmentMask;
+
+    int info_block_padding =
+        info_block_size -
+        file_name_size -
+        env_data_size -
+        arg_data_size;
+
+    //Each auxilliary vector is two 8 byte words
+    int aux_array_size = intSize * 2 * (auxv.size() + 1);
+
+    int envp_array_size = intSize * (envp.size() + 1);
+    int argv_array_size = intSize * (argv.size() + 1);
+
+    int argc_size = intSize;
+    int window_save_size = intSize * 16;
+
+    int space_needed =
+        mysterious_size +
+        info_block_size +
+        aux_array_size +
+        envp_array_size +
+        argv_array_size +
+        argc_size +
+        window_save_size;
+
+    stack_min = stack_base - space_needed;
+    stack_min &= alignmentMask;
+    stack_size = stack_base - stack_min;
+
+    // map memory
+    pTable->allocate(roundDown(stack_min, pageSize),
+                     roundUp(stack_size, pageSize));
+
+    // map out initial stack contents
+    Addr mysterious_base = stack_base - mysterious_size;
+    Addr file_name_base = mysterious_base - file_name_size;
+    Addr env_data_base = file_name_base - env_data_size;
+    Addr arg_data_base = env_data_base - arg_data_size;
+    Addr auxv_array_base = arg_data_base - aux_array_size - info_block_padding;
+    Addr envp_array_base = auxv_array_base - envp_array_size;
+    Addr argv_array_base = envp_array_base - argv_array_size;
+    Addr argc_base = argv_array_base - argc_size;
+#ifndef NDEBUG
+    // only used in DPRINTF
+    Addr window_save_base = argc_base - window_save_size;
+#endif
+
+    DPRINTF(X86, "The addresses of items on the initial stack:\n");
+    DPRINTF(X86, "0x%x - file name\n", file_name_base);
+    DPRINTF(X86, "0x%x - env data\n", env_data_base);
+    DPRINTF(X86, "0x%x - arg data\n", arg_data_base);
+    DPRINTF(X86, "0x%x - auxv array\n", auxv_array_base);
+    DPRINTF(X86, "0x%x - envp array\n", envp_array_base);
+    DPRINTF(X86, "0x%x - argv array\n", argv_array_base);
+    DPRINTF(X86, "0x%x - argc \n", argc_base);
+    DPRINTF(X86, "0x%x - window save\n", window_save_base);
+    DPRINTF(X86, "0x%x - stack min\n", stack_min);
+
+    // write contents to stack
+
+    // figure out argc
+    uint64_t argc = argv.size();
+    uint64_t guestArgc = TheISA::htog(argc);
+
+    //Write out the mysterious 0
+    uint64_t mysterious_zero = 0;
+    initVirtMem->writeBlob(mysterious_base,
+            (uint8_t*)&mysterious_zero, mysterious_size);
+
+    //Write the file name
+    initVirtMem->writeString(file_name_base, filename.c_str());
+
+    //Copy the aux stuff
+    for(int x = 0; x < auxv.size(); x++)
+    {
+        initVirtMem->writeBlob(auxv_array_base + x * 2 * intSize,
+                (uint8_t*)&(auxv[x].a_type), intSize);
+        initVirtMem->writeBlob(auxv_array_base + (x * 2 + 1) * intSize,
+                (uint8_t*)&(auxv[x].a_val), intSize);
+    }
+    //Write out the terminating zeroed auxilliary vector
+    const uint64_t zero = 0;
+    initVirtMem->writeBlob(auxv_array_base + 2 * intSize * auxv.size(),
+            (uint8_t*)&zero, 2 * intSize);
+
+    copyStringArray(envp, envp_array_base, env_data_base, initVirtMem);
+    copyStringArray(argv, argv_array_base, arg_data_base, initVirtMem);
+
+    initVirtMem->writeBlob(argc_base, (uint8_t*)&guestArgc, intSize);
+
+    //Set up the thread context to start running the process
+    threadContexts[0]->setIntReg(ArgumentReg0, argc);
+    threadContexts[0]->setIntReg(ArgumentReg1, argv_array_base);
+    threadContexts[0]->setIntReg(StackPointerReg, stack_min);
+
+    Addr prog_entry = objFile->entryPoint();
+    threadContexts[0]->setPC(prog_entry);
+    threadContexts[0]->setNextPC(prog_entry + sizeof(MachInst));
+
+    //Align the "stack_min" to a page boundary.
+    stack_min = roundDown(stack_min, pageSize);
+
+//    num_processes++;
+}
diff --git a/src/arch/x86/process.hh b/src/arch/x86/process.hh
index 92bb86c29..a2fa258c8 100644
--- a/src/arch/x86/process.hh
+++ b/src/arch/x86/process.hh
@@ -58,10 +58,51 @@
 #ifndef __ARCH_X86_PROCESS_HH__
 #define __ARCH_X86_PROCESS_HH__
 
-#error X86 is not yet supported!
+#include <string>
+#include <vector>
+#include "sim/process.hh"
 
 namespace X86ISA
 {
-};
+    struct M5_64_auxv_t
+    {
+        int64_t a_type;
+        union {
+            int64_t a_val;
+            int64_t a_ptr;
+            int64_t a_fcn;
+        };
+
+        M5_64_auxv_t()
+        {}
+
+        M5_64_auxv_t(int64_t type, int64_t val);
+    };
+
+    class X86LiveProcess : public LiveProcess
+    {
+      protected:
+        std::vector<M5_64_auxv_t> auxv;
+
+        X86LiveProcess(const std::string &nm, ObjectFile *objFile,
+                    System *_system,
+                    int stdin_fd, int stdout_fd, int stderr_fd,
+                    std::vector<std::string> &argv,
+                    std::vector<std::string> &envp,
+                    const std::string &cwd,
+                    uint64_t _uid, uint64_t _euid,
+                    uint64_t _gid, uint64_t _egid,
+                    uint64_t _pid, uint64_t _ppid);
+
+        void startup();
+
+      public:
+
+        //Handles traps which request services from the operating system
+        virtual void handleTrap(int trapNum, ThreadContext *tc);
+
+        void argsInit(int intSize, int pageSize);
+    };
+}
 
 #endif // __ARCH_X86_PROCESS_HH__
diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc
index b56dc5aa6..8f157da28 100644
--- a/src/base/loader/elf_object.cc
+++ b/src/base/loader/elf_object.cc
@@ -89,6 +89,12 @@ ElfObject::tryFile(const string &fname, int fd, size_t len, uint8_t *data)
         } else if (ehdr.e_machine == EM_MIPS
                 && ehdr.e_ident[EI_CLASS] == ELFCLASS32) {
             arch = ObjectFile::Mips;
+        } else if (ehdr.e_machine == EM_X86_64 &&
+                ehdr.e_ident[EI_CLASS] == ELFCLASS64) {
+            //In the future, we might want to differentiate between 32 bit
+            //and 64 bit x86 processes in case there are differences in their
+            //initial stack frame.
+            arch = ObjectFile::X86;
         } else if (ehdr.e_ident[EI_CLASS] == ELFCLASS64) {
             arch = ObjectFile::Alpha;
         } else {
diff --git a/src/base/traceflags.py b/src/base/traceflags.py
index ba6aa6af8..cb17d98d3 100644
--- a/src/base/traceflags.py
+++ b/src/base/traceflags.py
@@ -168,6 +168,7 @@ baseFlags = [
     'VtoPhys',
     'WriteBarrier',
     'Writeback',
+    'X86',
     ]
 
 #
diff --git a/src/sim/process.cc b/src/sim/process.cc
index 130c81b01..2b283c9d1 100644
--- a/src/sim/process.cc
+++ b/src/sim/process.cc
@@ -61,7 +61,7 @@
 #elif THE_ISA == MIPS_ISA
 #include "arch/mips/linux/process.hh"
 #elif THE_ISA == X86_ISA
-//XXX There are no x86 processes yet
+#include "arch/x86/linux/process.hh"
 #else
 #error "THE_ISA not set"
 #endif
@@ -490,15 +490,15 @@ LiveProcess::create(const std::string &nm, System *system, int stdin_fd,
     }
 #elif THE_ISA == X86_ISA
     if (objFile->getArch() != ObjectFile::X86)
-        fatal("Object file architecture does not match compiled ISA (SPARC).");
-    panic("There are no implemented x86 processes!\n");
+        fatal("Object file architecture does not match compiled ISA (x86).");
     switch (objFile->getOpSys()) {
-      /*case ObjectFile::Linux:
+      case ObjectFile::Linux:
         process = new X86LinuxProcess(nm, objFile, system,
                                           stdin_fd, stdout_fd, stderr_fd,
                                           argv, envp, cwd,
                                           _uid, _euid, _gid,
-                                          _egid, _pid, _ppid);*/
+                                          _egid, _pid, _ppid);
+        break;
       default:
         fatal("Unknown/unsupported operating system.");
     }
diff --git a/tests/test-progs/hello/bin/x86/linux/hello b/tests/test-progs/hello/bin/x86/linux/hello
new file mode 100755
index 000000000..a3ec8dcdb
--- /dev/null
+++ b/tests/test-progs/hello/bin/x86/linux/hello