ruby: slicc: remove nextLineHack from Type.py

[gem5.git] / src / mem / se_translating_port_proxy.hh

diff --git a/src/mem/se_translating_port_proxy.hh b/src/mem/se_translating_port_proxy.hh
index 71e8b4f502255c6350415f3619ec596d786c3b51..58d0c9bcdff71507f6dc9cfec7c19f8f32c87cf6 100644 (file)
--- a/src/mem/se_translating_port_proxy.hh
+++ b/src/mem/se_translating_port_proxy.hh
@@ -47,7 +47,8 @@
 
 #include "mem/page_table.hh"
 #include "mem/port_proxy.hh"
-#include "sim/process.hh"
+
+class Process;
 
 /**
  * @file
@@ -74,26 +75,26 @@ class SETranslatingPortProxy : public PortProxy
     };
 
   private:
-    PageTable *pTable;
+    PageTableBase *pTable;
     Process *process;
     AllocType allocating;
 
   public:
-    SETranslatingPortProxy(Port& port, Process* p, AllocType alloc);
+    SETranslatingPortProxy(MasterPort& port, Process* p, AllocType alloc);
     virtual ~SETranslatingPortProxy();
 
-    bool tryReadBlob(Addr addr, uint8_t *p, int size);
-    bool tryWriteBlob(Addr addr, uint8_t *p, int size);
-    bool tryMemsetBlob(Addr addr, uint8_t val, int size);
-    bool tryWriteString(Addr addr, const char *str);
-    bool tryReadString(std::string &str, Addr addr);
+    bool tryReadBlob(Addr addr, uint8_t *p, int size) const;
+    bool tryWriteBlob(Addr addr, const uint8_t *p, int size) const;
+    bool tryMemsetBlob(Addr addr, uint8_t val, int size) const;
+    bool tryWriteString(Addr addr, const char *str) const;
+    bool tryReadString(std::string &str, Addr addr) const;
 
-    virtual void readBlob(Addr addr, uint8_t *p, int size);
-    virtual void writeBlob(Addr addr, uint8_t *p, int size);
-    virtual void memsetBlob(Addr addr, uint8_t val, int size);
+    virtual void readBlob(Addr addr, uint8_t *p, int size) const;
+    virtual void writeBlob(Addr addr, const uint8_t *p, int size) const;
+    virtual void memsetBlob(Addr addr, uint8_t val, int size) const;
 
-    void writeString(Addr addr, const char *str);
-    void readString(std::string &str, Addr addr);
+    void writeString(Addr addr, const char *str) const;
+    void readString(std::string &str, Addr addr) const;
 };
 
 #endif // __MEM_SE_TRANSLATING_PORT_PROXY_HH__