| Index: src/trusted/validator_ragel/decoder_internal.h
|
| ===================================================================
|
| --- src/trusted/validator_ragel/decoder_internal.h (revision 10975)
|
| +++ src/trusted/validator_ragel/decoder_internal.h (working copy)
|
| @@ -12,7 +12,7 @@
|
| #ifndef NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_RAGEL_DECODER_INTERNAL_H_
|
| #define NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_RAGEL_DECODER_INTERNAL_H_
|
|
|
| -#include "native_client/src/trusted/validator_ragel/unreviewed/decoding.h"
|
| +#include "native_client/src/trusted/validator_ragel/decoding.h"
|
|
|
| /*
|
| * Set of macroses used in actions defined in parse_instruction.rl to pull
|
| @@ -21,32 +21,32 @@
|
| #define GET_REX_PREFIX() instruction.prefix.rex
|
| #define GET_VEX_PREFIX2() vex_prefix2
|
| #define GET_VEX_PREFIX3() vex_prefix3
|
| -#define SET_VEX_PREFIX3(P) vex_prefix3 = (P)
|
| -#define SET_DATA16_PREFIX(S) instruction.prefix.data16 = (S)
|
| -#define SET_LOCK_PREFIX(S) instruction.prefix.lock = (S)
|
| -#define SET_REPZ_PREFIX(S) instruction.prefix.repz = (S)
|
| -#define SET_REPNZ_PREFIX(S) instruction.prefix.repnz = (S)
|
| -#define SET_BRANCH_TAKEN(S) instruction.prefix.branch_taken = (S)
|
| -#define SET_BRANCH_NOT_TAKEN(S) instruction.prefix.branch_not_taken = (S)
|
| -#define SET_INSTRUCTION_NAME(N) instruction.name = (N)
|
| +#define SET_VEX_PREFIX3(X) vex_prefix3 = (X)
|
| +#define SET_DATA16_PREFIX(X) instruction.prefix.data16 = (X)
|
| +#define SET_LOCK_PREFIX(X) instruction.prefix.lock = (X)
|
| +#define SET_REPZ_PREFIX(X) instruction.prefix.repz = (X)
|
| +#define SET_REPNZ_PREFIX(X) instruction.prefix.repnz = (X)
|
| +#define SET_BRANCH_TAKEN(X) instruction.prefix.branch_taken = (X)
|
| +#define SET_BRANCH_NOT_TAKEN(X) instruction.prefix.branch_not_taken = (X)
|
| +#define SET_INSTRUCTION_NAME(X) instruction.name = (X)
|
| #define GET_OPERAND_NAME(N) instruction.operands[(N)].name
|
| -#define SET_OPERAND_NAME(N, S) instruction.operands[(N)].name = (S)
|
| -#define SET_OPERAND_TYPE(N, S) instruction.operands[(N)].type = (S)
|
| +#define SET_OPERAND_NAME(N, X) instruction.operands[(N)].name = (X)
|
| +#define SET_OPERAND_TYPE(N, X) instruction.operands[(N)].type = (X)
|
| #define SET_OPERANDS_COUNT(N) instruction.operands_count = (N)
|
| -#define SET_MODRM_BASE(N) instruction.rm.base = (N)
|
| -#define SET_MODRM_INDEX(N) instruction.rm.index = (N)
|
| -#define SET_MODRM_SCALE(S) instruction.rm.scale = (S)
|
| -#define SET_DISP_TYPE(T) instruction.rm.disp_type = (T)
|
| -#define SET_DISP_PTR(P) \
|
| - instruction.rm.offset = DecodeDisplacementValue(instruction.rm.disp_type, (P))
|
| -#define SET_IMM_TYPE(T) imm_operand = (T)
|
| -#define SET_IMM_PTR(P) \
|
| - instruction.imm[0] = DecodeImmediateValue(imm_operand, (P))
|
| -#define SET_IMM2_TYPE(T) imm2_operand = (T)
|
| -#define SET_IMM2_PTR(P) \
|
| - instruction.imm[1] = DecodeImmediateValue(imm2_operand, (P))
|
| -#define SET_CPU_FEATURE(F)
|
| -#define SET_ATT_INSTRUCTION_SUFFIX(S) instruction.att_instruction_suffix = (S)
|
| +#define SET_MODRM_BASE(X) instruction.rm.base = (X)
|
| +#define SET_MODRM_INDEX(X) instruction.rm.index = (X)
|
| +#define SET_MODRM_SCALE(X) instruction.rm.scale = (X)
|
| +#define SET_DISP_TYPE(X) instruction.rm.disp_type = (X)
|
| +#define SET_DISP_PTR(X) \
|
| + instruction.rm.offset = DecodeDisplacementValue(instruction.rm.disp_type, (X))
|
| +#define SET_IMM_TYPE(X) imm_operand = (X)
|
| +#define SET_IMM_PTR(X) \
|
| + instruction.imm[0] = DecodeImmediateValue(imm_operand, (X))
|
| +#define SET_SECOND_IMM_TYPE(X) imm2_operand = (X)
|
| +#define SET_IMM2_PTR(X) \
|
| + instruction.imm[1] = DecodeImmediateValue(imm2_operand, (X))
|
| +#define SET_CPU_FEATURE(X)
|
| +#define SET_ATT_INSTRUCTION_SUFFIX(X) instruction.att_instruction_suffix = (X)
|
|
|
| /*
|
| * Immediate mode: size of the instruction's immediate operand. Note that there
|
|
|