Index: src/trusted/validator/x86/testing/enuminsts/ragel_tester.c |
=================================================================== |
--- src/trusted/validator/x86/testing/enuminsts/ragel_tester.c (revision 9911) |
+++ src/trusted/validator/x86/testing/enuminsts/ragel_tester.c (working copy) |
@@ -18,7 +18,7 @@ |
#include "native_client/src/trusted/validator/types_memory_model.h" |
#include "native_client/src/trusted/validator/x86/ncinstbuffer.h" |
#include "native_client/src/trusted/validator/x86/testing/enuminsts/str_utils.h" |
-#include "native_client/src/trusted/validator_ragel/unreviewed/decoder.h" |
+#include "native_client/src/trusted/validator_ragel/decoder.h" |
#include "native_client/src/trusted/validator_ragel/unreviewed/validator.h" |
#define kBufferSize 1024 |
@@ -88,7 +88,7 @@ |
} |
void RagelInstruction(const uint8_t *begin, const uint8_t *end, |
- struct instruction *instruction, void *userdata) { |
+ struct Instruction *instruction, void *userdata) { |
struct RagelDecodeState *rstate = (struct RagelDecodeState *)userdata; |
UNREFERENCED_PARAMETER(instruction); |
/* Only look at the first instruction. */ |
@@ -155,7 +155,7 @@ |
memset(chunk + tempstate.inst_num_bytes, 0xf4, |
sizeof(chunk) - tempstate.inst_num_bytes); |
res = ValidateChunkArch(chunk, sizeof(chunk), 0 /*options*/, |
- &full_cpuid_features, |
+ &kFullCPUIDFeatures, |
RagelValidateError, NULL); |
RState.inst_is_valid = res; |
} |