Changeset 202 for trunk

Timestamp:

Feb 24, 2012, 6:13:01 PM (12 years ago)

Author:

alain

Message:

 

Location:

trunk/modules/vci_cc_vcache_wrapper_v4/caba/source

Files:

• include/vci_cc_vcache_wrapper_v4.h (modified) (1 diff)
• src/vci_cc_vcache_wrapper_v4.cpp (modified) (5 diffs)

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

@@ -264 +264 @@
     const paddr_t                                               m_dcache_yzmask;
     const size_t                                                m_dcache_words;
+
+    const size_t                        m_proc_id;
 
     const uint32_t                                              m_max_frozen_cycles;

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

@@ -383 +383 @@
       r_icache("icache", icache_ways, icache_sets, icache_words),
       r_dcache("dcache", dcache_ways, dcache_sets, dcache_words),
-      r_itlb(itlb_ways,itlb_sets,vci_param::N),
-      r_dtlb(dtlb_ways,dtlb_sets,vci_param::N)
+      r_itlb("itlb", proc_id, itlb_ways,itlb_sets,vci_param::N),
+      r_dtlb("dtlb", proc_id, dtlb_ways,dtlb_sets,vci_param::N)
 {
     assert( ((icache_words*vci_param::B) < (1<<vci_param::K)) and
@@ -3003 +3003 @@
         if ( r_dcache_tlb_ins.read() )  
         {
-            r_itlb.write( pte,
+            r_itlb.write( true,         // 2M page
+                          pte,
+                          0,            // argument unused for a PTE1
                           r_dcache_tlb_vaddr.read(),    
                           r_dcache_tlb_way.read(), 
@@ -3014 +3016 @@
         else
         {
-            r_dtlb.write( pte,
+            r_dtlb.write( true,         // 2M page
+                          pte,
+                          0,            // argument unused for a PTE1
                           r_dcache_tlb_vaddr.read(),    
                           r_dcache_tlb_way.read(), 
@@ -3206 +3210 @@
         if ( r_dcache_tlb_ins.read() )  
         {
-            r_itlb.write( pte_flags,
+            r_itlb.write( false,        // 2K page
+                          pte_flags,
                           pte_ppn,
                           r_dcache_tlb_vaddr.read(),    
@@ -3218 +3223 @@
         else
         {
-            r_dtlb.write( pte_flags,
+            r_dtlb.write( false,        // 2K page
+                          pte_flags,
                           pte_ppn,
                           r_dcache_tlb_vaddr.read(),