From: Gabe Black <gblack@eecs.umich.edu>
Date: Fri, 24 Feb 2006 23:45:28 +0000 (-0500)
Subject: Merge gblack@m5.eecs.umich.edu:/bk/multiarch
X-Git-Tag: m5_2.0_beta1~87^2~71
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e66f521d5be35683fc9460b2c4d6b7fb35fad940;p=gem5.git

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
---

e66f521d5be35683fc9460b2c4d6b7fb35fad940
diff --cc arch/alpha/ev5.cc
index 3f1c17adc,14b87b16f..34b328a39
--- a/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->intRegFile[16] = cpuId;
+     regs->intRegFile[0] = cpuId;
+ 
 -    regs->pc = regs->ipr[IPR_PAL_BASE] + fault_addr(ResetFault);
 +    regs->pc = regs->ipr[IPR_PAL_BASE] + (new ResetFault)->vect();
      regs->npc = regs->pc + sizeof(MachInst);
  }