From: Ron Dreslinski <rdreslin@umich.edu>
Date: Wed, 22 Feb 2006 01:04:23 +0000 (-0500)
Subject: Some more changes for compilation.  Since memset is now part of port and not virtual... 
X-Git-Tag: m5_2.0_beta1~220
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1fff9f504f0655a5fe87d2fc1962fbb15d8a1a8f;p=gem5.git

Some more changes for compilation.  Since memset is now part of port and not virtual, no need for memory to define them.

mem/physical.cc:
    Return 0 for block size.  The chunk generator should treat this as a infinite size.
mem/physical.hh:
    Add function prototype
mem/port.hh:
    Fix function to take no arguments
mem/translating_port.cc:
mem/translating_port.hh:
    Remove the memsetBlob because it doesn't exist yet.

--HG--
extra : convert_revision : dfe352acfc2912ecc9a1ba1863e5666f46b991cc
---

diff --git a/mem/physical.cc b/mem/physical.cc
index 031d832dd..4c1743293 100644
--- a/mem/physical.cc
+++ b/mem/physical.cc
@@ -54,7 +54,7 @@ using namespace std;
 #if FULL_SYSTEM
 PhysicalMemory::PhysicalMemory(const string &n, Range<Addr> range,
                                MemoryController *mmu, const std::string &fname)
-    : FunctionalMemory(n), base_addr(range.start), pmem_size(range.size()),
+    : Memory(n), base_addr(range.start), pmem_size(range.size()),
       pmem_addr(NULL)
 {
     if (pmem_size % TheISA::PageBytes != 0)
@@ -167,8 +167,8 @@ PhysicalMemory::prot_memset(Addr addr, uint8_t val, int size)
 int
 PhysicalMemory::deviceBlockSize()
 {
-    //For now the largest accesses we can take are Page Sized
-    return VMPageSize;
+    //Can accept anysize request
+    return 0;
 }
 
 void
diff --git a/mem/physical.hh b/mem/physical.hh
index a98c52212..156a4da1d 100644
--- a/mem/physical.hh
+++ b/mem/physical.hh
@@ -64,6 +64,7 @@ class PhysicalMemory : public Memory
     void prot_access_error(Addr addr, int size, const std::string &func);
 
   public:
+    virtual int deviceBlockSize();
 
     // Read/Write arbitrary amounts of data to simulated memory space
     virtual void prot_read(Addr addr, uint8_t *p, int size);
diff --git a/mem/port.hh b/mem/port.hh
index 88cca885b..9d0bd7968 100644
--- a/mem/port.hh
+++ b/mem/port.hh
@@ -96,7 +96,7 @@ class Port
         /** Function to set the pointer for the peer port.
         @todo should be called by the configuration stuff (python).
     */
-    Port *getPeer(Port *port) { return peer; }
+    Port *getPeer() { return peer; }
 
   protected:
 
diff --git a/mem/translating_port.cc b/mem/translating_port.cc
index 4c2dd3acb..052d350b9 100644
--- a/mem/translating_port.cc
+++ b/mem/translating_port.cc
@@ -75,6 +75,7 @@ TranslatingPort::writeBlobFunctional(Addr addr, uint8_t *p, int size)
     return No_Fault;
 }
 
+/*
 Fault
 TranslatingPort::memsetBlobFunctional(Addr addr, uint8_t val, int size)
 {
@@ -90,6 +91,7 @@ TranslatingPort::memsetBlobFunctional(Addr addr, uint8_t val, int size)
 
     return No_Fault;
 }
+*/
 
 Fault
 TranslatingPort::writeStringFunctional(Addr addr, const char *str)
diff --git a/mem/translating_port.hh b/mem/translating_port.hh
index c8764bf41..671c32237 100644
--- a/mem/translating_port.hh
+++ b/mem/translating_port.hh
@@ -50,7 +50,7 @@ class TranslatingPort
   public:
     Fault readBlobFunctional(Addr addr, uint8_t *p, int size);
     Fault writeBlobFunctional(Addr addr, uint8_t *p, int size);
-    Fault memsetBlobFunctional(Addr addr, uint8_t val, int size);
+    //   Fault memsetBlobFunctional(Addr addr, uint8_t val, int size);
     Fault writeStringFunctional(Addr addr, const char *str);
     Fault readStringFunctional(std::string &str, Addr addr);