Changes between Version 12 and Version 13 of Writing Rules/RISC

Timestamp:

Jan 9, 2008, 5:14:05 PM (16 years ago)

Author:

alain

Comment:

--

Writing Rules/RISC

@@ -167 +167 @@
     for (uint32_t i = 0 ; i < iss_t::n_irq ; i++) { 
         new(&p_irq[i]) sc_in<bool> ("irq", i) ; 
-    }
+        }
+    m_ins_asked = false ;
+    m_data_asked = false ;
     SC_METHOD(transition);
     dont_initialize();
@@ -181 +183 @@
 iss_t  m_iss ;
 bool  m_ins_asked ;
-enum InsAccessType  m_ins_type ;
-uint32_t  m_ins_address ;
-bool  m_mem_asked ;
-enum DataAccessType  m_mem_type ;
-uint32_t  m_mem_address ;
-uint32_t  m_mem_wdata ;
+bool  m_data_asked ;
 
 /////////////////////////
@@ -195 +192 @@
         return;
     }
+
     bool frozen = false;
-    m_iss.getDataRequest(m_mem_asked,
-                m_mem_type,
-                m_mem_address, 
-                m_mem_wdata );
-    m_iss.getInstructionRequest(m_ins_asked,
-                m_ins_type,
-                m_ins_address );
+    
     if ( m_ins_asked ) {
         if ( p_icache.frz.read() ) frozen = true;
         else m_iss.setInstruction(p_icache.berr, p_icache.ins.read())
     }
-    if ( m_mem_asked ) { 
-        if ( p_dcache.frz.read()) frozen = true;
-        else  m_iss.setRdata(false, p_dcache.rdata.read());
+
+    if ( m_data_asked ) {
+        if ( p_dcache.frz.read() ) frozen = true;
+        m_iss.setRdata(p_dcache.berr.read(), p_dcache.rdata.read());
         }
+
     if ( frozen || m_iss.isBusy() ) {   //  Processor frozen or busy
         m_iss.nullStep();
     } else {                    // Execute one instruction:
-        uint32_t irqword = 0;
-        for ( size_t i=0; i<(size_t)iss_t::n_irq; i++ )  { if (p_irq[i].read()) irqword |= (1<<i); }
-        m_iss.setIrq(irqword);
         m_iss.step();
-        } // end transition()
+    }
+
+    // report interrupts
+    uint32_t irqword = 0;
+    for ( size_t i=0; i<(size_t)iss_t::n_irq; i++ )  { if (p_irq[i].read()) irqword |= (1<<i); }
+    m_iss.setIrq(irqword);
+
+    // report asynchronous bus error
+    if ( p_dcache.berr.read() ) m_iss.setWriteBerr() ;
+
+    } // end transition()
 
 //////////////////////////////
 void genMoore()
-{
-p_icache.req = m_ins_asked;
-p_icache.type = m_ins_type ;
-p_icache.adr = m_ins_address;
-p_dcache_req = m_mem_asked ;
-p_dcache_type = m_mem_type ;
-p_dcache.adr = m_mem_address;
-p_dcache.wdata = m_mem_wdata;  
+    {
+    bool ins_req ;
+    enum InsAccessType ins_type ;
+    uint32_t ins_address ;
+    bool data_req ;
+    enum DataAccessType data_type ;
+    uint32_t data_address ;
+    uint32_t  data_wdata ;
+
+    m_iss.getDataRequest( data_req, data_type, data_address, data_wdata ) ;
+    m_iss.getInstructionRequest( ins_req, ins_type, ins_address ) ;
+
+    p_icache.req = ins_asked ;
+    p_icache.type = ins_type ;
+    p_icache.adr = ins_address;
+    p_dcache_req = data_req ;
+    p_dcache_type = data_type ;
+    p_dcache.adr = data_address;
+    p_dcache.wdata = data_wdata;  
 } // end genMoore
 }}}