[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-137-g18aacc8bf

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  18aacc8bf3ff7c7481673cbbfe82f0104e4dccf9 (commit)
      from  41037eb26585114209c3c8f1d63f7788a421df07 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 18aacc8bf3ff7c7481673cbbfe82f0104e4dccf9
Author: François LEGAL <de...@th...>
Date:   Wed Mar 29 14:19:48 2023 +0200

    src/target/mips_m4k : fix condition on overlapping workspace data area
    
    The condition to check if the workspace area (used by actual MIPS code
    executed on target) and data area (sandbox to put data to be read/written
    to/from flash) is wrong, thus preventing the use of FAST_* commands to
    program/verify FLASH.
    
    Signed-off-by: François LEGAL <de...@th...>
    Change-Id: Ic68424b7f42d44e550433a120093db5e7980fd56
    Reviewed-on: https://review.openocd.org/c/openocd/+/7563
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 491b247b1..d3b07585d 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -1218,8 +1218,8 @@ static int mips_m4k_bulk_write_memory(struct target *target, target_addr_t addre
 
 	fast_data_area = mips32->fast_data_area;
 
-	if (address <= fast_data_area->address + fast_data_area->size &&
-			fast_data_area->address <= address + count) {
+	if (address < (fast_data_area->address + fast_data_area->size) &&
+			fast_data_area->address < (address + count)) {
 		LOG_ERROR("fast_data (" TARGET_ADDR_FMT ") is within write area "
 			  "(" TARGET_ADDR_FMT "-" TARGET_ADDR_FMT ").",
 			  fast_data_area->address, address, address + count);

-----------------------------------------------------------------------

Summary of changes:
 src/target/mips_m4k.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository