armv4_5: prevent segfault when gdb connects to an underinitialised target

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

diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index e31c77e49be1236d92be624b22ecff23ce804bca..91830f57c90472931909bad1d4a4cfb735c1357e 100644 (file)
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -21,7 +21,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -140,6 +140,21 @@ static const struct {
                .n_indices = ARRAY_SIZE(arm_mon_indices),
                .indices = arm_mon_indices,
        },
+
+       /* These special modes are currently only supported
+        * by ARMv6M and ARMv7M profiles */
+       {
+               .name = "Thread",
+               .psr = ARM_MODE_THREAD,
+       },
+       {
+               .name = "Thread (User)",
+               .psr = ARM_MODE_USER_THREAD,
+       },
+       {
+               .name = "Handler",
+               .psr = ARM_MODE_HANDLER,
+       },
 };
 
 /** Map PSR mode bits to the name of an ARM processor operating mode. */
@@ -414,7 +429,11 @@ struct reg *arm_reg_current(struct arm *arm, unsigned regnum)
        if (regnum > 16)
                return NULL;
 
-       r = arm->core_cache->reg_list + arm->map[regnum];
+       if (!arm->map) {
+               LOG_ERROR("Register map is not available yet, the target is not fully initialised");
+               r = arm->core_cache->reg_list + regnum;
+       } else
+               r = arm->core_cache->reg_list + arm->map[regnum];
 
        /* e.g. invalid CPSR said "secure monitor" mode on a core
         * that doesn't support it...
@@ -1002,13 +1021,13 @@ static const struct command_registration arm_exec_command_handlers[] = {
                .mode = COMMAND_EXEC,
                .jim_handler = &jim_mcrmrc,
                .help = "write coprocessor register",
-               .usage = "cpnum op1 CRn op2 CRm value",
+               .usage = "cpnum op1 CRn CRm op2 value",
        },
        {
                .name = "mrc",
                .jim_handler = &jim_mcrmrc,
                .help = "read coprocessor register",
-               .usage = "cpnum op1 CRn op2 CRm",
+               .usage = "cpnum op1 CRn CRm op2",
        },
        {
                "semihosting",