Clean up code to clarify we are only tracking the condition flags of APSR.

src/trusted/validator_arm/actual_classes.cc

Index: src/trusted/validator_arm/actual_classes.cc
===================================================================
--- src/trusted/validator_arm/actual_classes.cc	(revision 8588)
+++ src/trusted/validator_arm/actual_classes.cc	(working copy)
@@ -18,7 +18,7 @@
 //      N E W    C L A S S    D E C O D E R S
 // **************************************************************
 
-// Data processing and arithmetic
+// Defs12To15
 SafetyLevel Defs12To15::safety(const Instruction i) const {
   if (defs(i)[kRegisterPc]) {
     return FORBIDDEN_OPERANDS;
@@ -27,7 +27,7 @@
 }
 
 RegisterList Defs12To15::defs(const Instruction i) const {
-  return d.reg(i) + flags.reg_if_updated(i);
+  return d.reg(i) + conditions.conds_if_updated(i);
 }
 
 SafetyLevel Defs12To15RdRnRsRmNotPc::safety(const Instruction i) const {
@@ -60,11 +60,11 @@
 }
 
 RegisterList DataProc::defs(const Instruction i) const {
-  return Rd(i) + (UpdatesFlagsRegister(i) ? kRegisterFlags : kRegisterNone);
+  return Rd(i) + (UpdatesConditions(i) ? kConditions : kRegisterNone);
 }
 
 RegisterList Test::defs(const Instruction i) const {
-  return (UpdatesFlagsRegister(i) ? kRegisterFlags : kRegisterNone);
+  return (UpdatesConditions(i) ? kConditions : kRegisterNone);
 }
 
 
@@ -74,7 +74,7 @@
   // Rn = 19:16 for TST(immediate) - section A8.6.230
   return Rn(i) == r
       && (imm12.get_modified_immediate(i) & mask) == mask
-      && defs(i)[kRegisterFlags];
+      && defs(i)[kConditions];
 }
 
 
@@ -91,7 +91,7 @@
 }
 
 RegisterList PackSatRev::defs(const Instruction i) const {
-  return Rd(i) + kRegisterFlags;
+  return Rd(i) + kConditions;
 }
 
 
@@ -103,7 +103,7 @@
 }
 
 RegisterList Multiply::defs(const Instruction i) const {
-  return kRegisterFlags + Rd(i);
+  return kConditions + Rd(i);
 }
 
 
@@ -113,7 +113,7 @@
 
 
 RegisterList SatAddSub::defs(const Instruction i) const {
-  return DataProc::defs(i) + kRegisterFlags;
+  return DataProc::defs(i) + kConditions;
 }
 
 
@@ -121,7 +121,7 @@
 
 RegisterList MoveToStatusRegister::defs(const Instruction i) const {
   UNREFERENCED_PARAMETER(i);
-  return kRegisterFlags;
+  return kConditions;
 }