Index: src/trusted/validator_ragel/unreviewed/validator_x86_32.rl |
=================================================================== |
--- src/trusted/validator_ragel/unreviewed/validator_x86_32.rl (revision 9570) |
+++ src/trusted/validator_ragel/unreviewed/validator_x86_32.rl (working copy) |
@@ -28,7 +28,6 @@ |
variable cs current_state; |
action rel8_operand { |
- instruction_info_collected |= RELATIVE_8BIT; |
rel8_operand(current_position + 1, data, jump_dests, size, |
&instruction_info_collected); |
} |
@@ -36,12 +35,11 @@ |
#error rel16_operand should never be used in nacl |
} |
action rel32_operand { |
- instruction_info_collected |= RELATIVE_32BIT; |
rel32_operand(current_position + 1, data, jump_dests, size, |
&instruction_info_collected); |
} |
- action opcode_in_imm { |
+ action last_byte_is_not_immediate { |
instruction_info_collected |= LAST_BYTE_IS_NOT_IMMEDIATE; |
} |
@@ -85,8 +83,8 @@ |
BitmapSetBit(valid_targets, current_position - data); |
} |
@{ |
- if (instruction_info_collected & VALIDATION_ERRORS || |
- options & CALL_USER_CALLBACK_ON_EACH_INSTRUCTION) { |
+ if ((instruction_info_collected & VALIDATION_ERRORS_MASK) || |
+ (options & CALL_USER_CALLBACK_ON_EACH_INSTRUCTION)) { |
result &= user_callback(instruction_start, current_position, |
instruction_info_collected, callback_data); |
} |