commit 0a03780c4fbf3845aebd818aef6b139becdf909e
author Mike Leach <mike.leach@linaro.org> Tue Apr 10 13:47:40 2018 +0100
committer Mike Leach <mike.leach@linaro.org> Tue Apr 10 13:47:40 2018 +0100
tree 309c256728afd7a8d4456c3a6291d494f35df014
parent 900407e9d6400f6541138d6c2e483a9fc2d699a4

opencsd: etmv4 decode bugfix

ETMv4 full decode was not correctly emitting Timestamp and Cycle count
generic packets into the decode output stream. This is now fixed.

Printing of generic CC and event packets updated.

Signed-off-by: Mike Leach <mike.leach@linaro.org>

decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp

diff --git a/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp b/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp
index 865aacb..4545aed 100644
--- a/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp
+++ b/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp
@@ -371,7 +371,7 @@
         {
             std::vector<uint32_t> params = { 0 };
             params[0] = m_curr_packet_in->getCC();
-            if (m_P0_stack.createParamElem(P0_EVENT, false, m_curr_packet_in->getType(), m_index_curr_pkt, params) == 0)
+            if (m_P0_stack.createParamElem(P0_CC, false, m_curr_packet_in->getType(), m_index_curr_pkt, params) == 0)
                 bAllocErr = true;
 
         }
@@ -387,7 +387,7 @@
             params[1] = (uint32_t)((ts >> 32) & 0xFFFFFFFF);
             if (bTSwithCC)
                 params[2] = m_curr_packet_in->getCC();
-            if (m_P0_stack.createParamElem(P0_EVENT, false, m_curr_packet_in->getType(), m_index_curr_pkt, params) == 0)
+            if (m_P0_stack.createParamElem(bTSwithCC ? P0_TS_CC : P0_TS, false, m_curr_packet_in->getType(), m_index_curr_pkt, params) == 0)
                 bAllocErr = true;
 
         }
@@ -757,7 +757,7 @@
 ocsd_datapath_resp_t TrcPktDecodeEtmV4I::outputCC(TrcStackElemParam *pParamElem)
 {
     m_output_elem.setType(OCSD_GEN_TRC_ELEM_CYCLE_COUNT);
-    m_output_elem.cycle_count = pParamElem->getParam(0);
+    m_output_elem.setCycleCount(pParamElem->getParam(0));
     return outputTraceElementIdx(pParamElem->getRootIndex(),m_output_elem);
 }
 

decoder/source/trc_gen_elem.cpp

diff --git a/decoder/source/trc_gen_elem.cpp b/decoder/source/trc_gen_elem.cpp
index d2536f5..8897080 100644
--- a/decoder/source/trc_gen_elem.cpp
+++ b/decoder/source/trc_gen_elem.cpp
@@ -150,6 +150,13 @@
             printSWInfoPkt(oss);
             break;
 
+        case OCSD_GEN_TRC_ELEM_EVENT:
+            if(trace_event.ev_type == EVENT_TRIGGER)
+                oss << " Trigger; ";
+            else if(trace_event.ev_type == EVENT_NUMBERED)
+                oss << " Numbered:" << std::dec << trace_event.ev_number << "; ";
+            break;
+
         default: break;
         }
         if(has_cc)