Changeset 973

Timestamp:

Apr 15, 2015, 4:02:06 PM (9 years ago)

Author:

cfuguet

Message:

improve debug messages

• replace the BDEV_DEBUG define by the SOCLIB_MODULE_DEBUG define to allow the use of -b on the soclib-cc command.

Files:

• branches/reconfiguration/modules/vci_xicu/caba/source/src/vci_xicu.cpp (modified) (1 diff)
• trunk/modules/vci_block_device_tsar/caba/source/src/vci_block_device_tsar.cpp (modified) (10 diffs)

branches/reconfiguration/modules/vci_xicu/caba/source/src/vci_xicu.cpp

@@ -449 +449 @@
 
 #if SOCLIB_MODULE_DEBUG
-if ( b ) std::cout << "p_irq[" << i << "] = " << b << std::endl;
+if ( b && !p_irq[i].read())
+{
+    std::cout << "[" << name() << "] set p_irq[" << i << "] / "
+              << std::hex
+              << " msk_pti[" << i << "] = " << r_msk_pti[i] << " / "
+              << " pti_pending = " << r_pti_pending << " / "
+              << " msk_wti[" << i << "] = " << r_msk_wti[i] << " / "
+              << " wti_pending = " << r_wti_pending << " / "
+              << " msk_hwi[" << i << "] = " << r_msk_hwi[i] << " / "
+              << " hwi_pending = " << r_hwi_pending
+              << std::dec << std::endl;
+}
+if ( !b && p_irq[i].read())
+{
+    std::cout << "[" << name() << "] unset p_irq[" << i << "]" << std::endl;
+}
 #endif
         p_irq[i] = b;

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

@@ -33 +33 @@
 #include "block_device_tsar.h"
 
-#define DEBUG_BDEV   0
-
 namespace soclib { namespace caba {
 
@@ -114 +112 @@
         if (p_vci_target.rspack.read() )
         {
-#if DEBUG_BDEV
+#if SOCLIB_MODULE_DEBUG
 std::cout << "  <BDEV_TGT WRITE_BUFFER> value = " << r_tdata.read() << std::endl;
 #endif
@@ -127 +125 @@
         if (p_vci_target.rspack.read() )
         {
-#if DEBUG_BDEV
+#if SOCLIB_MODULE_DEBUG
 std::cout << "  <BDEV_TGT WRITE_BUFFER_EXT> value = " << r_tdata.read() << std::endl;
 #endif
@@ -140 +138 @@
         if (p_vci_target.rspack.read() )
         {
-#if DEBUG_BDEV
+#if SOCLIB_MODULE_DEBUG
 std::cout << "  <BDEV_TGT WRITE_COUNT> value = " << r_tdata.read() << std::endl;
 #endif
@@ -153 +151 @@
         if (p_vci_target.rspack.read() )
         {
-#if DEBUG_BDEV
+#if SOCLIB_MODULE_DEBUG
 std::cout << "  <BDEV_TGT WRITE_LBA> value = " << r_tdata.read() << std::endl;
 #endif
@@ -170 +168 @@
             {
 
-#if DEBUG_BDEV
+#if SOCLIB_MODULE_DEBUG
 std::cout << "  <BDEV_TGT WRITE_OP> value = READ" << std::endl;
 #endif
@@ -180 +178 @@
             {
 
-#if DEBUG_BDEV
+#if SOCLIB_MODULE_DEBUG
 std::cout << "  <BDEV_TGT WRITE_OP> value = WRITE" << std::endl;
 #endif
@@ -189 +187 @@
             {
 
-#if DEBUG_BDEV
+#if SOCLIB_MODULE_DEBUG
 std::cout << "  <BDEV_TGT WRITE_OP> value = SOFT RESET" << std::endl;
 #endif
@@ -204 +202 @@
         {
 
-#if DEBUG_BDEV
+#if SOCLIB_MODULE_DEBUG
 std::cout << "  <BDEV_TGT WRITE_IRQEN> value = " << r_tdata.read() << std::endl;
 #endif
@@ -709 +707 @@
     {
 
-#if DEBUG_BDEV
+#if SOCLIB_MODULE_DEBUG
         if (p_irq != true)
             std::cout << "  <BDEV_INI send IRQ>" << std::endl;