From 8b5298566773275b5c8423dace3396a325f38541 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Sun, 17 Mar 2019 00:28:01 +0100 Subject: Correct word in block visualization in cache view. The word index (column) has been erroneously used for set index value. Signed-off-by: Pavel Pisa --- qtmips_gui/cacheview.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'qtmips_gui/cacheview.cpp') diff --git a/qtmips_gui/cacheview.cpp b/qtmips_gui/cacheview.cpp index b246102..6eb1bfe 100644 --- a/qtmips_gui/cacheview.cpp +++ b/qtmips_gui/cacheview.cpp @@ -59,7 +59,8 @@ CacheAddressBlock::CacheAddressBlock(const machine::Cache *cache, unsigned width row = 0; col = 0; - connect(cache, SIGNAL(cache_update(uint,uint,bool,bool,std::uint32_t,const std::uint32_t*)), this, SLOT(cache_update(uint,uint,bool,bool,std::uint32_t,const std::uint32_t*))); + connect(cache, SIGNAL(cache_update(uint,uint,uint,bool,bool,std::uint32_t,const std::uint32_t*)), + this, SLOT(cache_update(uint,uint,uint,bool,bool,std::uint32_t,const std::uint32_t*))); } QRectF CacheAddressBlock::boundingRect() const { @@ -130,10 +131,10 @@ void CacheAddressBlock::paint(QPainter *painter, const QStyleOptionGraphicsItem } } -void CacheAddressBlock::cache_update(unsigned associat, unsigned set, bool valid, bool dirty, std::uint32_t tag, const std::uint32_t *data) { +void CacheAddressBlock::cache_update(unsigned associat, unsigned set, unsigned col, bool valid, bool dirty, std::uint32_t tag, const std::uint32_t *data) { this->tag = tag; - this->row = 0; // TODO we are missing this information - this->col = set; + this->row = set; + this->col = col; update(); } @@ -207,7 +208,8 @@ CacheViewBlock::CacheViewBlock(const machine::Cache *cache, unsigned block , boo box = l_data->boundingRect(); l_data->setPos(wd + (columns*DATA_WIDTH - box.width())/2 , -1 - box.height()); - connect(cache, SIGNAL(cache_update(uint,uint,bool,bool,std::uint32_t,const std::uint32_t*)), this, SLOT(cache_update(uint,uint,bool,bool,std::uint32_t,const std::uint32_t*))); + connect(cache, SIGNAL(cache_update(uint,uint,uint,bool,bool,std::uint32_t,const std::uint32_t*)), + this, SLOT(cache_update(uint,uint,uint,bool,bool,std::uint32_t,const std::uint32_t*))); } CacheViewBlock::~CacheViewBlock() { @@ -325,7 +327,8 @@ void CacheViewBlock::paint(QPainter *painter, const QStyleOptionGraphicsItem *op } } -void CacheViewBlock::cache_update(unsigned associat, unsigned set, bool valid, bool dirty, std::uint32_t tag, const std::uint32_t *data) { +void CacheViewBlock::cache_update(unsigned associat, unsigned set, unsigned col, bool valid, bool dirty, std::uint32_t tag, const std::uint32_t *data) { + (void)col; if (associat != block) return; // Ignore blocks that are not us validity[set]->setText(valid ? "1" : "0"); -- cgit v1.2.3