diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2005-02-03 23:51:02 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2005-02-03 23:51:02 -0500 |
| commit | b78d7c2f16dac11ed468de45a088a362605c6493 (patch) | |
| tree | ed8bff9b7385fd167efc6833a1a14cc947ab6d75 | |
| parent | 6dd5509490c5841d32023cb3de25a6f4ee2a7ab9 (diff) | |
| parent | 7e559f6c50e38272a6f2ab46ea49394413597634 (diff) | |
| download | gem5-b78d7c2f16dac11ed468de45a088a362605c6493.tar.xz | |
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision : 0151e501074988eedb52d91254870c265935f229
| -rw-r--r-- | configs/boot/devtime.rcS | 8 | ||||
| -rw-r--r-- | dev/tsunami_cchip.cc | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/configs/boot/devtime.rcS b/configs/boot/devtime.rcS new file mode 100644 index 000000000..91fddc20d --- /dev/null +++ b/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 + 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: |