diff options
| author | Siddarth-Suresh <65844402+Siddarth-Suresh@users.noreply.github.com> | 2025-03-11 11:45:50 -0400 |
|---|---|---|
| committer | Siddarth-Suresh <65844402+Siddarth-Suresh@users.noreply.github.com> | 2025-03-11 11:45:50 -0400 |
| commit | e06f97b02b161f5356117d0ccc5a9ea9b11fe99e (patch) | |
| tree | ca169a297c457abf3aad2edc1fbfcb3663ee1e26 /inc | |
| parent | 93b010dbbcdc921bfccae673918eb9fbf354538a (diff) | |
Resolving conflicts
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cache.h | 2 | ||||
| -rw-r--r-- | inc/dram.h | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/inc/cache.h b/inc/cache.h index bc37f54..20a40c2 100644 --- a/inc/cache.h +++ b/inc/cache.h @@ -25,7 +25,7 @@ class Cache : public Storage Response read( Accessor accessor, int address, - std::array<signed int, LINE_SIZE> &data) override; + std::array<signed int, LINE_SIZE> &data_line) override; Response read_word(Accessor accessor, int address, signed int &data) override; /** @@ -21,10 +21,8 @@ class Dram : public Storage Response read( Accessor accessor, int address, - std::array<signed int, LINE_SIZE> &data) override; + std::array<signed int, LINE_SIZE> &data_line) override; Response write_line(Accessor accessor, std::array<signed int, LINE_SIZE> data_line, int address) override; - - Response read(Accessor accessor, int address, std::array<signed int, LINE_SIZE>& data) override; Response read_word(Accessor accessor, int address, signed int &data) override; private: @@ -40,7 +38,6 @@ class Dram : public Storage * Helper for `read` a line */ void do_read(std::array<signed int, LINE_SIZE> &data_line, int address); - void do_read(std::array<signed int, LINE_SIZE>& data_line, int address); /** * Helper for reading a word. */ |