This is an automated email from Gerrit.

Asger Gitz-Johansen ([email protected]) just uploaded a new patch set to 
Gerrit, which you can find at http://openocd.zylin.com/6092

-- gerrit

commit f16ab7ddfcaf3ab0432d7d2d58019cd39dc04c1a
Author: Paul Fertser <[email protected]>
Date:   Sun Mar 7 15:44:45 2021 +0300

    Fixed a bug where mips_m4k would never enter fast programming mode.
    Note that this patch exposes another bug in the fast programming mode: 
https://sourceforge.net/p/openocd/tickets/296/
    
    Change-Id: I5db3f0f5ec850cc3ca9195a839c8086bee2e1713
    Signed-off-by: Paul Fertser <[email protected]>
    Signed-off-by: agjhmk <[email protected]>

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 52b4b32..3e2e25d 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -1237,8 +1237,11 @@ 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) {
+       typeof(fast_data_area->address) fd_addr = fast_data_area->address;
+       typeof(fd_addr) fd_lastAddr = fd_addr + fast_data_area->size - 1;
+       typeof(address) lastAddr = address + count - 1;
+
+       if ((address <= fd_lastAddr) && (fd_addr <= lastAddr)) {
                LOG_ERROR("fast_data (" TARGET_ADDR_FMT ") is within write area 
"
                          "(" TARGET_ADDR_FMT "-" TARGET_ADDR_FMT ").",
                          fast_data_area->address, address, address + count);

-- 


_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to