Merge zizzer:/bk/m5

into  zeep.eecs.umich.edu:/z/saidi/work/m5.head

cpu/simple/cpu.cc:
    remove initCPU from constructor
dev/alpha_console.cc:
    we are panicing, so no need to return a fault

--HG--
extra : convert_revision : 72389ea0c96e91a55f35b884200325224bfb6ed9

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

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

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

diff --cc dev/alpha_console.cc
index 0f36e63fb961a7641e65baed82924c42ee637982,a520e7ea9708cc773228814d6eb83eaf1a1b3a28..2e8bbd1dd547d6a0e93b98f7ea68ea6b1184cdd7
--- 1/dev/alpha_console.cc
--- 2/dev/alpha_console.cc
+++ b/dev/alpha_console.cc
@@@ -257,10 -241,17 +242,17 @@@ AlphaConsole::write(MemReqPtr &req, con
          break;
  
        default:
-         return MachineCheckFault;
+         int cpunum = (daddr - offsetof(AlphaAccess, cpuStack)) /
+                      sizeof(alphaAccess->cpuStack[0]);
+         warn("%d: Trying to launch CPU number %d!", curTick, cpunum);
+         assert(val > 0 && "Must not access primary cpu");
+         if (cpunum >= 0 && cpunum < 64)
+             alphaAccess->cpuStack[cpunum] = val;
+         else
+             panic("Unknown 64bit access, %#x\n", daddr);
      }
  
 -    return No_Fault;
 +    return NoFault;
  }
  
  Tick

diff --cc sim/system.cc
Simple merge