diff --git a/src/arch/arm/registers.hh b/src/arch/arm/registers.hh
index ac95f40911..670b4b841b 100644
--- a/src/arch/arm/registers.hh
+++ b/src/arch/arm/registers.hh
@@ -83,7 +83,7 @@ const int SyscallPseudoReturnReg = ReturnValueReg;
 const int SyscallSuccessReg = ReturnValueReg;
 
 // These help enumerate all the registers for dependence tracking.
-const int FP_Base_DepTag = NumIntRegs;
+const int FP_Base_DepTag = NumIntRegs * (MODE_MAXMODE + 1);
 const int Ctrl_Base_DepTag = FP_Base_DepTag + NumFloatRegs;
 
 typedef union {
diff --git a/src/arch/arm/types.hh b/src/arch/arm/types.hh
index dd6b7e6100..78c9790f6e 100644
--- a/src/arch/arm/types.hh
+++ b/src/arch/arm/types.hh
@@ -241,7 +241,8 @@ namespace ArmISA
         MODE_MON = 22,
         MODE_ABORT = 23,
         MODE_UNDEFINED = 27,
-        MODE_SYSTEM = 31
+        MODE_SYSTEM = 31,
+        MODE_MAXMODE = MODE_SYSTEM
     };
 
     static inline bool