From 91886988ddfd276cd6e51f05b9e92fd1926b54ec Mon Sep 17 00:00:00 2001 From: bd Date: Fri, 21 Mar 2025 01:06:38 -0400 Subject: Rewrite current cache.cc tests, add test-helper function to dram --- src/storage/cache.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/storage/cache.cc') diff --git a/src/storage/cache.cc b/src/storage/cache.cc index 3e2a5e0..f15c919 100644 --- a/src/storage/cache.cc +++ b/src/storage/cache.cc @@ -34,7 +34,7 @@ Response Cache::write_word(Accessor accessor, signed int data, int address) this->requester = accessor; if (this->requester == accessor) { - fetch_resource(address); + handle_miss(address); if (this->is_waiting) r = BLOCKED; else if (this->wait_time == 0) { @@ -59,7 +59,7 @@ Response Cache::write_line( this->requester = accessor; if (this->requester == accessor) { - fetch_resource(address); + handle_miss(address); if (this->is_waiting) r = BLOCKED; else if (this->wait_time == 0) { @@ -84,7 +84,7 @@ Response Cache::read_line( if (this->requester == IDLE) this->requester = accessor; if (this->requester == accessor) { - fetch_resource(address); + handle_miss(address); if (this->is_waiting) r = BLOCKED; else if (this->wait_time == 0) { @@ -103,7 +103,7 @@ Response Cache::read_word(Accessor accessor, int address, signed int &data) if (this->requester == IDLE) this->requester = accessor; if (this->requester == accessor) { - fetch_resource(address); + handle_miss(address); if (this->is_waiting) r = BLOCKED; else if (this->wait_time == 0) { @@ -116,15 +116,15 @@ Response Cache::read_word(Accessor accessor, int address, signed int &data) return r; } -void Cache::fetch_resource(int expected) +void Cache::handle_miss(int expected) { - Response r = OK; - Response q; + Response r, q; int tag, index, offset; std::array *actual; std::array *meta; get_bit_fields(expected, &tag, &index, &offset); + r = OK; meta = &this->meta.at(index); actual = &this->data->at(index); -- cgit v1.2.3