summaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2005-02-13 23:05:47 -0500
committerAli Saidi <saidi@eecs.umich.edu>2005-02-13 23:05:47 -0500
commit538d7d19c8dd314ada10ffc0b465d75cb252bc55 (patch)
tree3ac9110ec566ea8cc0878cf96939e27a533815bc /dev
parent10ee909fbd895b588bf01021af98e81a3ae40fc0 (diff)
parent57482491c5eeb3e52f2f29f5f56040445004cb43 (diff)
downloadgem5-538d7d19c8dd314ada10ffc0b465d75cb252bc55.tar.xz
Merge
--HG-- extra : convert_revision : 10c28ac66c7e71615a239783e21ab36a47de992c
Diffstat (limited to 'dev')
-rw-r--r--dev/tsunami_cchip.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/dev/tsunami_cchip.cc b/dev/tsunami_cchip.cc
index 6bf4d8b57..2fb293fbf 100644
--- a/dev/tsunami_cchip.cc
+++ b/dev/tsunami_cchip.cc
@@ -176,7 +176,7 @@ TsunamiCChip::read(MemReqPtr &req, uint8_t *data)
if (regnum == TSDEV_CC_DRIR) {
warn("accessing DRIR with 32 bit read, "
"hopefully your just reading this for timing");
- *(uint64_t*)data = drir;
+ *(uint32_t*)data = drir;
} else
panic("invalid access size(?) for tsunami register!\n");
return No_Fault;