Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5

--HG--
extra : convert_revision : 0151e501074988eedb52d91254870c265935f229

configs/boot/devtime.rcS

@@ -0,0 +1,8 @@
+insmod /modules/devtime.ko dataAddr=0x9000004 count=100
+rmmod devtime
+insmod /modules/devtime.ko dataAddr=0x1a0000300 count=100
+rmmod devtime
+insmod /modules/devtime.ko memTest=1 count=100
+rmmod devtime
+m5 exit
+

dev/tsunami_cchip.cc

@@ -173,6 +173,13 @@ TsunamiCChip::read(MemReqPtr &req, uint8_t *data)
 
       break;
       case sizeof(uint32_t):
+          if (regnum == TSDEV_CC_DRIR) {
+              warn("accessing DRIR with 32 bit read, "
+                   "hopefully your just reading this for timing");
+              *(uint64_t*)data = drir;
+          } else
+              panic("invalid access size(?) for tsunami register!\n");
+          return No_Fault;
       case sizeof(uint16_t):
       case sizeof(uint8_t):
       default: