diff options
| author | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2013-10-05 00:19:08 +0200 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2013-10-15 20:41:08 +0000 |
| commit | ff5ec942d80a34e20b5a3ca3328f7e6a55fb309b (patch) | |
| tree | 1d5682ae57f84d16f136b27ee75a6158790fca3f /src/target/arm926ejs.c | |
| parent | 8e6e7948de11e69fa53e7b7f306d35d6d4904b14 (diff) | |
arm7_9: Avoid infinite loops in bulk write dispatching
Add a mandatory field in struct arm7_9_common for regular, non-optimized
memory writes. Together with the existing bulk_memory_write field, this
allows variants to select any combination of implementations for regular
and bulk writes, without risking infinite loops from accidentally using
bulk writes for implementing bulk writes.
ARM 7/9 targets may now select arm7_9_memory_write_opt as their
target.write_memory implementation, which will dispatch to
arm7_9_common.bulk_write_memory if possible, or fallback to
arm7_9_common.write_memory otherwise.
To avoid loops, bulk write implementations mustn't call any other
functions than arm7_9_write_memory_no_opt() to write memory; it will
unconditionally call arm7_9_common.write_memory. If they fail, they should
simply return error to allow the caller to fallback to regular writes.
Tested on a regular ARM7TDMI only.
Change-Id: Iae42a6e093e2df68c4823c927d757ae8f42ef388
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1685
Tested-by: jenkins
Reviewed-by: Sergey A. Borshch <sb-sf@users.sourceforge.net>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src/target/arm926ejs.c')
| -rw-r--r-- | src/target/arm926ejs.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c index 1e0a5790..af806139 100644 --- a/src/target/arm926ejs.c +++ b/src/target/arm926ejs.c @@ -656,17 +656,6 @@ int arm926ejs_write_memory(struct target *target, uint32_t address, return retval; } -int arm926ejs_write_memory_opt(struct target *target, uint32_t address, - uint32_t size, uint32_t count, const uint8_t *buffer) -{ - struct arm7_9_common *arm7_9 = target_to_arm7_9(target); - - if (size == 4 && count > 32 && arm7_9->bulk_write_memory) - return arm7_9->bulk_write_memory(target, address, count, buffer); - else - return arm926ejs_write_memory(target, address, size, count, buffer); -} - static int arm926ejs_write_phys_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, const uint8_t *buffer) @@ -819,7 +808,7 @@ struct target_type arm926ejs_target = { .get_gdb_reg_list = arm_get_gdb_reg_list, .read_memory = arm7_9_read_memory, - .write_memory = arm926ejs_write_memory_opt, + .write_memory = arm7_9_write_memory_opt, .checksum_memory = arm_checksum_memory, .blank_check_memory = arm_blank_check_memory, |