applet.debug.msp430.{jtag,sbw}: new applets.

whitequark · whitequark · commit 8d9ce19dd3ae · 2019-08-02T12:26:40.000Z
diff --git a/software/glasgow/applet/all.py b/software/glasgow/applet/all.py
@@ -18,6 +18,7 @@
 from .debug.arc import DebugARCApplet
 from .debug.mips import DebugMIPSApplet
 from .debug.arm.swd import DebugARMSWDApplet
+from .debug.msp430 import DebugMSP430JTAGApplet, DebugMSP430SBWApplet
 
 from .program.avr.spi import ProgramAVRSPIApplet
 from .program.ice40_flash import ProgramICE40FlashApplet
diff --git a/software/glasgow/applet/debug/mips/__init__.py b/software/glasgow/applet/debug/mips/__init__.py
@@ -829,7 +829,7 @@ def add_run_arguments(cls, parser, access):
             help="select TAP #INDEX for communication (default: %(default)s)")
 
     async def run(self, device, args):
-        jtag_iface = await super().run(device, args)
+        jtag_iface = await self.run_lower(DebugMIPSApplet, device, args)
         tap_iface = await jtag_iface.select_tap(args.tap_index)
         if not tap_iface:
             raise GlasgowAppletError("cannot select TAP #%d" % args.tap_index)
diff --git a/software/glasgow/applet/debug/msp430/__init__.py b/software/glasgow/applet/debug/msp430/__init__.py
@@ -0,0 +1,77 @@
+# Ref: MSP430™ Programming With the JTAG Interface
+# Accession: G00038
+
+import logging
+import asyncio
+from abc import ABCMeta, abstractmethod
+
+from ....support.aobject import *
+from ....support.bits import *
+from ....arch.msp430.jtag import *
+from ...interface.jtag_probe import JTAGProbeApplet
+from ...interface.sbw_probe import SpyBiWireProbeApplet
+from ... import *
+
+
+class MSP430DebugError(GlasgowAppletError):
+    pass
+
+
+class MSP430FamilyDebugInterface(aobject, metaclass=ABCMeta):
+    async def __init__(self, interface, logger):
+        self.lower   = interface
+        self._logger = logger
+        self._level  = logging.DEBUG if self._logger.name == __name__ else logging.TRACE
+
+    def _log(self, message, *args):
+        self._logger.log(self._level, "MSP430: " + message, *args)
+
+    @abstractmethod
+    async def attach(self):
+        pass
+
+
+class MSP430DebugInterface(MSP430FamilyDebugInterface):
+    async def attach(self):
+        self._log("attach")
+        await self.lower.write_ir(IR_CNTRL_SIG_16BIT)
+        await self.lower.write_dr(DR_CNTRL_SIG_124(R_W=1, TAGFUNCSAT=1, TCE1=1).to_bits())
+        await self.lower.write_ir(IR_CNTRL_SIG_CAPTURE)
+        cntrl_sig = DR_CNTRL_SIG_124.from_bits(await self.lower.read_dr(16))
+        if not cntrl_sig.TCE:
+            raise MSP430DebugError("cannot attach: CNTRL_SIG {}"
+                                   .format(cntrl_sig.bits_repr(omit_zero=True)))
+
+
+class DebugMSP430AppletMixin:
+    preview = True
+    description = "" # nothing to add for now
+
+    async def interact(self, device, args, msp430_iface):
+        await msp430_iface.attach()
+
+
+class DebugMSP430JTAGApplet(DebugMSP430AppletMixin, JTAGProbeApplet, name="debug-msp430-jtag"):
+    logger = logging.getLogger(__name__)
+    help = "debug MSP430 processors via JTAG"
+    description = """
+    Debug Texas Instruments MSP430 processors via the 4-wire JTAG interface.
+    """ + DebugMSP430AppletMixin.description
+
+    async def run(self, device, args):
+        jtag_iface = await self.run_lower(DebugMSP430JTAGApplet, device, args)
+        await jtag_iface.test_reset()
+        return await MSP430DebugInterface(jtag_iface, self.logger)
+
+
+class DebugMSP430SBWApplet(DebugMSP430AppletMixin, SpyBiWireProbeApplet, name="debug-msp430-sbw"):
+    logger = logging.getLogger(__name__)
+    help = "debug MSP430 processors via Spy-Bi-Wire"
+    description = """
+    Debug Texas Instruments MSP430 processors via the 2-wire Spy-Bi-Wire interface.
+    """ + DebugMSP430AppletMixin.description
+
+    async def run(self, device, args):
+        jtag_iface = await self.run_lower(DebugMSP430SBWApplet, device, args)
+        await jtag_iface.test_reset()
+        return await MSP430DebugInterface(jtag_iface, self.logger)
