X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farmv4_5.c;h=91830f57c90472931909bad1d4a4cfb735c1357e;hp=10f84d81248f1369e8badd3f9f0c40a723c78b53;hb=434afb370f92898b8803a4883f75ecb9f3f3d931;hpb=a6863e9a52c227086d874ef033de2499005ae318

diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index 10f84d8124..91830f57c9 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -429,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...