Merge m5.eecs.umich.edu:/bk/newmem

into  ewok.(none):/home/gblack/m5/newmem

--HG--
extra : convert_revision : bd6352647798275a12d52d55a129cdddd8e25423

1 files changed, 4 insertions, 15 deletions

diff --git a/mem/physical.hh b/mem/physical.hh
index 6d7d809a1..53e86f85f 100644
--- a/mem/physical.hh
+++ b/mem/physical.hh
@@ -63,14 +63,12 @@ class PhysicalMemory : public MemObject
 
         virtual void recvStatusChange(Status status);
 
-        virtual void getDeviceAddressRanges(AddrRangeList &range_list,
-                                            bool &owner);
+        virtual void getDeviceAddressRanges(AddrRangeList &resp,
+                                            AddrRangeList &snoop);
 
         virtual int deviceBlockSize();
     };
 
-    virtual Port *getPort(const std::string &if_name);
-
     int numPorts;
 
     int lat;
@@ -107,7 +105,8 @@ class PhysicalMemory : public MemObject
 
   public:
     int deviceBlockSize();
-    void getAddressRanges(AddrRangeList &rangeList, bool &owner);
+    void getAddressRanges(AddrRangeList &resp, AddrRangeList &snoop);
+    virtual Port *getPort(const std::string &if_name);
     void virtual init() { port->sendStatusChange(Port::RangeChange); }
 
     // fast back-door memory access for vtophys(), remote gdb, etc.
@@ -125,14 +124,4 @@ class PhysicalMemory : public MemObject
 
 };
 
-/*uint64_t
-PhysicalMemory::phys_read_qword(Addr addr) const
-{
-    if (addr + sizeof(uint64_t) > pmem_size)
-        return 0;
-
-    return *(uint64_t *)(pmem_addr + addr);
-}*/
-
-
 #endif //__PHYSICAL_MEMORY_HH__