diff --git a/arch/arm/src/armv7-a/arm_tcbinfo.c b/arch/arm/src/armv7-a/arm_tcbinfo.c
index 2084d9ea8ed09..ecc79962f5327 100644
--- a/arch/arm/src/armv7-a/arm_tcbinfo.c
+++ b/arch/arm/src/armv7-a/arm_tcbinfo.c
@@ -34,23 +34,48 @@
 
 static const uint16_t g_reg_offs[] =
 {
-  TCB_REG_OFF(REG_R0),
-  TCB_REG_OFF(REG_R1),
-  TCB_REG_OFF(REG_R2),
-  TCB_REG_OFF(REG_R3),
-  TCB_REG_OFF(REG_R4),
-  TCB_REG_OFF(REG_R5),
-  TCB_REG_OFF(REG_R6),
-  TCB_REG_OFF(REG_R7),
-  TCB_REG_OFF(REG_R8),
-  TCB_REG_OFF(REG_R9),
-  TCB_REG_OFF(REG_R10),
-  TCB_REG_OFF(REG_R11),
-  TCB_REG_OFF(REG_R12),
-  TCB_REG_OFF(REG_R13),
-  TCB_REG_OFF(REG_R14),
-  TCB_REG_OFF(REG_R15),
-  TCB_REG_OFF(REG_CPSR),
+  TCB_REG_OFF(REG_R0),   /* 0 */
+  TCB_REG_OFF(REG_R1),   /* 1 */
+  TCB_REG_OFF(REG_R2),   /* 2 */
+  TCB_REG_OFF(REG_R3),   /* 3 */
+  TCB_REG_OFF(REG_R4),   /* 4 */
+  TCB_REG_OFF(REG_R5),   /* 5 */
+  TCB_REG_OFF(REG_R6),   /* 6 */
+  TCB_REG_OFF(REG_R7),   /* 7 */
+  TCB_REG_OFF(REG_R8),   /* 8 */
+  TCB_REG_OFF(REG_R9),   /* 9 */
+  TCB_REG_OFF(REG_R10),  /* 10 */
+  TCB_REG_OFF(REG_R11),  /* 11 */
+  TCB_REG_OFF(REG_R12),  /* 12 */
+  TCB_REG_OFF(REG_R13),  /* 13 */
+  TCB_REG_OFF(REG_R14),  /* 14 */
+  TCB_REG_OFF(REG_R15),  /* 15 */
+  UINT16_MAX,            /* 16 */
+  UINT16_MAX,            /* 17 */
+  UINT16_MAX,            /* 18 */
+  UINT16_MAX,            /* 19 */
+  UINT16_MAX,            /* 20 */
+  UINT16_MAX,            /* 21 */
+  UINT16_MAX,            /* 22 */
+  UINT16_MAX,            /* 23 */
+  UINT16_MAX,            /* 24 */
+  UINT16_MAX,            /* 25 */
+  UINT16_MAX,            /* 26 */
+  UINT16_MAX,            /* 27 */
+  UINT16_MAX,            /* 28 */
+  UINT16_MAX,            /* 29 */
+  UINT16_MAX,            /* 30 */
+  UINT16_MAX,            /* 31 */
+  UINT16_MAX,            /* 32 */
+  UINT16_MAX,            /* 33 */
+  UINT16_MAX,            /* 34 */
+  UINT16_MAX,            /* 35 */
+  UINT16_MAX,            /* 36 */
+  UINT16_MAX,            /* 37 */
+  UINT16_MAX,            /* 38 */
+  UINT16_MAX,            /* 39 */
+  UINT16_MAX,            /* 40 */
+  TCB_REG_OFF(REG_CPSR), /* 41 */
 
 #if 0
 #  ifdef CONFIG_ARCH_FPU