| Index: src/trusted/validator_arm/validator.cc
|
| diff --git a/src/trusted/validator_arm/validator.cc b/src/trusted/validator_arm/validator.cc
|
| index 30db0e6051190e4390d77ba840fc53cafd5b4db2..bffd38b0f71fb3e136ad86d1874a801cda93c60a 100644
|
| --- a/src/trusted/validator_arm/validator.cc
|
| +++ b/src/trusted/validator_arm/validator.cc
|
| @@ -675,10 +675,10 @@ bool SfiValidator::validate_fallthrough(const CodeSegment& segment,
|
| bool complete_success = true;
|
|
|
| nacl_arm_dec::Forbidden initial_decoder;
|
| - // Initialize the previous instruction to a scary BKPT, so patterns all fail.
|
| + // Initialize the previous instruction so it always fails validation.
|
| DecodedInstruction pred(
|
| 0, // Virtual address 0, which will be in a different bundle;
|
| - Instruction(nacl_arm_dec::kLiteralPoolHeadInstruction),
|
| + Instruction(nacl_arm_dec::kFailValidation),
|
| initial_decoder); // and ensure that it decodes as Forbidden.
|
|
|
| for (uint32_t va = segment.begin_addr(); va < segment.end_addr(); va += 4) {
|
|
|