imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

John Woods <johnrw@gmail.com> fix checks for addresses at upper end of the universe

Browse Source 
git-svn-id: svn://svn.berlios.de/openocd/trunk@1377 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2009-02-19 18:52:46 +00:00
parent 4d3b6e4163
commit bb0d7ab12a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/flash/flash.c
View File

@ -950,7 +950,7 @@ int flash_erase_address_range(target_t *target, u32 addr, u32 length)
}
/* check whether it fits */
if (addr + length > c->base + c->size)
if (addr + length - 1 > c->base + c->size - 1)
return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
addr -= c->base;
@ -1030,7 +1030,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase)
section_first = section;
section_last = section;
padding[section] = 0;
while ((run_address + run_size < c->base + c->size)
while ((run_address + run_size - 1 < c->base + c->size - 1)
&& (section_last + 1 < image->num_sections))
{
if (image->sections[section_last + 1].base_address < (run_address + run_size))
@ -1052,7 +1052,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase)
}
/* fit the run into bank constraints */
if (run_address + run_size > c->base + c->size)
if (run_address + run_size - 1 > c->base + c->size - 1)
{
LOG_WARNING("writing %d bytes only - as image section is %d bytes and bank is only %d bytes", \
c->base + c->size - run_address, run_size, c->size);