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

[gem5.git] / src / mem / cache / tags / iic.hh

diff --git a/src/mem/cache/tags/iic.hh b/src/mem/cache/tags/iic.hh
index 6628f7e7a9debc31ff454dfe275f72c61850321d..d0663d3301af9e5e1e953df809fe4864af988503 100644 (file)
--- a/src/mem/cache/tags/iic.hh
+++ b/src/mem/cache/tags/iic.hh
@@ -117,7 +117,7 @@ class IICSet{
      * @param chain_ptr The chain pointer to start the search of the secondary
      * @return Pointer to the tag, NULL if not found.
      */
-    IICTag* findTag(int asid, Addr tag, unsigned long &chain_ptr)
+    IICTag* findTag( Addr tag, unsigned long &chain_ptr)
     {
         depth = 1;
         for (int i = 0; i < assoc; ++i) {
@@ -401,7 +401,7 @@ class IIC : public BaseTags
      * @param addr The address to find.
      * @return true if it is found.
      */
-    bool probe(int asid, Addr addr) const;
+    bool probe(Addr addr) const;
 
     /**
      * Swap the position of two tags.
@@ -435,11 +435,10 @@ class IIC : public BaseTags
     void compressBlock(unsigned long index);
 
     /**
-     * Invalidate the block containing the address.
-     * @param asid The address space ID.
-     * @param addr The address to invalidate.
+     * Invalidate a block.
+     * @param blk The block to invalidate.
      */
-    void invalidateBlk(int asid, Addr addr);
+    void invalidateBlk(BlkType *blk);
 
     /**
      * Find the block and update the replacement data. This call also returns
@@ -449,16 +448,7 @@ class IIC : public BaseTags
      * @param lat The access latency.
      * @return A pointer to the block found, if any.
      */
-    IICTag* findBlock(Addr addr, int asid, int &lat);
-
-    /**
-     * Find the block and update the replacement data. This call also returns
-     * the access latency as a side effect.
-     * @param req The req whose block to find
-     * @param lat The access latency.
-     * @return A pointer to the block found, if any.
-     */
-    IICTag* findBlock(Packet * &pkt, int &lat);
+    IICTag* findBlock(Addr addr, int &lat);
 
     /**
      * Find the block, do not update the replacement data.
@@ -466,16 +456,16 @@ class IIC : public BaseTags
      * @param asid The address space ID.
      * @return A pointer to the block found, if any.
      */
-    IICTag* findBlock(Addr addr, int asid) const;
+    IICTag* findBlock(Addr addr) const;
 
     /**
      * Find a replacement block for the address provided.
-     * @param req The request to a find a replacement candidate for.
+     * @param pkt The request to a find a replacement candidate for.
      * @param writebacks List for any writebacks to be performed.
      * @param compress_blocks List of blocks to compress, for adaptive comp.
      * @return The block to place the replacement in.
      */
-    IICTag* findReplacement(Packet * &pkt, PacketList &writebacks,
+    IICTag* findReplacement(PacketPtr &pkt, PacketList &writebacks,
                             BlkList &compress_blocks);
 
     /**
@@ -497,22 +487,6 @@ class IIC : public BaseTags
     void writeData(IICTag *blk, uint8_t *data, int size,
                    PacketList & writebacks);
 
-    /**
-     * Perform a block aligned copy from the source address to the destination.
-     * @param source The block-aligned source address.
-     * @param dest The block-aligned destination address.
-     * @param asid The address space DI.
-     * @param writebacks List for any generated writeback requests.
-     */
-    void doCopy(Addr source, Addr dest, int asid, PacketList &writebacks);
-
-    /**
-     * If a block is currently marked copy on write, copy it before writing.
-     * @param req The write request.
-     * @param writebacks List for any generated writeback requests.
-     */
-    void fixCopy(Packet * &pkt, PacketList &writebacks);
-
     /**
      * Called at end of simulation to complete average block reference stats.
      */
@@ -534,7 +508,7 @@ private:
      * @param depth The number of hash lookups made while searching.
      * @return A pointer to the block if found.
      */
-    IICTag *secondaryChain(int asid, Addr tag, unsigned long chain_ptr,
+    IICTag *secondaryChain(Addr tag, unsigned long chain_ptr,
                             int *depth) const;
 
     /**