Merge ktlim@zizzer:/bk/m5

into  zamp.eecs.umich.edu:/z/ktlim2/m5-shadowregs

arch/alpha/ev5.cc:
    Remove intr_post, it is no longer used.
arch/alpha/isa_traits.hh:
    Hand merge.

--HG--
extra : convert_revision : 94f14539a9e5646f8c368b15b2dff18ab2f492cf

diff --cc arch/alpha/ev5.cc
index c6da628bee230bd159c8892fc95ff63eb104d478,2cbfe7fd6fba17735acfa5809ab6ac27c43805a7..e313c1a1c1020e90d80bbdb8c05805e61d3c4a6a
--- 1/arch/alpha/ev5.cc
--- 2/arch/alpha/ev5.cc
+++ b/arch/alpha/ev5.cc
@@@ -163,33 -134,35 +134,6 @@@ AlphaISA::zeroRegisters(CPU *cpu
      cpu->xc->setFloatRegDouble(ZeroReg, 0.0);
  }
  
--void
- AlphaISA::intr_post(RegFile *regs, Fault fault, Addr pc)
 -ExecContext::ev5_temp_trap(Fault fault)
--{
- /*    bool use_pc = (fault == NoFault);
 -    DPRINTF(Fault, "Fault %s at PC: %#x\n", fault->name(), regs.pc);
 -    cpu->recordEvent(csprintf("Fault %s", fault->name()));
 -
 -    assert(!misspeculating());
 -    kernelStats->fault(fault);
--
--    if (fault->isA<ArithmeticFault>())
-         panic("arithmetic faults NYI...");
 -        panic("Arithmetic traps are unimplemented!");
--
-     // compute exception restart address
-     if (use_pc || fault->isA<PalFault>() || fault->isA<ArithmeticFault>()) {
-         // traps...  skip faulting instruction
-         regs->miscRegs.setReg(IPR_EXC_ADDR, regs->pc + 4);
-     } else {
-         // fault, post fault at excepting instruction
-         regs->miscRegs.setReg(IPR_EXC_ADDR, regs->pc);
 -    // exception restart address
 -    if (!fault->isA<InterruptFault>() || !inPalMode())
 -        setMiscReg(AlphaISA::IPR_EXC_ADDR, regs.pc);
 -
 -    if (fault->isA<PalFault>() || fault->isA<ArithmeticFault>() /* ||
 -        fault == InterruptFault && !inPalMode() */) {
 -        // traps...  skip faulting instruction.
 -        setMiscReg(AlphaISA::IPR_EXC_ADDR,
 -                   readMiscReg(AlphaISA::IPR_EXC_ADDR) + 4);
--    }
--
-     // jump to expection address (PAL PC bit set here as well...)
-     if (!use_pc)
-         regs->npc = regs->miscRegs.readReg(IPR_PAL_BASE) +
-             (dynamic_cast<AlphaFault *>(fault.get()))->vect();
-     else
-         regs->npc = regs->miscRegs.readReg(IPR_PAL_BASE) + pc;
- */
-     // that's it! (orders of magnitude less painful than x86)
 -    regs.pc = readMiscReg(AlphaISA::IPR_PAL_BASE) +
 -        (dynamic_cast<AlphaFault *>(fault.get()))->vect();
 -    regs.npc = regs.pc + sizeof(MachInst);
--}
 -
--
  Fault
  ExecContext::hwrei()
  {

diff --cc arch/alpha/isa_traits.hh
index b8aeffdde214918a7b45725874cb275689787a9a,b1980b4b68dde2107086fa67765860db05a6bb84..a551db485e6a04f07226610806f4f6c8f007db04
--- 1/arch/alpha/isa_traits.hh
--- 2/arch/alpha/isa_traits.hh
+++ b/arch/alpha/isa_traits.hh
@@@ -57,6 -57,8 +57,7 @@@ namespace AlphaIS
  {
  
      typedef uint32_t MachInst;
 -//    typedef uint64_t Addr;
+     typedef uint64_t ExtMachInst;
      typedef uint8_t  RegIndex;
  
      enum {

diff --cc cpu/simple/cpu.cc
Simple merge