Merge pull request #1037 from flit/bugfix/lgtm_fixes

Fix a number of problems identified by LGTM

Author: flit

.lgtm.yml

@@ -0,0 +1,9 @@
+path_classifiers:
+  docs:
+    - scripts/generate_command_help.py
+  test:
+    # Mark all code under the src/ directory as test related.
+    # Really, the crc analyzer is not for test, but LGTL can't build embedded.
+    - src
+    - exclude: src/analyzer
+

pyocd/__main__.py

@@ -774,7 +774,10 @@ def do_gdbserver(self):
                     if core_number not in core_list:
                         continue
                     gdb = GDBServer(session, core=core_number)
-                    session.subscribe(self._gdbserver_listening_cb, GDBServer.GDBSERVER_START_LISTENING_EVENT, gdb)
+                    # Only subscribe to the server for the first core, so echo messages aren't printed
+                    # multiple times.
+                    if not gdbs:
+                        session.subscribe(self._gdbserver_listening_cb, GDBServer.GDBSERVER_START_LISTENING_EVENT, gdb)
                     session.gdbservers[core_number] = gdb
                     gdbs.append(gdb)
                     gdb.start()

pyocd/cache/memory.py

@@ -17,7 +17,6 @@
 from intervaltree import (Interval, IntervalTree)
 import logging
 
-from ..core import exceptions
 from ..utility import conversion
 from .metrics import CacheMetrics
 

pyocd/commands/commands.py

@@ -21,7 +21,7 @@
 
 from .. import coresight
 from ..core.helpers import ConnectHelper
-from ..core import (exceptions, session)
+from ..core import exceptions
 from ..probe.tcp_probe_server import DebugProbeServer
 from ..core.target import Target
 from ..flash.loader import FlashLoader
@@ -44,7 +44,6 @@
     msb,
     bfx,
     bfi,
-    round_up_div,
     )
 from .base import CommandBase
 
@@ -1028,7 +1027,6 @@ def parse(self, args):
 
     def execute(self):
         try:
-            type = self.context.selected_core.get_breakpoint_type(self.addr)
             self.context.selected_core.remove_breakpoint(self.addr)
             self.context.selected_core.bp_manager.flush()
             self.context.writei("Removed breakpoint at 0x%08x", self.addr)
@@ -1158,7 +1156,6 @@ def execute(self):
         if self.show_core:
             self.context.writei("Core %d is selected", self.context.selected_core.core_number)
             return
-        original_core_ap = core_ap = self.context.selected_core.ap
         self.context.selected_core = self.context.session.target.cores[self.core_num]
         core_ap = self.context.selected_core.ap
         self.context.selected_ap_address = core_ap.address
@@ -1625,7 +1622,6 @@ def print_disasm(context, code, start_addr, max_instructions=None):
         pc = -1
     md = capstone.Cs(capstone.CS_ARCH_ARM, capstone.CS_MODE_THUMB)
 
-    addrLine = 0
     text = ''
     n = 0
     for i in md.disasm(code, start_addr):

pyocd/commands/execution_context.py

@@ -354,7 +354,6 @@ def parse_command(self, cmdline):
                         ", ".join("'%s'" % c for c in all_matches)))
             else:
                 raise exceptions.CommandError("unrecognized command '%s'" % cmd)
-            return
 
         return CommandInvocation(matched_command, args, self.execute_command)
 

pyocd/commands/repl.py

@@ -17,7 +17,6 @@
 from __future__ import print_function
 import logging
 import os
-import sys
 import six
 import traceback
 import atexit

pyocd/commands/values.py

@@ -16,10 +16,9 @@
 
 import logging
 import prettytable
-import textwrap
 
 from .. import coresight
-from ..core import (exceptions, session)
+from ..core import exceptions
 from ..probe.debug_probe import DebugProbe
 from ..coresight.ap import MEM_AP
 from ..core.target import Target
@@ -531,11 +530,9 @@ def display(self, args):
     def modify(self, args):
         if len(args) < 1:
             raise exceptions.CommandError("no log level provided")
-            return 1
         level_name = args[0].lower()
         if level_name not in self.LEVELS:
             raise exceptions.CommandError("log level must be one of {%s}" % ','.join(self.LEVELS.keys()))
-            return 1
         level = self.LEVELS[level_name]
         if len(args) == 1:
             logging.getLogger().setLevel(level)
@@ -571,12 +568,10 @@ def display(self, args):
     def modify(self, args):
         if len(args) < 1:
             raise exceptions.CommandError("no clock frequency provided")
-            return 1
         try:
             freq_Hz = convert_frequency(args[0])
         except:
             raise exceptions.CommandError("invalid frequency")
-            return 1
         self.context.probe.set_clock(freq_Hz)
         if self.context.probe.wire_protocol == DebugProbe.Protocol.SWD:
             swd_jtag = 'SWD'

pyocd/core/memory_map.py

@@ -249,9 +249,8 @@ def __copy__(self):
                 **self._attributes
                 )
 
-    def __hash__(self):
-        # Need to redefine __hash__ since we redefine __eq__.
-        return super(MemoryRegion, self).__hash__()
+    # Need to redefine __hash__ since we redefine __eq__.
+    __hash__ = MemoryRangeBase.__hash__
 
     def __eq__(self, other):
         # Include type and attributes in equality comparison.
@@ -411,6 +410,14 @@ def __copy__(self):
         clone._flm = self._flm
         return clone
 
+    # Need to redefine __hash__ since we redefine __eq__.
+    __hash__ = MemoryRegion.__hash__
+    
+    def __eq__(self, other):
+        # Include flash algo, class, and flm in equality test.
+        return super(FlashRegion, self).__eq__(other) and self.algo == other.algo and \
+                self.flash_class == other.flash_class and self.flm == other.flm
+
     def __repr__(self):
         return "<%s@0x%x name=%s type=%s start=0x%x end=0x%x length=0x%x access=%s blocksize=0x%x>" % (self.__class__.__name__, id(self), self.name, self.type, self.start, self.end, self.length, self.access, self.blocksize)
 

pyocd/core/options_manager.py

@@ -1,5 +1,5 @@
 # pyOCD debugger
-# Copyright (c) 2019 Arm Limited
+# Copyright (c) 2019-2020 Arm Limited
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -116,8 +116,7 @@ def is_set(self, key):
         for layer in self._layers:
             if key in layer:
                 return True
-        else:
-            return False
+        return False
 
     def get_default(self, key):
         """! @brief Return the default value for the specified option."""

pyocd/core/soc_target.py

@@ -15,11 +15,8 @@
 # limitations under the License.
 
 import logging
-import six
 
 from .target import Target
-from .memory_map import MemoryType
-from . import exceptions
 from ..flash.eraser import FlashEraser
 from ..debug.cache import CachingDebugContext
 from ..debug.elf.elf import ELFBinaryFile