SimpleCPU compiles with merge.

arch/alpha/isa_traits.hh:
arch/alpha/linux/process.cc:
arch/alpha/process.cc:
arch/alpha/process.hh:
arch/alpha/tru64/process.cc:
base/chunk_generator.hh:
base/loader/elf_object.cc:
cpu/cpu_exec_context.cc:
cpu/cpu_exec_context.hh:
cpu/exec_context.hh:
cpu/simple/cpu.cc:
kern/linux/linux.hh:
kern/tru64/tru64.hh:
mem/packet.hh:
mem/page_table.cc:
mem/page_table.hh:
mem/physical.cc:
mem/request.hh:
mem/translating_port.cc:
sim/process.hh:
sim/system.cc:
    Fixing merged changes.

--HG--
extra : convert_revision : 2e94f21009395db654880fcb94ec806b6f5772c3

1 files changed, 5 insertions, 3 deletions

diff --git a/kern/linux/linux.hh b/kern/linux/linux.hh
index 0dbccf546..4244eb369 100644
--- a/kern/linux/linux.hh
+++ b/kern/linux/linux.hh
@@ -46,6 +46,8 @@ class Linux {};
 
 #include "sim/syscall_emul.hh"
 
+class TranslatingPort;
+
 ///
 /// This class encapsulates the types, structures, constants,
 /// functions, and syscall-number mappings specific to the Alpha Linux
@@ -240,7 +242,7 @@ class Linux {
     /// memory space.  Used by stat(), fstat(), and lstat().
 #if !BSD_HOST
     static void
-    copyOutStatBuf(FunctionalMemory *mem, Addr addr, hst_stat *host)
+    copyOutStatBuf(TranslatingPort *mem, Addr addr, hst_stat *host)
     {
         TypedBufferArg<Linux::tgt_stat> tgt(addr);
 
@@ -264,7 +266,7 @@ class Linux {
     // Third version for bsd systems which no longer have any support for
     // the old stat() call and stat() is actually a stat64()
     static void
-    copyOutStatBuf(FunctionalMemory *mem, Addr addr, hst_stat64 *host)
+    copyOutStatBuf(TranslatingPort *mem, Addr addr, hst_stat64 *host)
     {
         TypedBufferArg<Linux::tgt_stat> tgt(addr);
 
@@ -289,7 +291,7 @@ class Linux {
 
     // Same for stat64
     static void
-    copyOutStat64Buf(FunctionalMemory *mem, int fd, Addr addr, hst_stat64 *host)
+    copyOutStat64Buf(TranslatingPort *mem, int fd, Addr addr, hst_stat64 *host)
     {
         TypedBufferArg<Linux::tgt_stat64> tgt(addr);