diff --git a/arch/alpha/faults.cc b/arch/alpha/faults.cc
index 84f785c0a..2d16317ec 100644
--- a/arch/alpha/faults.cc
+++ b/arch/alpha/faults.cc
@@ -103,15 +103,15 @@ FaultStat IntegerOverflowFault::_stat;
 
 void AlphaFault::invoke(ExecContext * xc)
 {
-    DPRINTF(Fault, "Fault %s at PC: %#x\n", name(), xc->regs.pc);
-    xc->cpu->recordEvent(csprintf("Fault %s", name()));
+    DPRINTF(Fault, "Fault %s at PC: %#x\n", name(), xc->readPC());
+    xc->getCpuPtr()->recordEvent(csprintf("Fault %s", name()));
 
     assert(!xc->misspeculating());
-    xc->kernelStats->fault(this);
+    xc->getCpuPtr()->kernelStats->fault(this);
 
     // exception restart address
     if (setRestartAddress() || !xc->inPalMode())
-        xc->setMiscReg(AlphaISA::IPR_EXC_ADDR, xc->regs.pc);
+        xc->setMiscReg(AlphaISA::IPR_EXC_ADDR, xc->readPC());
 
     if (skipFaultingInstruction()) {
         // traps...  skip faulting instruction.
@@ -119,17 +119,17 @@ void AlphaFault::invoke(ExecContext * xc)
                    xc->readMiscReg(AlphaISA::IPR_EXC_ADDR) + 4);
     }
 
-    xc->regs.pc = xc->readMiscReg(AlphaISA::IPR_PAL_BASE) + vect();
-    xc->regs.npc = xc->regs.pc + sizeof(MachInst);
+    xc->setPC(xc->readMiscReg(AlphaISA::IPR_PAL_BASE) + vect());
+    xc->setNextPC(xc->readPC() + sizeof(MachInst));
 }
 
 void ArithmeticFault::invoke(ExecContext * xc)
 {
-    DPRINTF(Fault, "Fault %s at PC: %#x\n", name(), xc->regs.pc);
-    xc->cpu->recordEvent(csprintf("Fault %s", name()));
+    DPRINTF(Fault, "Fault %s at PC: %#x\n", name(), xc->readPC());
+    xc->getCpuPtr()->recordEvent(csprintf("Fault %s", name()));
 
     assert(!xc->misspeculating());
-    xc->kernelStats->fault(this);
+    xc->getCpuPtr()->kernelStats->fault(this);
 
     panic("Arithmetic traps are unimplemented!");
 }
diff --git a/arch/alpha/stacktrace.cc b/arch/alpha/stacktrace.cc
index 50f2e4d21..26656ab5c 100644
--- a/arch/alpha/stacktrace.cc
+++ b/arch/alpha/stacktrace.cc
@@ -35,6 +35,7 @@
 #include "base/trace.hh"
 #include "cpu/base.hh"
 #include "cpu/exec_context.hh"
+#include "sim/system.hh"
 
 using namespace std;
 using namespace AlphaISA;
diff --git a/cpu/cpu_exec_context.cc b/cpu/cpu_exec_context.cc
index ae428646d..74b609764 100644
--- a/cpu/cpu_exec_context.cc
+++ b/cpu/cpu_exec_context.cc
@@ -57,8 +57,7 @@ CPUExecContext::CPUExecContext(BaseCPU *_cpu, int _thread_num, System *_sys,
     : _status(ExecContext::Unallocated), cpu(_cpu), thread_num(_thread_num),
       cpu_id(-1), lastActivate(0), lastSuspend(0), mem(_mem), itb(_itb),
       dtb(_dtb), system(_sys), memctrl(_sys->memctrl), physmem(_sys->physmem),
-      fnbin(kernelBinning->fnbin), profile(NULL), quiesceEvent(this),
-      func_exe_inst(0), storeCondFailures(0)
+      profile(NULL), quiesceEvent(this), func_exe_inst(0), storeCondFailures(0)
 {
     proxy = new ProxyExecContext<CPUExecContext>(this);
 
@@ -119,21 +118,22 @@ void
 CPUExecContext::dumpFuncProfile()
 {
     std::ostream *os = simout.create(csprintf("profile.%s.dat", cpu->name()));
+    profile->dump(proxy, *os);
 }
 
-ExecContext::EndQuiesceEvent::EndQuiesceEvent(ExecContext *_xc)
-    : Event(&mainEventQueue), xc(_xc)
+CPUExecContext::EndQuiesceEvent::EndQuiesceEvent(CPUExecContext *_cpuXC)
+    : Event(&mainEventQueue), cpuXC(_cpuXC)
 {
 }
 
 void
-ExecContext::EndQuiesceEvent::process()
+CPUExecContext::EndQuiesceEvent::process()
 {
-    xc->activate();
+    cpuXC->activate();
 }
 
 const char*
-ExecContext::EndQuiesceEvent::description()
+CPUExecContext::EndQuiesceEvent::description()
 {
     return "End Quiesce Event.";
 }
@@ -142,25 +142,25 @@ ExecContext::EndQuiesceEvent::description()
 void
 CPUExecContext::takeOverFrom(ExecContext *oldContext)
 {
-/*
     // some things should already be set up
-    assert(mem == oldContext->mem);
+    assert(mem == oldContext->getMemPtr());
 #if FULL_SYSTEM
-    assert(system == oldContext->system);
+    assert(system == oldContext->getSystemPtr());
 #else
-    assert(process == oldContext->process);
+    assert(process == oldContext->getProcessPtr());
 #endif
 
     // copy over functional state
-    _status = oldContext->_status;
-    regs = oldContext->regs;
-    cpu_id = oldContext->cpu_id;
-    func_exe_inst = oldContext->func_exe_inst;
+    _status = oldContext->status();
+    copyArchRegs(oldContext);
+    cpu_id = oldContext->readCpuId();
+#if !FULL_SYSTEM
+    func_exe_inst = oldContext->readFuncExeInst();
+#endif
 
     storeCondFailures = 0;
 
-    oldContext->_status = CPUExecContext::Unallocated;
-*/
+    oldContext->setStatus(ExecContext::Unallocated);
 }
 
 void
@@ -281,6 +281,9 @@ CPUExecContext::copyArchRegs(ExecContext *xc)
     setMiscReg(AlphaISA::Lock_Addr_DepTag,
                xc->readMiscReg(AlphaISA::Lock_Addr_DepTag));
 
+    // Also need to copy all the IPRs.  Probably should just have a copy misc
+    // regs function defined on the misc regs.
+
     // Lastly copy PC/NPC
     setPC(xc->readPC());
     setNextPC(xc->readNextPC());
diff --git a/cpu/cpu_exec_context.hh b/cpu/cpu_exec_context.hh
index a40253d4b..f5c57da22 100644
--- a/cpu/cpu_exec_context.hh
+++ b/cpu/cpu_exec_context.hh
@@ -139,9 +139,9 @@ class CPUExecContext
     struct EndQuiesceEvent : public Event
     {
         /** A pointer to the execution context that is quiesced */
-        ExecContext *xc;
+        CPUExecContext *cpuXC;
 
-        EndQuiesceEvent(ExecContext *_xc);
+        EndQuiesceEvent(CPUExecContext *_cpuXC);
 
         /** Event process to occur at interrupt*/
         virtual void process();
@@ -151,6 +151,12 @@ class CPUExecContext
     };
     EndQuiesceEvent quiesceEvent;
 
+    Event *getQuiesceEvent() { return &quiesceEvent; }
+
+    Tick readLastActivate() { return lastActivate; }
+
+    Tick readLastSuspend() { return lastSuspend; }
+
 #else
     Process *process;
 
diff --git a/cpu/exec_context.hh b/cpu/exec_context.hh
index 9c96b5c42..b7653f121 100644
--- a/cpu/exec_context.hh
+++ b/cpu/exec_context.hh
@@ -42,6 +42,7 @@
 class AlphaDTB;
 class AlphaITB;
 class BaseCPU;
+class Event;
 class FunctionalMemory;
 class PhysicalMemory;
 class Process;
@@ -102,6 +103,8 @@ class ExecContext
 
     virtual Status status() const = 0;
 
+    virtual void setStatus(Status new_status) = 0;
+
     /// Set the status to Active.  Optional delay indicates number of
     /// cycles to wait before beginning execution.
     virtual void activate(int delay = 1) = 0;
@@ -119,13 +122,22 @@ class ExecContext
     virtual void dumpFuncProfile() = 0;
 #endif
 
-    virtual void takeOverFrom(ExecContext *oldContext) = 0;
+    virtual void takeOverFrom(ExecContext *old_context) = 0;
 
     virtual void regStats(const std::string &name) = 0;
 
     virtual void serialize(std::ostream &os) = 0;
     virtual void unserialize(Checkpoint *cp, const std::string &section) = 0;
 
+#if FULL_SYSTEM
+    virtual Event *getQuiesceEvent() = 0;
+
+    // Not necessarily the best location for these...
+    // Having an extra function just to read these is obnoxious
+    virtual Tick readLastActivate() = 0;
+    virtual Tick readLastSuspend() = 0;
+#endif
+
     virtual int getThreadNum() = 0;
 
     virtual bool validInstAddr(Addr addr) = 0;
@@ -139,6 +151,7 @@ class ExecContext
 
     virtual Fault translateDataWriteReq(MemReqPtr &req) = 0;
 
+    // Also somewhat obnoxious.  Really only used for the TLB fault.
     virtual TheISA::MachInst getInst() = 0;
 
     virtual void copyArchRegs(ExecContext *xc) = 0;
@@ -180,6 +193,8 @@ class ExecContext
 
     virtual Fault setMiscRegWithEffect(int misc_reg, const MiscReg &val) = 0;
 
+    // Also not necessarily the best location for these two.  Hopefully will go
+    // away once we decide upon where st cond failures goes.
     virtual unsigned readStCondFailures() = 0;
 
     virtual void setStCondFailures(unsigned sc_failures) = 0;
@@ -189,20 +204,12 @@ class ExecContext
     virtual void setIntrFlag(int val) = 0;
     virtual Fault hwrei() = 0;
     virtual bool inPalMode() = 0;
-    virtual void ev5_trap(Fault fault) = 0;
     virtual bool simPalCheck(int palFunc) = 0;
 #endif
 
+    // Only really makes sense for old CPU model.  Still could be useful though.
     virtual bool misspeculating() = 0;
 
-    /** Meant to be more generic trap function to be
-     *  called when an instruction faults.
-     *  @param fault The fault generated by executing the instruction.
-     *  @todo How to do this properly so it's dependent upon ISA only?
-     */
-
-    virtual void trap(Fault fault) = 0;
-
 #if !FULL_SYSTEM
     virtual IntReg getSyscallArg(int i) = 0;
 
@@ -213,6 +220,7 @@ class ExecContext
 
     virtual void syscall() = 0;
 
+    // Same with st cond failures.
     virtual Counter readFuncExeInst() = 0;
 
     virtual void setFuncExeInst(Counter new_val) = 0;
@@ -253,6 +261,8 @@ class ProxyExecContext : public ExecContext
 
     Status status() const { return actualXC->status(); }
 
+    void setStatus(Status new_status) { actualXC->setStatus(new_status); }
+
     /// Set the status to Active.  Optional delay indicates number of
     /// cycles to wait before beginning execution.
     void activate(int delay = 1) { actualXC->activate(delay); }
@@ -279,6 +289,13 @@ class ProxyExecContext : public ExecContext
     void unserialize(Checkpoint *cp, const std::string &section)
     { actualXC->unserialize(cp, section); }
 
+#if FULL_SYSTEM
+    Event *getQuiesceEvent() { return actualXC->getQuiesceEvent(); }
+
+    Tick readLastActivate() { return actualXC->readLastActivate(); }
+    Tick readLastSuspend() { return actualXC->readLastSuspend(); }
+#endif
+
     int getThreadNum() { return actualXC->getThreadNum(); }
 
     bool validInstAddr(Addr addr) { return actualXC->validInstAddr(addr); }
@@ -365,21 +382,11 @@ class ProxyExecContext : public ExecContext
 
     bool inPalMode() { return actualXC->inPalMode(); }
 
-    void ev5_trap(Fault fault) { actualXC->ev5_trap(fault); }
-
     bool simPalCheck(int palFunc) { return actualXC->simPalCheck(palFunc); }
 #endif
 
     // @todo: Fix this!
-    bool misspeculating() { return false; }
-
-    /** Meant to be more generic trap function to be
-     *  called when an instruction faults.
-     *  @param fault The fault generated by executing the instruction.
-     *  @todo How to do this properly so it's dependent upon ISA only?
-     */
-
-    void trap(Fault fault) { actualXC->trap(fault); }
+    bool misspeculating() { return actualXC->misspeculating(); }
 
 #if !FULL_SYSTEM
     IntReg getSyscallArg(int i) { return actualXC->getSyscallArg(i); }
diff --git a/cpu/intr_control.cc b/cpu/intr_control.cc
index d1866a0c4..43e7f654c 100644
--- a/cpu/intr_control.cc
+++ b/cpu/intr_control.cc
@@ -30,6 +30,7 @@
 #include <vector>
 
 #include "cpu/base.hh"
+#include "cpu/exec_context.hh"
 #include "cpu/intr_control.hh"
 #include "sim/builder.hh"
 #include "sim/sim_object.hh"
diff --git a/cpu/profile.cc b/cpu/profile.cc
index 1a38792a0..fe3458b61 100644
--- a/cpu/profile.cc
+++ b/cpu/profile.cc
@@ -32,6 +32,7 @@
 #include "base/callback.hh"
 #include "base/statistics.hh"
 #include "base/trace.hh"
+#include "base/loader/symtab.hh"
 #include "cpu/base.hh"
 #include "cpu/exec_context.hh"
 #include "cpu/profile.hh"
diff --git a/cpu/profile.hh b/cpu/profile.hh
index 1eb012a27..d55c9eec9 100644
--- a/cpu/profile.hh
+++ b/cpu/profile.hh
@@ -35,6 +35,8 @@
 #include "sim/host.hh"
 #include "arch/stacktrace.hh"
 
+class ExecContext;
+
 class ProfileNode
 {
   private:
diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc
index 38b43fef5..fd0163677 100644
--- a/cpu/simple/cpu.cc
+++ b/cpu/simple/cpu.cc
@@ -766,7 +766,7 @@ SimpleCPU::tick()
 
         // decode the instruction
         inst = gtoh(inst);
-        curStaticInst = StaticInst::decode(makeExtMI(inst, xc->readPC()));
+        curStaticInst = StaticInst::decode(makeExtMI(inst, cpuXC->readPC()));
 
         traceData = Trace::getInstRecord(curTick, xcProxy, this, curStaticInst,
                                          cpuXC->readPC());
diff --git a/dev/tsunami_cchip.cc b/dev/tsunami_cchip.cc
index d311df4f5..2649fe27a 100644
--- a/dev/tsunami_cchip.cc
+++ b/dev/tsunami_cchip.cc
@@ -42,6 +42,7 @@
 #include "mem/bus/pio_interface.hh"
 #include "mem/bus/pio_interface_impl.hh"
 #include "mem/functional/memory_control.hh"
+#include "cpu/exec_context.hh"
 #include "cpu/intr_control.hh"
 #include "sim/builder.hh"
 #include "sim/system.hh"
diff --git a/kern/kernel_stats.cc b/kern/kernel_stats.cc
index 988b0f639..a887ebf09 100644
--- a/kern/kernel_stats.cc
+++ b/kern/kernel_stats.cc
@@ -35,6 +35,7 @@
 #include "cpu/exec_context.hh"
 #include "kern/kernel_stats.hh"
 #include "kern/tru64/tru64_syscalls.hh"
+#include "sim/system.hh"
 
 using namespace std;
 using namespace Stats;
diff --git a/kern/linux/events.cc b/kern/linux/events.cc
index a781165ac..9f50eef04 100644
--- a/kern/linux/events.cc
+++ b/kern/linux/events.cc
@@ -32,6 +32,7 @@
 #include "kern/linux/events.hh"
 #include "kern/linux/printk.hh"
 #include "kern/system_events.hh"
+#include "sim/system.hh"
 
 
 namespace Linux {
@@ -41,7 +42,7 @@ DebugPrintkEvent::process(ExecContext *xc)
 {
     if (DTRACE(DebugPrintf)) {
         if (!raw) {
-            StringWrap name(xc->system->name() + ".dprintk");
+            StringWrap name(xc->getSystemPtr()->name() + ".dprintk");
             DPRINTFN("");
         }
 
diff --git a/kern/tru64/dump_mbuf.cc b/kern/tru64/dump_mbuf.cc
index 25ed82ef3..c3c37531a 100644
--- a/kern/tru64/dump_mbuf.cc
+++ b/kern/tru64/dump_mbuf.cc
@@ -31,9 +31,11 @@
 
 #include "base/cprintf.hh"
 #include "base/trace.hh"
+#include "base/loader/symtab.hh"
 #include "cpu/exec_context.hh"
 #include "kern/tru64/mbuf.hh"
 #include "sim/host.hh"
+#include "sim/system.hh"
 #include "arch/arguments.hh"
 #include "arch/isa_traits.hh"
 #include "arch/vtophys.hh"
diff --git a/kern/tru64/tru64_events.cc b/kern/tru64/tru64_events.cc
index 12aae6950..8f2be6d9b 100644
--- a/kern/tru64/tru64_events.cc
+++ b/kern/tru64/tru64_events.cc
@@ -35,6 +35,7 @@
 #include "mem/functional/memory_control.hh"
 #include "arch/arguments.hh"
 #include "arch/isa_traits.hh"
+#include "sim/system.hh"
 
 using namespace TheISA;
 
diff --git a/sim/pseudo_inst.cc b/sim/pseudo_inst.cc
index 85b26ef23..e475006e7 100644
--- a/sim/pseudo_inst.cc
+++ b/sim/pseudo_inst.cc
@@ -83,13 +83,15 @@ namespace AlphaPseudo
         if (!doQuiesce || ns == 0)
             return;
 
-        if (xc->quiesceEvent.scheduled())
-            xc->quiesceEvent.reschedule(curTick + Clock::Int::ns * ns);
+        Event *quiesceEvent = xc->getQuiesceEvent();
+
+        if (quiesceEvent->scheduled())
+            quiesceEvent->reschedule(curTick + Clock::Int::ns * ns);
         else
-            xc->quiesceEvent.schedule(curTick + Clock::Int::ns * ns);
+            quiesceEvent->schedule(curTick + Clock::Int::ns * ns);
 
         xc->suspend();
-        xc->kernelStats->quiesce();
+        xc->getCpuPtr()->kernelStats->quiesce();
     }
 
     void
@@ -98,19 +100,23 @@ namespace AlphaPseudo
         if (!doQuiesce || cycles == 0)
             return;
 
-        if (xc->quiesceEvent.scheduled())
-            xc->quiesceEvent.reschedule(curTick + xc->cpu->cycles(cycles));
+        Event *quiesceEvent = xc->getQuiesceEvent();
+
+        if (quiesceEvent->scheduled())
+            quiesceEvent->reschedule(curTick +
+                                     xc->getCpuPtr()->cycles(cycles));
         else
-            xc->quiesceEvent.schedule(curTick + xc->cpu->cycles(cycles));
+            quiesceEvent->schedule(curTick +
+                                   xc->getCpuPtr()->cycles(cycles));
 
         xc->suspend();
-        xc->kernelStats->quiesce();
+        xc->getCpuPtr()->kernelStats->quiesce();
     }
 
     uint64_t
     quiesceTime(ExecContext *xc)
     {
-        return (xc->lastActivate - xc->lastSuspend) / Clock::Int::ns ;
+        return (xc->readLastActivate() - xc->readLastSuspend()) / Clock::Int::ns;
     }
 
     void