diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cache.h | 29 | ||||
| -rw-r--r-- | inc/definitions.h | 5 |
2 files changed, 9 insertions, 25 deletions
diff --git a/inc/cache.h b/inc/cache.h index b55b30c..0eee833 100644 --- a/inc/cache.h +++ b/inc/cache.h @@ -75,29 +75,14 @@ nn * Constructor. */ int priming_address(int address); /** - * Walks the ways in this set of ways. If none of the tags match, returns -1. Otherwise, returns - * the index the matching data is located. + * Searches the set of ways in cache belonging to `index' for `tag'. If a match is found, + * returns the true index into the table. If a match is not found, returns a address suitable to + * replace, dictated by the LRU replacement policy.. * @param an index aligned to the set of ways in `this->data' * @param the tag to be matched - * @return -1 if the tag is not present in this set of ways (not in cache), or the true index if - * the tag is present. + * @return the true index if the tag is present, or the index to be replaced if not. */ - int is_address_missing(int true_index, int tag); - /** - * Converts an index into a set of ways into an index into `this->data', which is a - * 1D array. The next `this->ways' entries after the returned index represent the ways in the - * set for this index. - * @param an index to a set of ways - * @param an index aligned to the set of ways in `this->data' - */ - int get_true_index(int index); - /** - * Selects an index into the `data' and `meta' tables for write back using a random replacement - * policy. - * @param an index aligned to the set of ways in `this->data' - * @return an index aligned to the data line selected for eviction - */ - int get_replacement_index(int index); + int search_ways_for(int true_index, int tag); /** * The number of bits required to specify a line in this level of cache. */ @@ -108,6 +93,10 @@ nn * Constructor. */ unsigned int ways; /** + * The current access number. Used to assign usage data for the LRU replacement policy. + */ + unsigned int access_num; + /** * An array of metadata about elements in `data`. * If the first value of an element is negative, the corresponding * element in `data` is invalid. If the most second value of an element diff --git a/inc/definitions.h b/inc/definitions.h index f0946b8..737656d 100644 --- a/inc/definitions.h +++ b/inc/definitions.h @@ -43,11 +43,6 @@ #define MEM_LINES static_cast<int>(pow(2, MEM_LINE_SPEC)) /** - * The total number of cycles a memory access takes - */ -#define MEM_DELAY 3 - -/** * Return the N least-significant bits from integer K using a bit mask * @param the integer to be parsed * @param the number of bits to be parsed |