From: Ali Saidi <saidi@eecs.umich.edu>
Date: Thu, 23 Feb 2006 20:06:06 +0000 (-0500)
Subject: Merge zizzer:/bk/m5
X-Git-Tag: m5_2.0_beta1~87^2~35^2~17
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e1c3acd91c65ae7d51a7d0b3c0f7be764b2c8f79;p=gem5.git

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

e1c3acd91c65ae7d51a7d0b3c0f7be764b2c8f79
diff --cc dev/alpha_console.cc
index 0f36e63fb,a520e7ea9..2e8bbd1dd
--- a/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