Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(334)

Unified Diff: src/trusted/validator_arm/validator.cc

Issue 11194045: Change BKPT and UDF encodings on ARM. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Fix one test that was using bkpt #0x6666. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/trusted/validator_arm/validator.cc
diff --git a/src/trusted/validator_arm/validator.cc b/src/trusted/validator_arm/validator.cc
index 0742be242a0485525b7efdb034cbb0c1a9bfc7b6..7f99520b9b9b006646b6063bce200bf1c443deab 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) {

Powered by Google App Engine
This is Rietveld 408576698