Fixes for full system compiling.

arch/alpha/arguments.cc:
    There will not be a phys mem ptr in the XC in the newmem.  This read will have to go through something else.
arch/alpha/ev5.cc:
    Remove instantiations of these functions for the FastCPU, as the FastCPU is not really used.  Also this messed up the ability to specify which CPU models are being built.
cpu/exec_context.hh:
    Remove getPhysMemPtr() function.
cpu/exetrace.cc:
    Include sim/system.hh, and sort the includes.
cpu/simple/cpu.cc:
    Fixes for full system compilation.
kern/system_events.cc:
    Remove include of encumbered FullCPU.  The branch prediction will need to be fixed up in a more generic way in the future.

--HG--
extra : convert_revision : a8bbf562a277aa80e8f40112570c0a825298a05c

1 files changed, 6 insertions, 2 deletions

diff --git a/kern/system_events.cc b/kern/system_events.cc
index 9b9861497..fd5c12e44 100644
--- a/kern/system_events.cc
+++ b/kern/system_events.cc
@@ -26,8 +26,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "encumbered/cpu/full/cpu.hh"
+#include "cpu/base.hh"
+#include "cpu/cpu_exec_context.hh"
 #include "kern/kernel_stats.hh"
+#include "kern/system_events.hh"
+#include "sim/system.hh"
 
 using namespace TheISA;
 
@@ -41,11 +44,12 @@ SkipFuncEvent::process(ExecContext *xc)
 
     xc->setPC(newpc);
     xc->setNextPC(xc->readPC() + sizeof(TheISA::MachInst));
-
+/*
     BranchPred *bp = xc->getCpuPtr()->getBranchPred();
     if (bp != NULL) {
         bp->popRAS(xc->getThreadNum());
     }
+*/
 }