Enable commander disasm command while target is running.

If the target is running, the disasm command doesn't try to read the PC.
HaoYDai · Mar 17, 2019 · 13adc4f · 13adc4f
1 parent 6c2d076
commit 13adc4f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/pyocd/tools/pyocd.py b/pyocd/tools/pyocd.py
@@ -1556,10 +1556,14 @@ def _dump_peripheral_register(self, periph, reg, show_fields):
 
     def print_disasm(self, code, startAddr, maxInstructions=None):
         if not isCapstoneAvailable:
-            print("Warning: Disassembly is not available because the Capstone library is not installed")
+            print("Warning: Disassembly is not available because the Capstone library is not installed. "
+                  "To install Capstone, run 'pip install capstone'.")
             return
 
-        pc = self.target.read_core_register('pc') & ~1
+        if self.target.is_halted():
+            pc = self.target.read_core_register('pc') & ~1
+        else:
+            pc = -1
         md = capstone.Cs(capstone.CS_ARCH_ARM, capstone.CS_MODE_THUMB)
 
         addrLine = 0