Menu
▾
▴
[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-208-gf20173a01
|
From: openocd-gerrit <ope...@us...> - 2023-05-18 10:17:40
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via f20173a01f3eec286b2e2daac12834229cbfa3c8 (commit)
via 17f86fdedf03626eed545dcd69c6387a825e0b5d (commit)
from aaa67f733df5ef29bfdc83e808434a23d6edb580 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f20173a01f3eec286b2e2daac12834229cbfa3c8
Author: Antonio Borneo <bor...@gm...>
Date: Sun May 7 16:15:46 2023 +0200
HACKING: add info on usage of sparse
Add short example on how to run the static analyser 'sparse' on
OpenOCD code.
Change-Id: Ieba8ae926d0e02ca9e6ac619b13b0832136f82cb
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/7679
Tested-by: jenkins
diff --git a/HACKING b/HACKING
index be5699990..fbc0eae93 100644
--- a/HACKING
+++ b/HACKING
@@ -77,6 +77,21 @@ patch:
src/openocd -s ../tcl -f /path/to/openocd.cfg
@endcode
+- Sparse Static Analyzer
+
+ Using this tool allows identifying some bug in C code.
+ In the future, OpenOCD would use the sparse attribute 'bitwise' to
+ detect incorrect endianness assignments.
+
+ Example usage:
+ @code
+ mkdir build-sparse; cd build-sparse
+ ../configure CC=cgcc CFLAGS="-Wsparse-all -Wno-declaration-after-statement \
+ -Wno-unknown-attribute -Wno-transparent-union -Wno-tautological-compare \
+ -Wno-vla -Wno-flexible-array-array -D__FLT_EVAL_METHOD__=0"
+ make
+ @endcode
+
Please consider performing these additional checks where appropriate
(especially Clang Static Analyzer for big portions of new code) and
mention the results (e.g. "Valgrind-clean, no new Clang analyzer
commit 17f86fdedf03626eed545dcd69c6387a825e0b5d
Author: Antonio Borneo <bor...@gm...>
Date: Sun May 7 15:50:26 2023 +0200
rtos: uCOS-III: split struct ucos_iii_params
The static analyser 'sparse' complains about using sizeof() on a
struct that has variable size:
src/rtos/uCOS-III.c:267:32: warning: using sizeof on a flexible structure
src/rtos/uCOS-III.c:269:41: warning: using sizeof on a flexible structure
src/rtos/uCOS-III.c:275:66: warning: using sizeof on a flexible structure
The struct ucos_iii_params contains either constants values for
different target type and variable fields. The last field is an
variable size array, always allocated to UCOS_III_MAX_THREADS
items. It's not practical to fix this size because we would get
too huge initialization in data segment.
Split away from struct ucos_iii_params all the variable fields and
put them in struct ucos_iii_private. Add in the new struct a
pointer to the selected element of ucos_iii_params_list[] and fix
the size of array threads[] to its maximum value; this would be
allocated at run-time, avoiding impacts to data segment.
Change-Id: I569011a257783d35a8795adbda06e942b4157f2a
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/7678
Tested-by: jenkins
diff --git a/src/rtos/uCOS-III.c b/src/rtos/uCOS-III.c
index 21be8ff3c..4d704a44f 100644
--- a/src/rtos/uCOS-III.c
+++ b/src/rtos/uCOS-III.c
@@ -29,6 +29,12 @@
struct ucos_iii_params {
const char *target_name;
const unsigned char pointer_width;
+ size_t threadid_start;
+ const struct rtos_register_stacking *stacking_info;
+};
+
+struct ucos_iii_private {
+ const struct ucos_iii_params *params;
symbol_address_t thread_stack_offset;
symbol_address_t thread_name_offset;
symbol_address_t thread_state_offset;
@@ -36,40 +42,22 @@ struct ucos_iii_params {
symbol_address_t thread_prev_offset;
symbol_address_t thread_next_offset;
bool thread_offsets_updated;
- size_t threadid_start;
- const struct rtos_register_stacking *stacking_info;
size_t num_threads;
- symbol_address_t threads[];
+ symbol_address_t threads[UCOS_III_MAX_THREADS];
};
static const struct ucos_iii_params ucos_iii_params_list[] = {
{
- "cortex_m", /* target_name */
- sizeof(uint32_t), /* pointer_width */
- 0, /* thread_stack_offset */
- 0, /* thread_name_offset */
- 0, /* thread_state_offset */
- 0, /* thread_priority_offset */
- 0, /* thread_prev_offset */
- 0, /* thread_next_offset */
- false, /* thread_offsets_updated */
- 1, /* threadid_start */
- &rtos_ucos_iii_cortex_m_stacking, /* stacking_info */
- 0, /* num_threads */
+ .target_name = "cortex_m",
+ .pointer_width = sizeof(uint32_t),
+ .threadid_start = 1,
+ .stacking_info = &rtos_ucos_iii_cortex_m_stacking,
},
{
- "esirisc", /* target_name */
- sizeof(uint32_t), /* pointer_width */
- 0, /* thread_stack_offset */
- 0, /* thread_name_offset */
- 0, /* thread_state_offset */
- 0, /* thread_priority_offset */
- 0, /* thread_prev_offset */
- 0, /* thread_next_offset */
- false, /* thread_offsets_updated */
- 1, /* threadid_start */
- &rtos_ucos_iii_esi_risc_stacking, /* stacking_info */
- 0, /* num_threads */
+ .target_name = "esirisc",
+ .pointer_width = sizeof(uint32_t),
+ .threadid_start = 1,
+ .stacking_info = &rtos_ucos_iii_esi_risc_stacking,
},
};
@@ -118,7 +106,7 @@ static const char * const ucos_iii_thread_state_list[] = {
static int ucos_iii_find_or_create_thread(struct rtos *rtos, symbol_address_t thread_address,
threadid_t *threadid)
{
- struct ucos_iii_params *params = rtos->rtos_specific_params;
+ struct ucos_iii_private *params = rtos->rtos_specific_params;
size_t thread_index;
for (thread_index = 0; thread_index < params->num_threads; thread_index++)
@@ -133,17 +121,17 @@ static int ucos_iii_find_or_create_thread(struct rtos *rtos, symbol_address_t th
params->threads[thread_index] = thread_address;
params->num_threads++;
found:
- *threadid = thread_index + params->threadid_start;
+ *threadid = thread_index + params->params->threadid_start;
return ERROR_OK;
}
static int ucos_iii_find_thread_address(struct rtos *rtos, threadid_t threadid,
symbol_address_t *thread_address)
{
- struct ucos_iii_params *params = rtos->rtos_specific_params;
+ struct ucos_iii_private *params = rtos->rtos_specific_params;
size_t thread_index;
- thread_index = threadid - params->threadid_start;
+ thread_index = threadid - params->params->threadid_start;
if (thread_index >= params->num_threads) {
LOG_ERROR("uCOS-III: failed to find thread address");
return ERROR_FAIL;
@@ -155,7 +143,7 @@ static int ucos_iii_find_thread_address(struct rtos *rtos, threadid_t threadid,
static int ucos_iii_find_last_thread_address(struct rtos *rtos, symbol_address_t *thread_address)
{
- struct ucos_iii_params *params = rtos->rtos_specific_params;
+ struct ucos_iii_private *params = rtos->rtos_specific_params;
int retval;
/* read the thread list head */
@@ -163,7 +151,7 @@ static int ucos_iii_find_last_thread_address(struct rtos *rtos, symbol_address_t
retval = target_read_memory(rtos->target,
rtos->symbols[UCOS_III_VAL_OS_TASK_DBG_LIST_PTR].address,
- params->pointer_width,
+ params->params->pointer_width,
1,
(void *)&thread_list_address);
if (retval != ERROR_OK) {
@@ -177,7 +165,7 @@ static int ucos_iii_find_last_thread_address(struct rtos *rtos, symbol_address_t
retval = target_read_memory(rtos->target,
thread_list_address + params->thread_next_offset,
- params->pointer_width,
+ params->params->pointer_width,
1,
(void *)&thread_list_address);
if (retval != ERROR_OK) {
@@ -191,7 +179,7 @@ static int ucos_iii_find_last_thread_address(struct rtos *rtos, symbol_address_t
static int ucos_iii_update_thread_offsets(struct rtos *rtos)
{
- struct ucos_iii_params *params = rtos->rtos_specific_params;
+ struct ucos_iii_private *params = rtos->rtos_specific_params;
if (params->thread_offsets_updated)
return ERROR_OK;
@@ -231,7 +219,7 @@ static int ucos_iii_update_thread_offsets(struct rtos *rtos)
int retval = target_read_memory(rtos->target,
rtos->symbols[thread_offset_map->symbol_value].address,
- params->pointer_width,
+ params->params->pointer_width,
1,
(void *)thread_offset_map->thread_offset);
if (retval != ERROR_OK) {
@@ -252,7 +240,7 @@ static bool ucos_iii_detect_rtos(struct target *target)
static int ucos_iii_reset_handler(struct target *target, enum target_reset_mode reset_mode, void *priv)
{
- struct ucos_iii_params *params = target->rtos->rtos_specific_params;
+ struct ucos_iii_private *params = target->rtos->rtos_specific_params;
params->thread_offsets_updated = false;
params->num_threads = 0;
@@ -262,17 +250,17 @@ static int ucos_iii_reset_handler(struct target *target, enum target_reset_mode
static int ucos_iii_create(struct target *target)
{
- struct ucos_iii_params *params;
+ struct ucos_iii_private *params;
for (size_t i = 0; i < ARRAY_SIZE(ucos_iii_params_list); i++)
if (strcmp(ucos_iii_params_list[i].target_name, target->type->name) == 0) {
- params = malloc(sizeof(*params) + (UCOS_III_MAX_THREADS * sizeof(*params->threads)));
+ params = calloc(1, sizeof(*params));
if (!params) {
LOG_ERROR("uCOS-III: out of memory");
return ERROR_FAIL;
}
- memcpy(params, &ucos_iii_params_list[i], sizeof(ucos_iii_params_list[i]));
+ params->params = &ucos_iii_params_list[i];
target->rtos->rtos_specific_params = (void *)params;
target_register_reset_callback(ucos_iii_reset_handler, NULL);
@@ -286,7 +274,7 @@ static int ucos_iii_create(struct target *target)
static int ucos_iii_update_threads(struct rtos *rtos)
{
- struct ucos_iii_params *params = rtos->rtos_specific_params;
+ struct ucos_iii_private *params = rtos->rtos_specific_params;
int retval;
if (!rtos->symbols) {
@@ -340,7 +328,7 @@ static int ucos_iii_update_threads(struct rtos *rtos)
retval = target_read_memory(rtos->target,
rtos->symbols[UCOS_III_VAL_OS_TCB_CUR_PTR].address,
- params->pointer_width,
+ params->params->pointer_width,
1,
(void *)¤t_thread_address);
if (retval != ERROR_OK) {
@@ -396,7 +384,7 @@ static int ucos_iii_update_threads(struct rtos *rtos)
retval = target_read_memory(rtos->target,
thread_address + params->thread_name_offset,
- params->pointer_width,
+ params->params->pointer_width,
1,
(void *)&thread_name_address);
if (retval != ERROR_OK) {
@@ -450,7 +438,7 @@ static int ucos_iii_update_threads(struct rtos *rtos)
/* read previous thread address */
retval = target_read_memory(rtos->target,
thread_address + params->thread_prev_offset,
- params->pointer_width,
+ params->params->pointer_width,
1,
(void *)&thread_address);
if (retval != ERROR_OK) {
@@ -465,7 +453,7 @@ static int ucos_iii_update_threads(struct rtos *rtos)
static int ucos_iii_get_thread_reg_list(struct rtos *rtos, threadid_t threadid,
struct rtos_reg **reg_list, int *num_regs)
{
- struct ucos_iii_params *params = rtos->rtos_specific_params;
+ struct ucos_iii_private *params = rtos->rtos_specific_params;
int retval;
/* find thread address for threadid */
@@ -482,7 +470,7 @@ static int ucos_iii_get_thread_reg_list(struct rtos *rtos, threadid_t threadid,
retval = target_read_memory(rtos->target,
thread_address + params->thread_stack_offset,
- params->pointer_width,
+ params->params->pointer_width,
1,
(void *)&stack_address);
if (retval != ERROR_OK) {
@@ -491,7 +479,7 @@ static int ucos_iii_get_thread_reg_list(struct rtos *rtos, threadid_t threadid,
}
return rtos_generic_stack_read(rtos->target,
- params->stacking_info,
+ params->params->stacking_info,
stack_address,
reg_list,
num_regs);
-----------------------------------------------------------------------
Summary of changes:
HACKING | 15 ++++++++++
src/rtos/uCOS-III.c | 82 +++++++++++++++++++++++------------------------------
2 files changed, 50 insertions(+), 47 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
