| Index: src/trusted/validator_arm/gen/arm32_decode_named_decoder.h
|
| diff --git a/src/trusted/validator_arm/gen/arm32_decode_named_decoder.h b/src/trusted/validator_arm/gen/arm32_decode_named_decoder.h
|
| index 84f2970003a97ec3981d00878ca326dad9e4721d..c4334bc2af8b6a4b053963ad0ccdf219c2022c58 100644
|
| --- a/src/trusted/validator_arm/gen/arm32_decode_named_decoder.h
|
| +++ b/src/trusted/validator_arm/gen/arm32_decode_named_decoder.h
|
| @@ -187,20 +187,35 @@ class NamedArm32DecoderState : nacl_arm_dec::DecoderState {
|
| const NamedCondVfpOp_Vsqrt_Rule_388_A1_P762 CondVfpOp_Vsqrt_Rule_388_A1_P762_instance_;
|
| const NamedCondVfpOp_Vsub_Rule_402_A2_P790 CondVfpOp_Vsub_Rule_402_A2_P790_instance_;
|
| const NamedCoprocessorOp_None CoprocessorOp_None_instance_;
|
| - const NamedDeprecated_None Deprecated_None_instance_;
|
| + const NamedDeprecated_Swp_Swpb_Rule_A1 Deprecated_Swp_Swpb_Rule_A1_instance_;
|
| const NamedDuplicateToVfpRegisters_Vdup_Rule_303_A1_P594 DuplicateToVfpRegisters_Vdup_Rule_303_A1_P594_instance_;
|
| const NamedEffectiveNoOp_None EffectiveNoOp_None_instance_;
|
| const NamedForbidden_None Forbidden_None_instance_;
|
| const NamedForbiddenCondNop_Bxj_Rule_26_A1_P64 ForbiddenCondNop_Bxj_Rule_26_A1_P64_instance_;
|
| + const NamedForbiddenCondNop_Eret_Rule_A1 ForbiddenCondNop_Eret_Rule_A1_instance_;
|
| + const NamedForbiddenCondNop_Hvc_Rule_A1 ForbiddenCondNop_Hvc_Rule_A1_instance_;
|
| const NamedForbiddenCondNop_Ldm_Rule_2_B6_A1_P5 ForbiddenCondNop_Ldm_Rule_2_B6_A1_P5_instance_;
|
| const NamedForbiddenCondNop_Ldm_Rule_3_B6_A1_P7 ForbiddenCondNop_Ldm_Rule_3_B6_A1_P7_instance_;
|
| + const NamedForbiddenCondNop_Ldrt_Rule_A1 ForbiddenCondNop_Ldrt_Rule_A1_instance_;
|
| + const NamedForbiddenCondNop_Ldrt_Rule_A2 ForbiddenCondNop_Ldrt_Rule_A2_instance_;
|
| + const NamedForbiddenCondNop_Ldrtb_Rule_A1 ForbiddenCondNop_Ldrtb_Rule_A1_instance_;
|
| + const NamedForbiddenCondNop_Ldrtb_Rule_A2 ForbiddenCondNop_Ldrtb_Rule_A2_instance_;
|
| const NamedForbiddenCondNop_Msr_Rule_B6_1_6_A1_PB6_12 ForbiddenCondNop_Msr_Rule_B6_1_6_A1_PB6_12_instance_;
|
| const NamedForbiddenCondNop_Msr_Rule_B6_1_7_P14 ForbiddenCondNop_Msr_Rule_B6_1_7_P14_instance_;
|
| + const NamedForbiddenCondNop_Msr_Rule_Banked_register_A1_B9_1990 ForbiddenCondNop_Msr_Rule_Banked_register_A1_B9_1990_instance_;
|
| + const NamedForbiddenCondNop_Msr_Rule_Banked_register_A1_B9_1992 ForbiddenCondNop_Msr_Rule_Banked_register_A1_B9_1992_instance_;
|
| const NamedForbiddenCondNop_Sev_Rule_158_A1_P316 ForbiddenCondNop_Sev_Rule_158_A1_P316_instance_;
|
| const NamedForbiddenCondNop_Smc_Rule_B6_1_9_P18 ForbiddenCondNop_Smc_Rule_B6_1_9_P18_instance_;
|
| const NamedForbiddenCondNop_Stm_Rule_11_B6_A1_P22 ForbiddenCondNop_Stm_Rule_11_B6_A1_P22_instance_;
|
| + const NamedForbiddenCondNop_Strt_Rule_A1 ForbiddenCondNop_Strt_Rule_A1_instance_;
|
| + const NamedForbiddenCondNop_Strt_Rule_A2 ForbiddenCondNop_Strt_Rule_A2_instance_;
|
| + const NamedForbiddenCondNop_Strtb_Rule_A1 ForbiddenCondNop_Strtb_Rule_A1_instance_;
|
| + const NamedForbiddenCondNop_Strtb_Rule_A2 ForbiddenCondNop_Strtb_Rule_A2_instance_;
|
| + const NamedForbiddenCondNop_Subs_Pc_Lr_and_related_instructions_Rule_A1a ForbiddenCondNop_Subs_Pc_Lr_and_related_instructions_Rule_A1a_instance_;
|
| + const NamedForbiddenCondNop_Subs_Pc_Lr_and_related_instructions_Rule_A1b ForbiddenCondNop_Subs_Pc_Lr_and_related_instructions_Rule_A1b_instance_;
|
| const NamedForbiddenCondNop_Wfe_Rule_411_A1_P808 ForbiddenCondNop_Wfe_Rule_411_A1_P808_instance_;
|
| const NamedForbiddenCondNop_Wfi_Rule_412_A1_P810 ForbiddenCondNop_Wfi_Rule_412_A1_P810_instance_;
|
| + const NamedForbiddenCondNop_extra_load_store_instructions_unpriviledged ForbiddenCondNop_extra_load_store_instructions_unpriviledged_instance_;
|
| const NamedForbiddenUncondNop_None ForbiddenUncondNop_None_instance_;
|
| const NamedForbiddenUncondNop_Blx_Rule_23_A2_P58 ForbiddenUncondNop_Blx_Rule_23_A2_P58_instance_;
|
| const NamedLoad2RegisterImm12Op_Ldr_Rule_58_A1_P120 Load2RegisterImm12Op_Ldr_Rule_58_A1_P120_instance_;
|
| @@ -458,15 +473,30 @@ class NamedArm32DecoderState : nacl_arm_dec::DecoderState {
|
| const NamedDontCareInstRnRsRmNotPc_Tst_Rule_232_A1_P458 DontCareInstRnRsRmNotPc_Tst_Rule_232_A1_P458_instance_;
|
| const NamedForbidden_Blx_Rule_23_A2_P58 Forbidden_Blx_Rule_23_A2_P58_instance_;
|
| const NamedForbidden_Bxj_Rule_26_A1_P64 Forbidden_Bxj_Rule_26_A1_P64_instance_;
|
| + const NamedForbidden_Eret_Rule_A1 Forbidden_Eret_Rule_A1_instance_;
|
| + const NamedForbidden_Hvc_Rule_A1 Forbidden_Hvc_Rule_A1_instance_;
|
| const NamedForbidden_Ldm_Rule_2_B6_A1_P5 Forbidden_Ldm_Rule_2_B6_A1_P5_instance_;
|
| const NamedForbidden_Ldm_Rule_3_B6_A1_P7 Forbidden_Ldm_Rule_3_B6_A1_P7_instance_;
|
| + const NamedForbidden_Ldrt_Rule_A1 Forbidden_Ldrt_Rule_A1_instance_;
|
| + const NamedForbidden_Ldrt_Rule_A2 Forbidden_Ldrt_Rule_A2_instance_;
|
| + const NamedForbidden_Ldrtb_Rule_A1 Forbidden_Ldrtb_Rule_A1_instance_;
|
| + const NamedForbidden_Ldrtb_Rule_A2 Forbidden_Ldrtb_Rule_A2_instance_;
|
| const NamedForbidden_Msr_Rule_B6_1_6_A1_PB6_12 Forbidden_Msr_Rule_B6_1_6_A1_PB6_12_instance_;
|
| const NamedForbidden_Msr_Rule_B6_1_7_P14 Forbidden_Msr_Rule_B6_1_7_P14_instance_;
|
| + const NamedForbidden_Msr_Rule_Banked_register_A1_B9_1990 Forbidden_Msr_Rule_Banked_register_A1_B9_1990_instance_;
|
| + const NamedForbidden_Msr_Rule_Banked_register_A1_B9_1992 Forbidden_Msr_Rule_Banked_register_A1_B9_1992_instance_;
|
| const NamedForbidden_Sev_Rule_158_A1_P316 Forbidden_Sev_Rule_158_A1_P316_instance_;
|
| const NamedForbidden_Smc_Rule_B6_1_9_P18 Forbidden_Smc_Rule_B6_1_9_P18_instance_;
|
| const NamedForbidden_Stm_Rule_11_B6_A1_P22 Forbidden_Stm_Rule_11_B6_A1_P22_instance_;
|
| + const NamedForbidden_Strt_Rule_A1 Forbidden_Strt_Rule_A1_instance_;
|
| + const NamedForbidden_Strt_Rule_A2 Forbidden_Strt_Rule_A2_instance_;
|
| + const NamedForbidden_Strtb_Rule_A1 Forbidden_Strtb_Rule_A1_instance_;
|
| + const NamedForbidden_Strtb_Rule_A2 Forbidden_Strtb_Rule_A2_instance_;
|
| + const NamedForbidden_Subs_Pc_Lr_and_related_instructions_Rule_A1a Forbidden_Subs_Pc_Lr_and_related_instructions_Rule_A1a_instance_;
|
| + const NamedForbidden_Subs_Pc_Lr_and_related_instructions_Rule_A1b Forbidden_Subs_Pc_Lr_and_related_instructions_Rule_A1b_instance_;
|
| const NamedForbidden_Wfe_Rule_411_A1_P808 Forbidden_Wfe_Rule_411_A1_P808_instance_;
|
| const NamedForbidden_Wfi_Rule_412_A1_P810 Forbidden_Wfi_Rule_412_A1_P810_instance_;
|
| + const NamedForbidden_extra_load_store_instructions_unpriviledged Forbidden_extra_load_store_instructions_unpriviledged_instance_;
|
| const NamedLoadBasedImmedMemory_Ldr_Rule_58_A1_P120 LoadBasedImmedMemory_Ldr_Rule_58_A1_P120_instance_;
|
| const NamedLoadBasedImmedMemory_Ldr_Rule_59_A1_P122 LoadBasedImmedMemory_Ldr_Rule_59_A1_P122_instance_;
|
| const NamedLoadBasedImmedMemory_Ldrb_Rule_62_A1_P128 LoadBasedImmedMemory_Ldrb_Rule_62_A1_P128_instance_;
|
|
|