target/riscv: Add null pointer check before right shift for bscan tunneling.

[openocd.git] / src / target / arm7_9_common.c

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index da047c3d026323fd8ad6afd481d918e16420194e..f60777dbebba2b43b3ced28e9a3805ff5028c872 100644 (file)
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
@@ -12,19 +14,6 @@
  *   hontor@126.com                                                        *
  *                                                                         *
  *   Copyright (C) 2009 by David Brownell                                  *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -1564,7 +1553,6 @@ static int arm7_9_restore_context(struct target *target)
 
                if (dirty) {
                        uint32_t mask = 0x0;
-                       int num_regs = 0;
                        uint32_t regs[16];
 
                        if (mode_change) {
@@ -1587,7 +1575,6 @@ static int arm7_9_restore_context(struct target *target)
                                if (reg->dirty) {
                                        regs[j] = buf_get_u32(reg->value, 0, 32);
                                        mask |= 1 << j;
-                                       num_regs++;
                                        reg->dirty = false;
                                        reg->valid = true;
                                        LOG_DEBUG("writing register %i mode %s "
@@ -2531,7 +2518,7 @@ static const uint8_t *dcc_buffer;
 
 static int arm7_9_dcc_completion(struct target *target,
        uint32_t exit_point,
-       int timeout_ms,
+       unsigned int timeout_ms,
        void *arch_info)
 {
        int retval = ERROR_OK;