From: Alan Bowman Date: Wed, 11 May 2011 11:12:07 +0000 (+0100) Subject: Correct stacking direction and use of address offset X-Git-Tag: v0.5.0-rc1~66 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=6349a47ebc860681e4dbf3bffa31273c911dc7dd;hp=53c0fb6ef5edd2292c29d048c93f73e2be5fa4ba Correct stacking direction and use of address offset --- diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c index 9a4af74920..d69127e5e4 100644 --- a/src/rtos/rtos.c +++ b/src/rtos/rtos.c @@ -533,7 +533,7 @@ int rtos_generic_stack_read( struct target * target, const struct rtos_register_ { address -= stacking->stack_registers_size; } - retval = target_read_buffer( target, stack_ptr, stacking->stack_registers_size, stack_data); + retval = target_read_buffer( target, address, stacking->stack_registers_size, stack_data); if ( retval != ERROR_OK ) { LOG_OUTPUT("Error reading stack frame from FreeRTOS thread\r\n"); @@ -553,7 +553,7 @@ int rtos_generic_stack_read( struct target * target, const struct rtos_register_ } *hex_reg_list = (char*)malloc( list_size*2 +1 ); tmp_str_ptr = *hex_reg_list; - new_stack_ptr = stack_ptr + stacking->stack_growth_direction * stacking->stack_registers_size; + new_stack_ptr = stack_ptr - stacking->stack_growth_direction * stacking->stack_registers_size; for( i = 0; i < stacking->num_output_registers; i++ ) { int j; diff --git a/src/rtos/rtos_standard_stackings.c b/src/rtos/rtos_standard_stackings.c index e0ae06556c..e15b8b3ce0 100644 --- a/src/rtos/rtos_standard_stackings.c +++ b/src/rtos/rtos_standard_stackings.c @@ -57,7 +57,7 @@ static const struct stack_register_offset rtos_standard_Cortex_M3_stack_offsets const struct rtos_register_stacking rtos_standard_Cortex_M3_stacking = { 0x40, // stack_registers_size - 1, // stack_growth_direction + -1, // stack_growth_direction 26, // num_output_registers rtos_standard_Cortex_M3_stack_offsets // register_offsets };