| Index: src/trusted/validator_arm/validator.cc
|
| ===================================================================
|
| --- src/trusted/validator_arm/validator.cc (revision 8588)
|
| +++ src/trusted/validator_arm/validator.cc (working copy)
|
| @@ -15,7 +15,7 @@
|
| using nacl_arm_dec::Register;
|
| using nacl_arm_dec::RegisterList;
|
| using nacl_arm_dec::kRegisterNone;
|
| -using nacl_arm_dec::kRegisterFlags;
|
| +using nacl_arm_dec::kConditions;
|
| using nacl_arm_dec::kRegisterPc;
|
| using nacl_arm_dec::kRegisterLink;
|
|
|
| @@ -70,7 +70,7 @@
|
|
|
| if (first.defines(second.base_address_register())
|
| && first.clears_bits(sfi.data_address_mask())
|
| - && !first.defs()[kRegisterFlags]
|
| + && !first.defs()[kConditions]
|
| && first.always_precedes(second)) {
|
| return PATTERN_SAFE_2;
|
| }
|
|
|