diff --git a/src/target/arm.h b/src/target/arm.h
index 77a2f7b01..5713fc08b 100644
--- a/src/target/arm.h
+++ b/src/target/arm.h
@@ -78,6 +78,7 @@ enum arm_state {
 	ARM_STATE_THUMB,
 	ARM_STATE_JAZELLE,
 	ARM_STATE_THUMB_EE,
+	ARM_STATE_AARCH64,
 };
 
 #define ARM_COMMON_MAGIC 0x0A450A45
diff --git a/src/target/arm_dpm.c b/src/target/arm_dpm.c
index 62c617552..3b18719a5 100644
--- a/src/target/arm_dpm.c
+++ b/src/target/arm_dpm.c
@@ -165,6 +165,9 @@ static int dpm_read_reg(struct arm_dpm *dpm, struct reg *r, unsigned regnum)
 					/* core-specific ... ? */
 					LOG_WARNING("Jazelle PC adjustment unknown");
 					break;
+				case ARM_STATE_AARCH64:
+					LOG_ERROR("AARCH64: 32bit read requested");
+					break;
 			}
 			break;
 		default:
@@ -905,6 +908,7 @@ void arm_dpm_report_wfar(struct arm_dpm *dpm, uint32_t addr)
 			addr -= 4;
 			break;
 		case ARM_STATE_JAZELLE:
+		case ARM_STATE_AARCH64:
 			/* ?? */
 			break;
 	}
diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index 62ac361e6..1cf665604 100644
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -992,6 +992,9 @@ static int cortex_a_internal_restore(struct target *target, int current,
 		case ARM_STATE_JAZELLE:
 			LOG_ERROR("How do I resume into Jazelle state??");
 			return ERROR_FAIL;
+		case ARM_STATE_AARCH64:
+			LOG_ERROR("Shoudn't be in AARCH64 state");
+			return ERROR_FAIL;
 	}
 	LOG_DEBUG("resume pc = 0x%08" PRIx32, resume_pc);
 	buf_set_u32(arm->pc->value, 0, 32, resume_pc);