[gem5-dev] changeset in gem5: IO: Handle case where ISA Fake device is bein...

[Ali Saidi]

changeset 7d0669201f80 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=7d0669201f80
description:
        IO: Handle case where ISA Fake device is being used as a fake memory.

diffstat:

 src/dev/Device.py       |  2 ++
 src/dev/arm/RealView.py |  6 ++++--
 src/dev/isa_fake.cc     |  8 ++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diffs (61 lines):

diff -r 3893d9d2c6c2 -r 7d0669201f80 src/dev/Device.py
--- a/src/dev/Device.py Sun Jul 10 12:56:08 2011 -0500
+++ b/src/dev/Device.py Sun Jul 10 12:56:08 2011 -0500
@@ -64,6 +64,8 @@
     ret_bad_addr = Param.Bool(False, "Return pkt status bad address on access")
     update_data = Param.Bool(False, "Update the data that is returned on 
writes")
     warn_access = Param.String("", "String to print when device is accessed")
+    fake_mem = Param.Bool(False,
+      "Is this device acting like a memory and thus may get a cache line sized 
req")
 
 class BadAddr(IsaFake):
     pio_addr = 0
diff -r 3893d9d2c6c2 -r 7d0669201f80 src/dev/arm/RealView.py
--- a/src/dev/arm/RealView.py   Sun Jul 10 12:56:08 2011 -0500
+++ b/src/dev/arm/RealView.py   Sun Jul 10 12:56:08 2011 -0500
@@ -146,7 +146,8 @@
 
 
     l2x0_fake     = IsaFake(pio_addr=0x1f002000, pio_size=0xfff)
-    flash_fake    = IsaFake(pio_addr=0x40000000, pio_size=0x20000000)
+    flash_fake    = IsaFake(pio_addr=0x40000000, pio_size=0x20000000,
+                            fake_mem=True)
     dmac_fake     = AmbaFake(pio_addr=0x10030000)
     uart1_fake    = AmbaFake(pio_addr=0x1000a000)
     uart2_fake    = AmbaFake(pio_addr=0x1000b000)
@@ -213,7 +214,8 @@
     kmi1   = Pl050(pio_addr=0x10007000, int_num=21, is_mouse=True)
 
     l2x0_fake     = IsaFake(pio_addr=0x1f002000, pio_size=0xfff, 
warn_access="1")
-    flash_fake    = IsaFake(pio_addr=0x40000000, pio_size=0x20000000-1)
+    flash_fake    = IsaFake(pio_addr=0x40000000, pio_size=0x20000000-1,
+                            fake_mem=True)
     dmac_fake     = AmbaFake(pio_addr=0x10030000)
     uart1_fake    = AmbaFake(pio_addr=0x1000a000)
     uart2_fake    = AmbaFake(pio_addr=0x1000b000)
diff -r 3893d9d2c6c2 -r 7d0669201f80 src/dev/isa_fake.cc
--- a/src/dev/isa_fake.cc       Sun Jul 10 12:56:08 2011 -0500
+++ b/src/dev/isa_fake.cc       Sun Jul 10 12:56:08 2011 -0500
@@ -56,8 +56,9 @@
 Tick
 IsaFake::read(PacketPtr pkt)
 {
+    pkt->allocate();
+    pkt->makeAtomicResponse();
 
-    pkt->makeAtomicResponse();
     if (params()->warn_access != "")
         warn("Device %s accessed by read to address %#x size=%d\n",
                 name(), pkt->getAddr(), pkt->getSize());
@@ -83,7 +84,10 @@
              pkt->set(retData8);
              break;
           default:
-            panic("invalid access size!\n");
+             if (params()->fake_mem)
+                 std::memset(pkt->getPtr<uint8_t>(), 0, pkt->getSize());
+             else
+                 panic("invalid access size! Device being accessed by 
cache?\n");
         }
     }
     return pioDelay;
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev