| Index: src/trusted/validator/x86/ncval_reg_sfi/ncvalidator_registry.c
|
| ===================================================================
|
| --- src/trusted/validator/x86/ncval_reg_sfi/ncvalidator_registry.c (revision 6742)
|
| +++ src/trusted/validator/x86/ncval_reg_sfi/ncvalidator_registry.c (working copy)
|
| @@ -7,7 +7,6 @@
|
| #include "native_client/src/trusted/validator/x86/ncval_reg_sfi/ncvalidator_registry.h"
|
|
|
| #include "native_client/src/shared/platform/nacl_log.h"
|
| -#include "native_client/src/trusted/validator/x86/decoder/nc_inst_iter.h"
|
| #include "native_client/src/trusted/validator/x86/decoder/nc_inst_state.h"
|
| #include "native_client/src/trusted/validator/x86/decoder/ncop_exps.h"
|
| #include "native_client/src/trusted/validator/x86/ncval_reg_sfi/ncvalidate_iter.h"
|
| @@ -20,13 +19,15 @@
|
| #include "native_client/src/trusted/validator/x86/ncval_reg_sfi/nc_memory_protect.h"
|
| #include "native_client/src/trusted/validator/x86/ncval_reg_sfi/nc_protect_base.h"
|
|
|
| +#include "native_client/src/trusted/validator/x86/decoder/nc_inst_iter_inl.c"
|
| +
|
| Bool NACL_FLAGS_opcode_histogram = FALSE;
|
|
|
| static void NaClValidatorTrace(NaClValidatorState* state,
|
| NaClInstIter* iter,
|
| void* local_memory) {
|
| struct Gio* g = NaClLogGetGio();
|
| - NaClInstState* inst_state = NaClInstIterGetState(iter);
|
| + NaClInstState* inst_state = NaClInstIterGetStateInline(iter);
|
| if (NaClValidatorStateTrace(state)) {
|
| gprintf(g, "-> visit: ");
|
| }
|
|
|