Merge gblack@m5.eecs.umich.edu:/bk/multiarch

into  ewok.(none):/home/gblack/m5/multiarch

SConscript:
arch/alpha/ev5.cc:
dev/alpha_console.cc:
    Hand merged

--HG--
extra : convert_revision : 318a671e6803400d3ed086a90e70d6790e4f6b19

diff --cc arch/alpha/ev5.cc
index 3f1c17adcb865b8fdfa2cabf78bbf0dfa5234305,14b87b16fad47ba64c24d0bc4776422552fa6d10..34b328a39f8846f37e6fd1680f3b9e4aaab9d147
--- 1/arch/alpha/ev5.cc
--- 2/arch/alpha/ev5.cc
+++ b/arch/alpha/ev5.cc
@@@ -76,7 -76,10 +76,10 @@@ AlphaISA::initCPU(RegFile *regs, int cp
      // CPU comes up with PAL regs enabled
      swap_palshadow(regs, true);
  
 -    regs->pc = regs->ipr[IPR_PAL_BASE] + fault_addr(ResetFault);
+     regs->intRegFile[16] = cpuId;
+     regs->intRegFile[0] = cpuId;
+ 
 +    regs->pc = regs->ipr[IPR_PAL_BASE] + (new ResetFault)->vect();
      regs->npc = regs->pc + sizeof(MachInst);
  }
  

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

diff --cc dev/alpha_console.cc
Simple merge