From 63f8f310567f28d189333ca84ff172cb15d702a1 Mon Sep 17 00:00:00 2001
From: ZhangZifei <1773908404@qq.com>
Date: Fri, 14 Aug 2020 23:52:10 +0800
Subject: [PATCH] TLB: change some assert logic

---
 src/main/scala/xiangshan/cache/dtlb.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/xiangshan/cache/dtlb.scala b/src/main/scala/xiangshan/cache/dtlb.scala
index 05b1e47c0..0719ff33b 100644
--- a/src/main/scala/xiangshan/cache/dtlb.scala
+++ b/src/main/scala/xiangshan/cache/dtlb.scala
@@ -361,13 +361,13 @@ class TLB(Width: Int, isDtlb: Boolean) extends TlbModule with HasCSRConst{
   assert(!multiHit) // add multiHit here, later it should be removed (maybe), turn to miss and flush
 
   for (i <- 0 until Width) {
-    XSDebug(resp(i).valid && !resp(i).bits.miss && !(req(i).bits.vaddr===resp(i).bits.paddr), p"vaddr:0x${Hexadecimal(req(i).bits.vaddr)} paddr:0x${Hexadecimal(resp(i).bits.paddr)} hitVec:0x${Hexadecimal(VecInit(hitVec(i)).asUInt)}}\n")
-    when (resp(i).valid && !resp(i).bits.miss && !(req(i).bits.vaddr===resp(i).bits.paddr)) {
+    XSDebug(resp(i).valid && hit(i) && !(req(i).bits.vaddr===resp(i).bits.paddr), p"vaddr:0x${Hexadecimal(req(i).bits.vaddr)} paddr:0x${Hexadecimal(resp(i).bits.paddr)} hitVec:0x${Hexadecimal(VecInit(hitVec(i)).asUInt)}}\n")
+    when (resp(i).valid && hit(i) && !(req(i).bits.vaddr===resp(i).bits.paddr)) {
       for (j <- 0 until TlbEntrySize) {
         XSDebug(true.B, p"TLBEntry(${j.U}): v:${v(j)} ${entry(j)}\n")
       }
     } // FIXME: remove me when tlb may be ok
-    when(resp(i).valid && !resp(i).bits.miss) {
+    when(resp(i).valid && hit(i)) {
       assert(req(i).bits.vaddr===resp(i).bits.paddr, "vaddr:0x%x paddr:0x%x hitVec:%x ", req(i).bits.vaddr, resp(i).bits.paddr, VecInit(hitVec(i)).asUInt)
     } // FIXME: remove me when tlb may be ok
   }
-- 
GitLab