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

Unified Diff: src/trusted/validator_ragel/unreviewed/decoder.h

Issue 9967015: Revert 8203: Revert 8202 - Add ragel decoder/validator to SCONS (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: Created 8 years, 8 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_ragel/unreviewed/decoder.h
===================================================================
--- src/trusted/validator_ragel/unreviewed/decoder.h (revision 8211)
+++ src/trusted/validator_ragel/unreviewed/decoder.h (working copy)
@@ -7,7 +7,8 @@
#ifndef _DECODER_X86_64_H_
#define _DECODER_X86_64_H_
-#include <inttypes.h>
+#include "native_client/src/shared/utils/types.h"
+#include "native_client/src/include/portability.h"
#ifdef __cplusplus
extern "C" {
@@ -69,7 +70,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. */
};
@@ -79,12 +80,21 @@
unsigned char operands_count;
struct {
unsigned char rex; /* Mostly to distingush cases like %ah vs %spl. */
+#ifdef _MSC_VER
+ Bool data16:1; /* "Normal", non-rex prefixes. */
+ Bool lock:1;
+ Bool repnz:1;
+ Bool repz:1;
+ Bool branch_not_taken:1;
+ Bool branch_taken:1;
+#else
_Bool data16:1; /* "Normal", non-rex prefixes. */
_Bool lock:1;
_Bool repnz:1;
_Bool repz:1;
_Bool branch_not_taken:1;
_Bool branch_taken:1;
+#endif
} prefix;
struct {
enum register_name name;
« no previous file with comments | « src/trusted/validator_ragel/unreviewed/Makefile ('k') | src/trusted/validator_ragel/unreviewed/decoder-test.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698