summaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2005-02-03 23:51:02 -0500
committerAli Saidi <saidi@eecs.umich.edu>2005-02-03 23:51:02 -0500
commitb78d7c2f16dac11ed468de45a088a362605c6493 (patch)
treeed8bff9b7385fd167efc6833a1a14cc947ab6d75 /dev
parent6dd5509490c5841d32023cb3de25a6f4ee2a7ab9 (diff)
parent7e559f6c50e38272a6f2ab46ea49394413597634 (diff)
downloadgem5-b78d7c2f16dac11ed468de45a088a362605c6493.tar.xz
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG-- extra : convert_revision : 0151e501074988eedb52d91254870c265935f229
Diffstat (limited to 'dev')
-rw-r--r--dev/tsunami_cchip.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/dev/tsunami_cchip.cc b/dev/tsunami_cchip.cc
index 823d1f118..6bf4d8b57 100644
--- a/dev/tsunami_cchip.cc
+++ b/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: