Changeset 37 for trunk/modules/vci_cc_vcache_wrapper2_v1/caba

Timestamp:

Jun 1, 2010, 1:49:54 AM (14 years ago)

Author:

gao

Message:

Bug correction

Location:

trunk/modules/vci_cc_vcache_wrapper2_v1/caba/source

Files:

• include/vci_cc_vcache_wrapper2_v1.h (modified) (1 diff)
• src/vci_cc_vcache_wrapper2_v1.cpp (modified) (13 diffs)

trunk/modules/vci_cc_vcache_wrapper2_v1/caba/source/include/vci_cc_vcache_wrapper2_v1.h

@@ -373 +373 @@
     sc_signal<bool>         r_vci_rsp_ins_error;
     sc_signal<bool>         r_vci_rsp_data_error;
+    sc_signal<bool>         r_dcache_tlb_sc_fail;
 
     data_t                  *r_icache_miss_buf;    

trunk/modules/vci_cc_vcache_wrapper2_v1/caba/source/src/vci_cc_vcache_wrapper2_v1.cpp

@@ -275 +275 @@
       r_vci_rsp_ins_error("r_vci_rsp_ins_error"),
       r_vci_rsp_data_error("r_vci_rsp_data_error"),
+      r_dcache_tlb_sc_fail("r_dcache_tlb_sc_fail"),
 
       r_vci_tgt_fsm("r_vci_tgt_fsm"),
@@ -514 +515 @@
 
         r_dcache_cc_check         = false;
+        r_dcache_tlb_sc_fail      = false;
 
         // activity counters
@@ -3006 +3008 @@
 
                 if (r_dcache_inval_tlb_rsp) r_dcache_inval_tlb_rsp = false;
-                if (r_dcache_inval_rsp) r_dcache_inval_rsp = false;                         }
+                if (r_dcache_inval_rsp) r_dcache_inval_rsp = false;                         
+            }
             else 
             {
@@ -3014 +3017 @@
                     r_dcache_inval_tlb_rsp = false;
                     r_dcache_fsm = DCACHE_IDLE;
+                    if (r_dcache_tlb_sc_fail) r_dcache_tlb_sc_fail = false;
                     m_cost_data_tlb_miss_frz++;
                 }
@@ -3019 +3023 @@
                 {
                     r_dcache_inval_rsp = false;
+                    if (r_dcache_tlb_sc_fail) r_dcache_tlb_sc_fail = false;
                     r_dcache_fsm = DCACHE_IDLE;
                 }
-                else if ( r_dcache_tlb_ll_dirty_req )
+                else if ( r_dcache_tlb_sc_fail )
                 {
+                    r_dcache_tlb_ll_dirty_req = true;
+                    r_dcache_tlb_sc_fail = false;
                     r_dcache_fsm = DCACHE_LL_DIRTY_WAIT; 
                 }
@@ -3252 +3259 @@
                     r_dcache_inval_tlb_rsp = false;
                     r_dcache_fsm = DCACHE_IDLE;
+                    if (r_dcache_tlb_sc_fail) r_dcache_tlb_sc_fail = false;
                     m_cost_data_tlb_miss_frz++;
                 }
@@ -3257 +3265 @@
                 {
                     r_dcache_inval_rsp = false;
+                    if (r_dcache_tlb_sc_fail) r_dcache_tlb_sc_fail = false;
                     r_dcache_fsm = DCACHE_IDLE;
                 }
-                else if ( r_dcache_tlb_ll_acc_req )
+                else if ( r_dcache_tlb_sc_fail )
                 {
+                    r_dcache_tlb_sc_fail = false;
+                    r_dcache_tlb_ll_acc_req = true;
                     r_dcache_fsm = DCACHE_TLB1_LL_WAIT; 
                 }
@@ -3713 +3724 @@
                 {
                     r_dcache_inval_tlb_rsp = false;
+                    if (r_dcache_tlb_sc_fail) r_dcache_tlb_sc_fail = false;
                     r_dcache_fsm = DCACHE_IDLE;
                     m_cost_data_tlb_miss_frz++;
@@ -3719 +3731 @@
                 {
                     r_dcache_inval_rsp = false;
+                    if (r_dcache_tlb_sc_fail) r_dcache_tlb_sc_fail = false;
                     r_dcache_fsm = DCACHE_IDLE;
                 }
-                else if ( r_dcache_tlb_ll_acc_req )
+                else if ( r_dcache_tlb_sc_fail )
                 {
+                    r_dcache_tlb_ll_acc_req = true;
+                    r_dcache_tlb_sc_fail = false;
                     r_dcache_fsm = DCACHE_TLB2_LL_WAIT; 
                 }
@@ -4676 +4691 @@
                     r_dcache_inval_rsp = false;
                     r_dcache_fsm = DCACHE_IDLE;
+                    if (r_dcache_tlb_sc_fail) r_dcache_tlb_sc_fail = false;
                     m_cost_data_tlb_miss_frz++;
                 }
-                else if ( r_dcache_itlb_ll_acc_req )
+                else if ( r_dcache_tlb_sc_fail )
                 {
+                    r_dcache_tlb_sc_fail = false;
+                    r_dcache_itlb_ll_acc_req = true;
                     r_dcache_fsm = DCACHE_ITLB_LL_WAIT; 
                 }
@@ -5226 +5244 @@
         else if ( p_vci_ini_rw.rdata.read() == 1 ) // store conditional is not successful
         {
-            r_dcache_itlb_ll_acc_req = true;
+            r_dcache_tlb_sc_fail = true;
+            //r_dcache_itlb_ll_acc_req = true;
         }
         r_dcache_itlb_sc_acc_req = false;
@@ -5330 +5349 @@
         else if ( p_vci_ini_rw.rdata.read() == 1 ) // store conditional is not successful
         {
-            r_dcache_tlb_ll_acc_req = true;
+            r_dcache_tlb_sc_fail = true;
+            //r_dcache_tlb_ll_acc_req = true;
         }
         r_dcache_tlb_sc_acc_req = false;
@@ -5368 +5388 @@
         else if ( p_vci_ini_rw.rdata.read() == 1 ) // store conditional is not successful
         {
-            r_dcache_tlb_ll_dirty_req = true;
+            r_dcache_tlb_sc_fail = true;
+            //r_dcache_tlb_ll_dirty_req = true;
         }
         r_dcache_tlb_sc_dirty_req = false;