From 3e1537cf8b6a9fdbffa3975fde9f3d7f12c719f9 Mon Sep 17 00:00:00 2001
From: Kevin Lim <ktlim@umich.edu>
Date: Mon, 12 Jun 2006 16:42:56 -0400
Subject: Removed syscall function from thread_context.hh.  ThreadContext is
 the interface for external, non-CPU objects to access the thread, so they
 probably shouldn't be able to call syscall().  The case it was being used for
 was already handled by the ISA code.

src/arch/sparc/faults.cc:
src/cpu/thread_context.hh:
    Fix for merge problems.

--HG--
extra : convert_revision : 05a7a2d6e45099fcf36d113da2e52450d892a72c
---
 src/cpu/thread_context.hh | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/cpu')

diff --git a/src/cpu/thread_context.hh b/src/cpu/thread_context.hh
index 48c8fa28d..3c79e1116 100644
--- a/src/cpu/thread_context.hh
+++ b/src/cpu/thread_context.hh
@@ -245,8 +245,6 @@ class ThreadContext
 
     virtual void setSyscallReturn(SyscallReturn return_value) = 0;
 
-    virtual void syscall(int64_t callnum) = 0;
-
     // Same with st cond failures.
     virtual Counter readFuncExeInst() = 0;
 #endif
@@ -432,8 +430,6 @@ class ProxyThreadContext : public ThreadContext
     void setSyscallReturn(SyscallReturn return_value)
     { actualTC->setSyscallReturn(return_value); }
 
-    void syscall(int64_t callnum) { actualTC->syscall(callnum); }
-
     Counter readFuncExeInst() { return actualTC->readFuncExeInst(); }
 #endif
 
-- 
cgit v1.2.3


From 841d0b9d40446160fdc1e073e16f9bd7b6501911 Mon Sep 17 00:00:00 2001
From: Kevin Lim <ktlim@umich.edu>
Date: Mon, 12 Jun 2006 17:53:57 -0400
Subject: Merge fixes to make full system compile and run.

src/arch/alpha/linux/system.cc:
src/cpu/o3/alpha_cpu_impl.hh:
src/sim/system.cc:
    Merge fixes.

--HG--
extra : convert_revision : aa3326c0ebf54da9ab1dbd2d9877da41ca487082
---
 src/cpu/o3/alpha_cpu_impl.hh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/cpu')

diff --git a/src/cpu/o3/alpha_cpu_impl.hh b/src/cpu/o3/alpha_cpu_impl.hh
index 98290e57f..bfd05d260 100644
--- a/src/cpu/o3/alpha_cpu_impl.hh
+++ b/src/cpu/o3/alpha_cpu_impl.hh
@@ -46,6 +46,7 @@
 #include "arch/isa_traits.hh"
 #include "cpu/quiesce_event.hh"
 #include "kern/kernel_stats.hh"
+#include "sim/sim_exit.hh"
 #include "sim/system.hh"
 #endif
 
-- 
cgit v1.2.3