Improve Flash programming #1772

Author: RobertRostohar

pyocd/flash/builder.py

@@ -1,5 +1,5 @@
 # pyOCD debugger
-# Copyright (c) 2015-2019 Arm Limited
+# Copyright (c) 2015-2019,2025 Arm Limited
 # Copyright (c) 2021 Chris Reed
 # Copyright (c) 2023 Brian Pugh
 # SPDX-License-Identifier: Apache-2.0
@@ -201,7 +201,7 @@ def __init__(self, flash):
         self.sector_list: List[_FlashSector] = []
         self.page_list: List[_FlashPage] = []
         self.perf = ProgrammingInfo()
-        self.enable_double_buffering = True
+        self.enable_double_buffering = False
         self.log_performance = True
         self._buffered_data_size = 0
         self.program_byte_count = 0

pyocd/flash/eraser.py

@@ -114,7 +114,8 @@ def _sector_erase(self, addresses):
 
             while sector_addr < end_addr:
                 # Look up the flash memory region for the current address.
-                region = self._session.target.memory_map.get_region_for_address(sector_addr)
+                pname = self._session.target.selected_core.node_name
+                region = self._session.target.memory_map.get_region_for_address(sector_addr, pname)
                 if region is None:
                     LOG.warning("address 0x%08x is not within a memory region", sector_addr)
                     break

pyocd/flash/flash.py

@@ -1,5 +1,5 @@
 # pyOCD debugger
-# Copyright (c) 2013-2020 Arm Limited
+# Copyright (c) 2013-2020,2025 Arm Limited
 # Copyright (c) 2021-2022 Chris Reed
 # Copyright (c) 2023 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
@@ -22,6 +22,7 @@
 
 from ..core import exceptions
 from ..core.target import Target
+from ..coresight.cortex_m import CortexM
 from ..core.exceptions import (FlashFailure, FlashEraseFailure, FlashProgramFailure)
 from ..utility.mask import (align_down, msb)
 from ..utility.timeout import Timeout
@@ -567,6 +568,9 @@ def _call_function(self, pc, r0=None, r1=None, r2=None, r3=None, init=False):
         if init:
             reg_list.append('sp')
             data_list.append(self.begin_stack)
+        if init and isinstance(self.target.selected_core, CortexM):
+            reg_list.append('xpsr')
+            data_list.append(CortexM.XPSR_THUMB)
         reg_list.append('lr')
         data_list.append(self.flash_algo['load_address'] + 1)
         self.target.write_core_registers_raw(reg_list, data_list)

pyocd/gdbserver/gdbserver.py

@@ -1,5 +1,5 @@
 # pyOCD debugger
-# Copyright (c) 2006-2020 Arm Limited
+# Copyright (c) 2006-2020,2025 Arm Limited
 # Copyright (c) 2021-2022 Chris Reed
 # Copyright (c) 2022 Clay McClure
 # SPDX-License-Identifier: Apache-2.0
@@ -803,6 +803,10 @@ def flash_op(self, data):
         ops = data.split(b':')[0]
         LOG.debug("flash op: %s", ops)
 
+        # Select current core
+        if self.board.target.selected_core != self.core:
+            self.board.target.selected_core = self.core
+
         if ops == b'FlashErase':
             return self.create_rsp_packet(b"OK")
 

pyocd/target/pack/flm_region_builder.py

@@ -1,5 +1,6 @@
 # pyOCD debugger
 # Copyright (c) 2022-2023 Chris Reed
+# Copyright (c) 2025 Arm Limited
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -94,6 +95,8 @@ def finalise_region(self, region: FlashRegion) -> bool:
                 # If we got a valid algo from the FLM, set it on the region.
                 if algo is not None:
                     region.algo = algo
+                    # Disable reads of erased sectors if Verify function is provided in the algorithm
+                    region.are_erased_sectors_readable = 'Verify' not in pack_algo.symbols
 
                 # Set region page/sector sizes and algorithm range; add sector subregions.
                 self._update_flash_attributes(region, pack_algo, page_size, algo)

pyocd/utility/progress.py

@@ -1,5 +1,5 @@
 # pyOCD debugger
-# Copyright (c) 2017-2019 Arm Limited
+# Copyright (c) 2017-2019,2025 Arm Limited
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,6 +29,7 @@ def __init__(self, file=None):
         self._file = file or sys.stdout
         self.prev_progress = 0
         self.backwards_progress = False
+        self.started = False
         self.done = False
         self.last = 0
 
@@ -41,17 +42,17 @@ def __call__(self, progress):
             LOG.debug("progress out of bounds: %.3f", progress)
 
         # Reset state on 0.0
-        if progress == 0.0:
+        if progress == 0.0 and not self.started:
             self._start()
 
         # Check for backwards progress
         if progress < self.prev_progress:
             self.backwards_progress = True
-        self.prev_progress = progress
 
         # print progress bar
-        if not self.done:
+        if not self.done and progress > self.prev_progress:
             self._update(progress)
+            self.prev_progress = progress
 
             # Finish on 1.0
             if progress >= 1.0:
@@ -63,6 +64,7 @@ def __call__(self, progress):
     def _start(self):
         self.prev_progress = 0
         self.backwards_progress = False
+        self.started = True
         self.done = False
         self.last = 0