As Brad already pointed out, it'd be better just to go back where this code was commented out and remove it there. You ought to be able to qfold this patch into the earlier one to achieve that.
Steve On Tue, Jan 19, 2010 at 3:20 PM, Derek Hower <[email protected]> wrote: > # HG changeset patch > # User Derek Hower <[email protected]> > # Date 1252968766 18000 > # Node ID a78dc9a782b8b2e71755325f9f9bb031e244bb52 > # Parent 0bf5c598c9c5221632044a222d47a67f30ae38cd > ruby:removed unused code from CacheMemory > > diff --git a/src/mem/ruby/system/CacheMemory.hh > b/src/mem/ruby/system/CacheMemory.hh > --- a/src/mem/ruby/system/CacheMemory.hh > +++ b/src/mem/ruby/system/CacheMemory.hh > @@ -292,16 +292,6 @@ > if (m_cache[cacheSet][it->second]->m_Permission != > AccessPermission_NotPresent) > return it->second; > return -1; // Not found > - /* > - for (int i=0; i < m_cache_assoc; i++) { > - if ((m_cache[cacheSet][i] != NULL) && > - (m_cache[cacheSet][i]->m_Address == tag) && > - (m_cache[cacheSet][i]->m_Permission != AccessPermission_NotPresent)) > { > - return i; > - } > - } > - return -1; // Not found > - */ > } > > // Given a cache index: returns the index of the tag in a set. > @@ -315,15 +305,6 @@ > if (it != m_tag_index.end()) > return it->second; > return -1; // Not found > - /* > - assert(tag == line_address(tag)); > - // search the set for the tags > - for (int i=0; i < m_cache_assoc; i++) { > - if (m_cache[cacheSet][i] != NULL && m_cache[cacheSet][i]->m_Address == > tag) > - return i; > - } > - return -1; // Not found > - */ > } > > // PUBLIC METHODS > _______________________________________________ > m5-dev mailing list > [email protected] > http://m5sim.org/mailman/listinfo/m5-dev > _______________________________________________ m5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/m5-dev
