cortex_m: fix scan-build false positive
Scan-build is unable to detect that 'target->dbg_msg_enabled' does not change across the function cortex_m_fast_read_all_regs(). It incorrectly assumes that it can be false at the first check (so 'dcrdr' get not assigned) and it is true later on (when 'dcrdr' get used). This triggers a false positive: src/target/cortex_m.c:338:12: warning: 3rd function call argument is an uninitialized value [core.CallAndMessage] retval = mem_ap_write_atomic_u32(armv7m->debug_ap, DCB_DCRDR, dcrdr); Use a local variable for 'target->dbg_msg_enabled' so scan-build can track it as not modified. While there, change the type of 'target->dbg_msg_enabled' to boolean as there is no reason to use uint32_t. Change-Id: Icaf1a1b2dea8bc55108182ea440708ab76396cd7 Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Reviewed-on: https://review.openocd.org/c/openocd/+/8391 Tested-by: jenkins Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
This commit is contained in:
@@ -279,7 +279,8 @@ static int cortex_m_fast_read_all_regs(struct target *target)
|
||||
|
||||
/* because the DCB_DCRDR is used for the emulated dcc channel
|
||||
* we have to save/restore the DCB_DCRDR when used */
|
||||
if (target->dbg_msg_enabled) {
|
||||
bool dbg_msg_enabled = target->dbg_msg_enabled;
|
||||
if (dbg_msg_enabled) {
|
||||
retval = mem_ap_read_u32(armv7m->debug_ap, DCB_DCRDR, &dcrdr);
|
||||
if (retval != ERROR_OK)
|
||||
return retval;
|
||||
@@ -332,7 +333,7 @@ static int cortex_m_fast_read_all_regs(struct target *target)
|
||||
if (retval != ERROR_OK)
|
||||
return retval;
|
||||
|
||||
if (target->dbg_msg_enabled) {
|
||||
if (dbg_msg_enabled) {
|
||||
/* restore DCB_DCRDR - this needs to be in a separate
|
||||
* transaction otherwise the emulated DCC channel breaks */
|
||||
retval = mem_ap_write_atomic_u32(armv7m->debug_ap, DCB_DCRDR, dcrdr);
|
||||
|
||||
Reference in New Issue
Block a user