Merge pull request #1014 from patrislav1/tpiu-raw-fwd

Publish raw SWV stream to TCP port

Author: flit

docs/options.md

@@ -404,6 +404,20 @@ Frequency in Hertz of the target's system clock. Used to compute the SWO baud ra
 divider.
 </td></tr>
 
+<tr><td>swv_raw_enable</td>
+<td>bool</td>
+<td>True</td>
+<td>
+Enable flag for the raw SWV stream server.
+</td></tr>
+
+<tr><td>swv_raw_port</td>
+<td>int</td>
+<td>3443</td>
+<td>
+TCP port number for the raw SWV stream server.
+</td></tr>
+
 <tr><td>telnet_port</td>
 <td>int</td>
 <td>4444</td>

pyocd/core/options.py

@@ -1,5 +1,6 @@
 # pyOCD debugger
 # Copyright (c) 2018-2020 Arm Limited
+# Copyright (c) 2020 Patrick Huesmann
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -136,6 +137,10 @@
     OptionInfo('swv_system_clock', int, None,
         "Frequency in Hertz of the target's system clock. Used to compute the SWO baud rate "
         "divider. No default."),
+    OptionInfo('swv_raw_enable', bool, True,
+        "Enable flag for the raw SWV stream server."),
+    OptionInfo('swv_raw_port', int, 3443,
+        "TCP port number for the raw SWV stream server."),
     OptionInfo('telnet_port', int, 4444,
         "Base TCP port number for the semihosting telnet server."),
     OptionInfo('vector_catch', str, 'h',

pyocd/trace/swv.py

@@ -1,5 +1,6 @@
 # pyOCD debugger
 # Copyright (c) 2019-2020 Arm Limited
+# Copyright (c) 2020 Patrick Huesmann
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,6 +28,7 @@
 from ..core.target import Target
 from ..core import exceptions
 from ..probe.debug_probe import DebugProbe
+from ..utility.server import StreamServer
 
 LOG = logging.getLogger(__name__)
 
@@ -155,6 +157,12 @@ def run(self):
         if self._lock:
             self._lock.acquire()
 
+        swv_raw_server = StreamServer(
+                            self._session.options.get('swv_raw_port'),
+                            name="SWV raw",
+                            is_read_only=True) \
+                         if self._session.options.get('swv_raw_enable') else None
+
         # Stop SWO first in case the probe already had it started. Ignore if this fails.
         try:
             self._session.probe.swo_stop()
@@ -165,6 +173,8 @@ def run(self):
         while not self._shutdown_event.is_set():
             data = self._session.probe.swo_read()
             if data:
+                if swv_raw_server:
+                    swv_raw_server.write(data)
                 self._parser.parse(data)
 
             if self._lock:
@@ -177,6 +187,9 @@ def run(self):
 
         self._session.probe.swo_stop()
 
+        if swv_raw_server:
+            swv_raw_server.stop()
+    
         if self._lock:
             self._lock.release()