Changeset 98 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Special_Register_unit/src/Special_Register_unit_transition.cpp

Timestamp:

Dec 31, 2008, 11:18:08 AM (15 years ago)

Author:

rosiere

Message:

1) Fix bug (read unit, RAT -> write in R0, SPR desallocation ...)
2) Change VHDL Execute_queue -> use Generic/Queue?
3) Complete document on VHDL generation
4) Add soc test

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Special_Register_unit/src/Special_Register_unit_transition.cpp (modified) (4 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Special_Register_unit/src/Special_Register_unit_transition.cpp

@@ -22 +22 @@
   {
     log_begin(Special_Register_unit,FUNCTION);
+    log_function(Special_Register_unit,FUNCTION,_name.c_str());
 
     if (PORT_READ(in_NRESET) == 0)
@@ -38 +39 @@
                         throw ERRORMORPHEO(FUNCTION,toString(_("Register [%d][%d] is not implemented.\n"),k,l));
 #endif
-                      log_printf(TRACE,Special_Register_unit,FUNCTION,"Reset SPR [%d][%d][%d][%d]",i,j,k,l);
+                      log_printf(TRACE,Special_Register_unit,FUNCTION,"  * Reset SPR [%d][%d][%d][%d]",i,j,k,l);
                       _spr [i][j][k][l]->reset();
                     }
@@ -52 +53 @@
             if (PORT_READ(in_SPR_ACCESS_WEN [i]))
               {
+                log_printf(TRACE,Special_Register_unit,FUNCTION,"  * SPR_ACCESS [%d]",i);
+
                 Tcontext_t     front_end_id = (_param->_have_port_front_end_id)?PORT_READ(in_SPR_ACCESS_FRONT_END_ID [i]):0;
                 Tcontext_t     context_id   = (_param->_have_port_context_id  )?PORT_READ(in_SPR_ACCESS_CONTEXT_ID   [i]):0;
@@ -57 +60 @@
                 Tspr_address_t num_reg      = PORT_READ(in_SPR_ACCESS_NUM_REG   [i]);
 
+                log_printf(TRACE,Special_Register_unit,FUNCTION,"    * front_end_id : %d",front_end_id);
+                log_printf(TRACE,Special_Register_unit,FUNCTION,"    * context_id   : %d",context_id  );
+                log_printf(TRACE,Special_Register_unit,FUNCTION,"    * num_group    : %d",num_group   );
+                log_printf(TRACE,Special_Register_unit,FUNCTION,"    * num_reg      : %d",num_reg     );
+
                 SR * sr = static_cast<SR*>(_spr [front_end_id][context_id][GROUP_SYSTEM_AND_CONTROL][SPR_SR]);
 
                 Tcontrol_t sm    = sr->sm   ;
                 Tcontrol_t sumra = sr->sumra;
+                Tcontrol_t valid = _spr_access_mode [front_end_id][context_id]->write(spr_address_t(num_group,num_reg),
+                                                                                      sm,
+                                                                                      sumra);   
+                log_printf(TRACE,Special_Register_unit,FUNCTION,"    * SM           : %d",sm);
+                log_printf(TRACE,Special_Register_unit,FUNCTION,"    * SUMRA        : %d",sumra);
+                log_printf(TRACE,Special_Register_unit,FUNCTION,"    * valid        : %d",valid);
 
-                if (_spr_access_mode [front_end_id][context_id]->write(spr_address_t(num_group,num_reg),
-                                                                       sm,
-                                                                       sumra))
-                  _spr[front_end_id][context_id][num_group][num_reg]->write(PORT_READ(in_SPR_ACCESS_WDATA [i]));
+                if (valid)
+                  {
+                    Tspr_t wdata = PORT_READ(in_SPR_ACCESS_WDATA [i]);
+
+                    log_printf(TRACE,Special_Register_unit,FUNCTION,"    * wdata        : %.8x",wdata);
+
+                    _spr[front_end_id][context_id][num_group][num_reg]->write(wdata);
+                  }
                 
               }