Mercurial > ecos
changeset 1655:ca8bb447fe5f
* src/hal_stub.c:
(cyg_hal_gdb_interrupt)
(cyg_hal_gdb_remove_break): Changed both to use
_read_mem_safe/__write_mem_safe for inserting a breakpoint, and
restoring the original instruction.
The Xtensa architecture (and others maybe?) can have unaligned
instructions, which caused unaligned load/store exception.
| author | jlarmour |
|---|---|
| date | Thu, 27 May 2004 05:47:40 +0000 |
| parents | 2321e7aae37c |
| children | ea74d0ea9eb1 |
| files | packages/hal/common/current/ChangeLog packages/hal/common/current/src/hal_stub.c |
| diffstat | 2 files changed, 23 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/hal/common/current/ChangeLog +++ b/packages/hal/common/current/ChangeLog @@ -1,3 +1,13 @@ +2004-05-19 John Newlin <jnewlin@stretchinc.com> + + * src/hal_stub.c: + (cyg_hal_gdb_interrupt) + (cyg_hal_gdb_remove_break): Changed both to use + _read_mem_safe/__write_mem_safe for inserting a breakpoint, and + restoring the original instruction. + The Xtensa architecture (and others maybe?) can have unaligned + instructions, which caused unaligned load/store exception. + 2004-04-22 Jani Monoses <jani@iv.ro> * cdl/hal.cdl :
--- a/packages/hal/common/current/src/hal_stub.c +++ b/packages/hal/common/current/src/hal_stub.c @@ -281,6 +281,8 @@ cyg_hal_gdb_place_break (target_register void cyg_hal_gdb_interrupt (target_register_t pc) { + t_inst break_inst = HAL_BREAKINST; + CYGARC_HAL_SAVE_GP(); // Clear flag that we Continued instead of Stepping @@ -290,9 +292,15 @@ cyg_hal_gdb_interrupt (target_register_t cyg_hal_gdb_remove_break( (target_register_t)break_buffer.targetAddr ); if (NULL == break_buffer.targetAddr) { - break_buffer.targetAddr = (t_inst*) pc; - break_buffer.savedInstr = *(t_inst*)pc; - *(t_inst*)pc = (t_inst)HAL_BREAKINST; + // Not always safe to read/write directly to program + // memory due to possibly unaligned instruction, use the + // provided memory functions instead. + __read_mem_safe(&break_buffer.savedInstr, (t_inst*)pc, HAL_BREAKINST_SIZE); + __write_mem_safe(&break_inst, (t_inst*)pc, HAL_BREAKINST_SIZE); + + // Save the PC where we put the break, so we can remove + // it after the target takes the break. + break_buffer.targetAddr = (t_inst*)pc; __data_cache(CACHE_FLUSH); __instruction_cache(CACHE_FLUSH); @@ -308,7 +316,8 @@ cyg_hal_gdb_remove_break (target_registe return 0; if ((t_inst*)pc == break_buffer.targetAddr) { - *(t_inst*)pc = break_buffer.savedInstr; + + __write_mem_safe(&break_buffer.savedInstr, (t_inst*)pc, HAL_BREAKINST_SIZE); break_buffer.targetAddr = NULL; __data_cache(CACHE_FLUSH);