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>
This commit is contained in:
committed by
Spencer Oliver
parent
8e6e7948de
commit
ff5ec942d8
@@ -284,6 +284,7 @@ static int fa526_init_arch_info_2(struct target *target,
|
||||
arm7_9->enable_single_step = arm9tdmi_enable_single_step;
|
||||
arm7_9->disable_single_step = arm9tdmi_disable_single_step;
|
||||
|
||||
arm7_9->write_memory = arm920t_write_memory;
|
||||
arm7_9->bulk_write_memory = arm7_9_bulk_write_memory;
|
||||
|
||||
arm7_9->post_debug_entry = NULL;
|
||||
@@ -368,7 +369,7 @@ struct target_type fa526_target = {
|
||||
.get_gdb_reg_list = arm_get_gdb_reg_list,
|
||||
|
||||
.read_memory = arm920t_read_memory,
|
||||
.write_memory = arm920t_write_memory_opt,
|
||||
.write_memory = arm7_9_write_memory_opt,
|
||||
|
||||
.checksum_memory = arm_checksum_memory,
|
||||
.blank_check_memory = arm_blank_check_memory,
|
||||
|
||||
Reference in New Issue
Block a user