Chromium Code Reviews| Index: src/trusted/validator_ragel/unreviewed/decoder.h |
| =================================================================== |
| --- src/trusted/validator_ragel/unreviewed/decoder.h (revision 8170) |
| +++ src/trusted/validator_ragel/unreviewed/decoder.h (working copy) |
| @@ -7,8 +7,17 @@ |
| #ifndef _DECODER_X86_64_H_ |
| #define _DECODER_X86_64_H_ |
| -#include <inttypes.h> |
| +#include "native_client/src/include/portability.h" |
| +/* |
| + * Microsoft C/C++ version 14.00.50727.762, which comes with Visual C++ 2005, |
| + * and version 15.00.30729.01, which comes with Visual C++ 2008, do not. |
| + * define _Bool. |
| + */ |
| +#if defined(_MSC_VER) && _MSC_VER <= 1500 |
| +typedef int _Bool; |
|
pasko-google - do not use
2012/04/05 14:16:38
The convention in other validator sources seems to
khim
2012/04/05 16:38:43
Oh yeah. I especially love how Bool is unusable on
|
| +#endif |
| + |
| #ifdef __cplusplus |
| extern "C" { |
| #endif |
| @@ -69,7 +78,7 @@ |
| REG_ES_RDI, /* For string instructions: %es:(%rsi). */ |
| REG_DS_RSI, /* For string instructions: %ds:(%rdi). */ |
| REG_PORT_DX, /* 16-bit DX: for in/out instructions. */ |
| - REG_NONE, /* For modrm: both index and base can be absent. */ |
| + NO_REG, /* For modrm: both index and base can be absent. */ |
| REG_ST, /* For x87 instructions: implicit %st. */ |
| JMP_TO /* Operand is jump target address: usually %rip+offset. */ |
| }; |