have sinic use the new readBar/writeBar stuff that's in the

pci device base class

dev/sinic.cc:
dev/sinic.hh:
    use the new readBar/writeBar stuff that's in the pci device
    base class

--HG--
extra : convert_revision : 8a0b2bde3cc13597785d6ea75d6e6811680bb01b

diff --git a/dev/sinic.cc b/dev/sinic.cc
index f03841ecd4c590e5cd563d269f58e2f90b6e9cee..ef2350d112dc10d245fe767fd9632735c3074fb8 100644 (file)
--- a/dev/sinic.cc
+++ b/dev/sinic.cc
@@ -335,10 +335,21 @@ Fault
 Device::read(MemReqPtr &req, uint8_t *data)
 {
     assert(config.command & PCI_CMD_MSE);
+    Fault fault = readBar(req, data);
 
-    //The mask is to give you only the offset into the device register file
-    Addr daddr = req->paddr & 0xfff;
+    if (fault == Machine_Check_Fault) {
+        panic("address does not map to a BAR pa=%#x va=%#x size=%d",
+              req->paddr, req->vaddr, req->size);
+
+        return Machine_Check_Fault;
+    }
 
+    return fault;
+}
+
+Fault
+Device::readBar0(MemReqPtr &req, Addr daddr, uint8_t *data)
+{
     if (!regValid(daddr))
         panic("invalid register: da=%#x pa=%#x va=%#x size=%d",
               daddr, req->paddr, req->vaddr, req->size);
@@ -414,10 +425,21 @@ Fault
 Device::write(MemReqPtr &req, const uint8_t *data)
 {
     assert(config.command & PCI_CMD_MSE);
+    Fault fault = writeBar(req, data);
 
-    //The mask is to give you only the offset into the device register file
-    Addr daddr = req->paddr & 0xfff;
+    if (fault == Machine_Check_Fault) {
+        panic("address does not map to a BAR pa=%#x va=%#x size=%d",
+              req->paddr, req->vaddr, req->size);
+
+        return Machine_Check_Fault;
+    }
 
+    return fault;
+}
+
+Fault
+Device::writeBar0(MemReqPtr &req, Addr daddr, const uint8_t *data)
+{
     if (!regValid(daddr))
         panic("invalid address: da=%#x pa=%#x va=%#x size=%d",
               daddr, req->paddr, req->vaddr, req->size);

diff --git a/dev/sinic.hh b/dev/sinic.hh
index 4a772d4c5fb434e2a54ae7918c98183c0ae4f117..b9089cd5326e5c14cea8fc41222fb2b3af7c1462 100644 (file)
--- a/dev/sinic.hh
+++ b/dev/sinic.hh
@@ -259,10 +259,13 @@ class Device : public Base
  * Memory Interface
  */
   public:
-    void prepareRead();
-    Fault iprRead(Addr daddr, uint64_t &result);
     virtual Fault read(MemReqPtr &req, uint8_t *data);
     virtual Fault write(MemReqPtr &req, const uint8_t *data);
+
+    void prepareRead();
+    Fault iprRead(Addr daddr, uint64_t &result);
+    Fault readBar0(MemReqPtr &req, Addr daddr, uint8_t *data);
+    Fault writeBar0(MemReqPtr &req, Addr daddr, const uint8_t *data);
     Tick cacheAccess(MemReqPtr &req);
 
 /**